diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-10-30 06:53:49 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-10-30 06:53:49 +0100 |
| commit | 5550cde03b34e86671652258e7f3bbc2a92b6111 (patch) | |
| tree | ec6dd9ac1465a3ae4b9e4bbffdc1c87b78621b4b /core/l10n/it.php | |
| parent | d9d8da0a5cee5fac1e5f24a321dd612f312af508 (diff) | |
| parent | 3fdf239b478273155a68ec4ede8d4e4dd54b504d (diff) | |
| download | nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.tar.gz nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
Diffstat (limited to 'core/l10n/it.php')
| -rw-r--r-- | core/l10n/it.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/l10n/it.php b/core/l10n/it.php index f85e7f89c42..e772d7c5105 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -38,8 +38,8 @@ "ownCloud password reset" => "Ripristino password di ownCloud", "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}", "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email", -"Requested" => "Richiesto", -"Login failed!" => "Accesso non riuscito!", +"Reset email send." => "Email di ripristino inviata.", +"Request failed!" => "Richiesta non riuscita!", "Username" => "Nome utente", "Request reset" => "Richiesta di ripristino", "Your password was reset" => "La password è stata ripristinata", @@ -70,7 +70,6 @@ "Database tablespace" => "Spazio delle tabelle del database", "Database host" => "Host del database", "Finish setup" => "Termina la configurazione", -"web services under your control" => "servizi web nelle tue mani", "Sunday" => "Domenica", "Monday" => "Lunedì", "Tuesday" => "Martedì", @@ -90,6 +89,7 @@ "October" => "Ottobre", "November" => "Novembre", "December" => "Dicembre", +"web services under your control" => "servizi web nelle tue mani", "Log out" => "Esci", "Automatic logon rejected!" => "Accesso automatico rifiutato.", "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere stato compromesso.", |