diff options
author | Andreas Fischer <bantu@owncloud.com> | 2014-04-09 15:20:18 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@owncloud.com> | 2014-04-09 15:20:18 +0200 |
commit | 78ee4c1327313a0d2b8153be01cb77770cf90a81 (patch) | |
tree | 1c363c9f4f3422f0a82db6c72c0bd3081606c27b /core/l10n/it.php | |
parent | 86ab1cf476ab03d3c3e64ab9603bc1b6a1f27be5 (diff) | |
parent | d8f56e3c00e9cdba37b1155a4314398c7a124103 (diff) | |
download | nextcloud-server-78ee4c1327313a0d2b8153be01cb77770cf90a81.tar.gz nextcloud-server-78ee4c1327313a0d2b8153be01cb77770cf90a81.zip |
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (137 commits)
add comment to clearify when a skip in the foreach happens
remove obsolete code
Always define sendmail_is_available
[tx-robot] updated from transifex
Make hardcoded exception messages translatable
Disable sharing in trashbin app
class Test_Config is already declared
[tx-robot] updated from transifex
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
fixing undefined exception classes
unit test testSetAppValueIfSetToNull() added
unit tests for dynamic backend registration
ignore underscore.js in scrutinizer.yml
adding ownCloud globals to jshintrc: OC, t, n
Use git checkout on directory as some files may not be in git resulting in, e.g.:
adding underscore.js
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
translations for oc-dialogs reside in code
Fix copy conflict dialog translation
[tx-robot] updated from transifex
...
Diffstat (limited to 'core/l10n/it.php')
-rw-r--r-- | core/l10n/it.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/l10n/it.php b/core/l10n/it.php index 2f0017263fa..43e9752f5e0 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -50,6 +50,7 @@ $TRANSLATIONS = array( "Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"), "One file conflict" => "Un file in conflitto", +"New Files" => "File nuovi", "Which files do you want to keep?" => "Quali file vuoi mantenere?", "If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, sarĂ aggiunto un numero al nome del file copiato.", "Cancel" => "Annulla", |