diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index f93c67d920a427f486b4e6adc452ee1547454428..2dd27257abe45381c9cf357ffa51e23da9f1df91 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -1,6 +1,6 @@
t("Missing requirements.");
- $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+ $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
\OC_App::disable('files_encryption');
\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
\OCP\Template::printErrorPage($error_msg, $hint);
@@ -227,6 +224,7 @@ class Hooks {
*/
public static function preShared($params) {
+ $l = new \OC_L10N('files_encryption');
$users = array();
$view = new \OC\Files\View('/public-keys/');
@@ -239,21 +237,18 @@ class Hooks {
break;
}
- $error = false;
+ $notConfigured = array();
foreach ($users as $user) {
if (!$view->file_exists($user . '.public.key')) {
- $error = true;
- break;
+ $notConfigured[] = $user;
}
}
- if ($error) // Set flag var 'run' to notify emitting
- // script that hook execution failed
- {
- $params['run']->run = false;
+ if (count($notConfigured) > 0) {
+ $params['run'] = false;
+ $params['error'] = $l->t('Following users are not set up for encryption:') . ' ' . join(', ' , $notConfigured);
}
- // TODO: Make sure files_sharing provides user
- // feedback on failed share
+
}
/**
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 1adc158c6b8d0bf36286c999883d76b1736ec7cb..45a0c4616f4c791d030d96d4184fc41535ac4d62 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,4 +1,6 @@
- "جاري الحفظ...",
"Encryption" => "التشفير"
);
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index f21f7641c1a58ce1a1994dff92f7a399f60ff0e2..9060c92ed43fcf8535104a38cf1c837bca05d64d 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,4 +1,6 @@
- "Записване...",
"Encryption" => "Криптиране"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 068de46e7a18d45c52e24a5d98fc69e1b703629c..5fc4f6a13f3b2da94b4dc40ab263a68d49b26e97 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,4 +1,6 @@
- "সংরক্ষণ করা হচ্ছে..",
"Encryption" => "সংকেতায়ন"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index d9d3d7b4fa58f9b006dfc8aadea185ca61ec54fb..14d7992ad5da4773ce995209e3a9af8b63ce98df 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,4 +1,5 @@
- "La clau de recuperació s'ha activat",
"Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
"Missing requirements." => "Manca de requisits.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
+"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
"Saving..." => "Desant...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
"You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "S'han actualitzat els arranjaments de recuperació de fitxers",
"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 981e629ccfee8d1c2d621c661ee3790d88ade8f8..89f63cc1cdd2fd18dd90737aa043f9786c7e5a11 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,22 +1,39 @@
- "Záchranný klíč byl úspěšně povolen",
"Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
-"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče.",
+"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
"Password successfully changed." => "Heslo bylo úspěšně změněno.",
-"Could not change the password. Maybe the old password was not correct." => "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně.",
+"Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
"Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
+"Missing requirements." => "Nesplněné závislosti.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
+"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
"Saving..." => "Ukládám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno zvenčí.",
+"You can unlock your private key in your " => "Můžete odemknout váš soukromý klíč ve vašem",
"personal settings" => "osobní nastavení",
"Encryption" => "Šifrování",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+"Recovery key password" => "Heslo klíče pro obnovu",
"Enabled" => "Povoleno",
"Disabled" => "Zakázáno",
+"Change recovery key password:" => "Změna hesla klíče pro obnovu:",
+"Old Recovery key password" => "Původní heslo klíče pro obnovu",
+"New Recovery key password" => "Nové heslo klíče pro obnovu",
"Change Password" => "Změnit heslo",
-"Old log-in password" => "Staré přihlašovací heslo",
+"Your private key password no longer match your log-in password:" => "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem:",
+"Set your old private key password to your current log-in password." => "Změňte heslo vaše soukromého klíče na stejné jako vaše přihlašovací heslo.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
+"Old log-in password" => "Původní přihlašovací heslo",
"Current log-in password" => "Aktuální přihlašovací heslo",
+"Update Private Key Password" => "Změnit heslo soukromého klíče",
"Enable password recovery:" => "Povolit obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
-"File recovery settings updated" => "Možnosti obnovy souborů aktualizovány",
-"Could not update file recovery" => "Nelze aktualizovat obnovu souborů"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
+"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
+"Could not update file recovery" => "Nelze nastavit záchranu souborů"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index 6e18a7913c84afb6d279d58be1766c1e1d79e8c8..ea8b19963b02a4b835eb50b01dc7d139534ee2b5 100644
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -1,4 +1,6 @@
- "Yn cadw...",
"Encryption" => "Amgryptiad"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index af0d0b5e94a783b03a7c626aea2393c25ea7be7f..1b7069b6784574ae1d4305364b362cd24a484609 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,8 +1,39 @@
- "Gendannelsesnøgle aktiveret med succes",
+"Could not enable recovery key. Please check your recovery key password!" => "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
+"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
+"Could not disable recovery key. Please check your recovery key password!" => "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+"Password successfully changed." => "Kodeordet blev ændret succesfuldt",
+"Could not change the password. Maybe the old password was not correct." => "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+"Private key password successfully updated." => "Privat nøgle kodeord succesfuldt opdateret.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er gyldig! Sandsynligvis blev dit kodeord ændre uden for ownCloud systemet (f.eks. dit firmas register). Du kan opdatere dit private nøgle kodeord under personlige indstillinger, for at generhverve adgang til dine krypterede filer.",
+"Missing requirements." => "Manglende betingelser.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
+"Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
"Saving..." => "Gemmer...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Din private nøgle er ikke gyldig. Måske blev dit kodeord ændre udefra.",
+"You can unlock your private key in your " => "Du kan låse din private nøgle op i din ",
"personal settings" => "Personlige indstillinger",
"Encryption" => "Kryptering",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+"Recovery key password" => "Gendannelsesnøgle kodeord",
"Enabled" => "Aktiveret",
"Disabled" => "Deaktiveret",
-"Change Password" => "Skift Kodeord"
+"Change recovery key password:" => "Skift gendannelsesnøgle kodeord:",
+"Old Recovery key password" => "Gammel Gendannelsesnøgle kodeord",
+"New Recovery key password" => "Ny Gendannelsesnøgle kodeord",
+"Change Password" => "Skift Kodeord",
+"Your private key password no longer match your log-in password:" => "Dit private nøgle kodeord stemmer ikke længere overens med dit login kodeord:",
+"Set your old private key password to your current log-in password." => "Sæt dit gamle private nøgle kodeord til at være dit nuværende login kodeord. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+"Old log-in password" => "Gammelt login kodeord",
+"Current log-in password" => "Nuvrende login kodeord",
+"Update Private Key Password" => "Opdater Privat Nøgle Kodeord",
+"Enable password recovery:" => "Aktiver kodeord gendannelse:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
+"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
+"Could not update file recovery" => "Kunne ikke opdatere filgendannelse"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index d8265906db55c88c63d4e8c117f0878510a8af19..4c36d31ed6bf131275518840d2f107874b4a3172 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,4 +1,5 @@
- "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
"Missing requirements." => "Fehlende Vorraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert ist und die OpenSSL-PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung wurde vorerst deaktiviert.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Saving..." => "Speichern...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Eventuell wurde Ihr Passwort von außerhalb geändert.",
"You can unlock your private key in your " => "Du kannst den privaten Schlüssel ändern und zwar in deinem",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 79bde7e262650f60f7380195b32e4c3a90eefcfc..200001e6ebfbbd569024ba366d9665e4b4133c84 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,4 +1,5 @@
- "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
"Missing requirements." => "Fehlende Voraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Saving..." => "Speichern...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
"You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 990f464bc1a17b4b116e6a72c12a18d13ca7e2bf..70f778f0a5038d6d8a194eb269f89e85892102cc 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,4 +1,5 @@
- "Ο κωδικός αλλάχτηκε επιτυχώς.",
"Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
"Saving..." => "Γίνεται αποθήκευση...",
@@ -9,3 +10,4 @@
"Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 997b60f8ac3c2d126f37dd46398db5606b79f437..d68812530228f5adf2f5268e704165014c702b03 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,5 @@
- "La pasvorto sukcese ŝanĝiĝis.",
"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
@@ -13,3 +14,4 @@
"Current log-in password" => "Nuna ensaluta pasvorto",
"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 0b49edbd2af62ca9cdfce5abd710a6834af4ebcd..8341bafc9fdab992bdc942f13d6cf41f1b29e8bb 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,4 +1,5 @@
- "Se ha habilitado la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index f53bbd437c42e756890f25433f18d113ce1ae4d1..cac8c465362b83b47dc5b0b1064ede90814c3aa8 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,5 @@
- "Se habilitó la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos.",
"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegurate que PHP 5.3.3 o posterior esté instalado y que la extensión OpenSSL de PHP esté habilitada y configurada correctamente. Por el momento, la aplicación de encriptación está deshabilitada.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index c1c8164b8104238810937d41b1f2eef5720b034a..3edb7299c201efff6e0c554658d32715d9fd3da0 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,4 +1,5 @@
- "Taastevõtme lubamine õnnestus",
"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
"Missing requirements." => "Nõutavad on puudu.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
+"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Saving..." => "Salvestamine...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Sinu privaatne võti ei ole õige. Võib-olla on parool vahetatud süsteemi väliselt.",
"You can unlock your private key in your " => "Saad avada oma privaatse võtme oma",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Faili taaste seaded uuendatud",
"Could not update file recovery" => "Ei suuda uuendada taastefaili"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 307cd385e7e924d612cf85e389b32ebf86cd145b..e750c850688d190d78d435a60bcc860312f5599c 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,4 +1,5 @@
- "Berreskuratze gakoa behar bezala gaitua",
"Could not enable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ziurtatu PHP 5.3.3 edo berriagoa instalatuta dagoela eta PHPren OpenSSL gehigarria gaituta eta ongi konfiguratuta dagoela. Oraingoz enkriptazio programa ez dago gaituta.",
"Saving..." => "Gordetzen...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Zure gako pribatua ez da egokia! Agian zure pasahitza kanpotik aldatu da.",
"You can unlock your private key in your " => "Zure gako pribatua desblokeatu dezakezu zure",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 8967ca1eed85b08ae554184d16d311feb498c01e..461ec2b92cbaea91ca7e7b8e1b65c1f2d0b2bba4 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,4 +1,5 @@
- "کلید بازیابی با موفقیت فعال شده است.",
"Could not enable recovery key. Please check your recovery key password!" => "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
"Recovery key successfully disabled" => "کلید بازیابی با موفقیت غیر فعال شده است.",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "کلید خصوصی شما معتبر نمی باشد! ظاهرا رمزعبور شما بیرون از سیستم ownCloud تغییر یافته است( به عنوان مثال پوشه سازمان شما ). شما میتوانید رمزعبور کلید خصوصی خود را در تنظیمات شخصیتان به روز کنید تا بتوانید به فایل های رمزگذاری شده خود را دسترسی داشته باشید.",
"Missing requirements." => "نیازمندی های گمشده",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "لطفا مطمئن شوید که PHP 5.3.3 یا جدیدتر نصب شده و پسوند OpenSSL PHP فعال است و به درستی پیکربندی شده است. در حال حاضر، برنامه رمزگذاری غیر فعال شده است.",
"Saving..." => "در حال ذخیره سازی...",
"Your private key is not valid! Maybe the your password was changed from outside." => "کلید خصوصی شما معتبر نیست! شاید رمزعبوراز بیرون تغییر یافته است.",
"You can unlock your private key in your " => "شما میتوانید کلید خصوصی خود را باز نمایید.",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "تنظیمات بازیابی فایل به روز شده است.",
"Could not update file recovery" => "به روز رسانی بازیابی فایل را نمی تواند انجام دهد."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index a00cc8ab96e09e3339f2326dc9a81e55b1501516..53b0a6b25cd9e8cbb785ee47cd69ee0488fa49de 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,4 +1,5 @@
- "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Saving..." => "Tallennetaan...",
@@ -7,3 +8,4 @@
"Disabled" => "Ei käytössä",
"Change Password" => "Vaihda salasana"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 174932d6e8aeb12c269b9819fd8a47aace8b4b6b..12af810139434711b7fa653b28921c3589d127c4 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,4 +1,5 @@
- "Clé de récupération activée avec succès",
"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
"Missing requirements." => "Système minimum requis non respecté.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou plus récente est installée et que l'extension OpenSSL de PHP est activée et configurée correctement. En attendant, l'application de cryptage a été désactivée.",
"Saving..." => "Enregistrement...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
"You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index db6f57bb36d1650e83bfe86616d8fd2447e86983..abf12d73d577483a05c1c3d55fda81e24cfe9447 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,4 +1,5 @@
- "Activada satisfactoriamente a chave de recuperación",
"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
"Missing requirements." => "Non se cumpren os requisitos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
+"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
"Saving..." => "Gardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
"You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 7a80cfa2f9f07af3dca60f85539559762b72a093..cdf29c9b0ac46c7c675987cb8abaad0feed4c92a 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,6 @@
- "שמירה…",
"Encryption" => "הצפנה"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
index 9b9284ddc5eaec498397034f55e74681f620a241..60ee610bd3e93756dee01726c620711714f25ef7 100644
--- a/apps/files_encryption/l10n/hr.php
+++ b/apps/files_encryption/l10n/hr.php
@@ -1,3 +1,5 @@
- "Spremanje..."
);
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index bf95c31f2c5fa61a459b58b0b882d23465c068ce..49dcf817fb7680c486b8021179f00eb3758ab27c 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,4 +1,6 @@
- "Mentés...",
"Encryption" => "Titkosítás"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index ad827b537910c58755d2825e024f9286604ee946..32c348bd8babe2edf83c80fa86402102fc7a04f7 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,4 +1,6 @@
- "Menyimpan...",
"Encryption" => "Enkripsi"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 0f98c6bd3bff6c7c602358919e478ab2b6c1487a..27c0904a532093fb3e5a38ef5f5767da2477abbb 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,6 @@
- "Er að vista ...",
"Encryption" => "Dulkóðun"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 8d15d1ced363fd7fef203d78cd3dd23cb5731f89..f9534d7eca3e152823b1cb5c143c6ee82d7bf808 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,4 +1,5 @@
- "Chiave di ripristino abilitata correttamente",
"Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
"Missing requirements." => "Requisiti mancanti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
+"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
"Saving..." => "Salvataggio in corso...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index a1fcbd5c5443604f035cbc9216273b32c21c9279..d1f8303bda741c9a6a5dca5e1f1cb6cce3e781ea 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,4 +1,5 @@
- "リカバリ用のキーは正常に有効化されました",
"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい!",
"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
"Missing requirements." => "必要要件が満たされていません。",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
+"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません:",
"Saving..." => "保存中...",
"Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
"You can unlock your private key in your " => "個人設定で",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "ファイル復旧設定が更新されました",
"Could not update file recovery" => "ファイル復旧を更新できませんでした"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 55a59f44341af0c3a7a1485e2779807de11deb4e..bbabd44964800a5cafbec267b2a77d136751968b 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,4 +1,6 @@
- "შენახვა...",
"Encryption" => "ენკრიპცია"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 52e0997ef7bd08dbab580dddbcb5bfca023dd261..cfe9f99fa194d7a42df1a8349f2b05756a593aef 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,5 @@
- "암호가 성공적으로 변경되었습니다",
"Could not change the password. Maybe the old password was not correct." => "암호를 변경할수 없습니다. 아마도 예전 암호가 정확하지 않은것 같습니다.",
"Private key password successfully updated." => "개인키 암호가 성공적으로 업데이트 됨.",
@@ -16,3 +17,4 @@
"File recovery settings updated" => "파일 복구 설정 업데이트됨",
"Could not update file recovery" => "파일 복구를 업데이트 할수 없습니다"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 61b720372ec0ac322422ae32d1e7745a11404b8d..d971350b4c7fc6f156d1b153c9effd54de862899 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
- "پاشکهوتدهکات...",
"Encryption" => "نهێنیکردن"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
index 77bad681732931b2d094e3a5b1bffcea7770604b..a33f4969b0949733e45270d406cd0c6a326fc12a 100644
--- a/apps/files_encryption/l10n/lb.php
+++ b/apps/files_encryption/l10n/lb.php
@@ -1,3 +1,5 @@
- "Speicheren..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 84fa902dc655369c802cdef1b6aeafd0da6f36af..9fbf7b296046029bc85f376afdd9b90df55cfdc3 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,5 @@
- "Atkūrimo raktas sėkmingai įjungtas",
"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
@@ -13,3 +14,4 @@
"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 04922854ceba7938a57ddd7e041f35105b7afff9..b8414174a745f0e9e69512438ad558aab35683c6 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,4 +1,6 @@
- "Saglabā...",
"Encryption" => "Šifrēšana"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index a7216f205adbee12a97fd0b208deeed3958e956f..fd8dd4e51c1cb71fd4dc35897f1d393efc7029d7 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,6 @@
- "Снимам...",
"Encryption" => "Енкрипција"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_encryption/l10n/ms_MY.php b/apps/files_encryption/l10n/ms_MY.php
index bb963cb72d26e8c91fd52d77c707b6dfa3c8dc96..f73e61c167411eb90e814ec3bab86bd70f87a739 100644
--- a/apps/files_encryption/l10n/ms_MY.php
+++ b/apps/files_encryption/l10n/ms_MY.php
@@ -1,3 +1,5 @@
- "Simpan..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index d4e2b1ffb50a8ef55643cfd438e1a6d54a019804..26956c410a3301578e95ff82ae95afcbe5c4b840 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,4 +1,6 @@
- "Lagrer...",
"Encryption" => "Kryptering"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 9cf7bcd172156b5a9b5fe3ba774f562f19d79eb9..e37ccf54d6dc375d46f155af464789ca4f9bf3cb 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,4 +1,5 @@
- "Herstelsleutel succesvol geactiveerd",
"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
"Missing requirements." => "Missende benodigdheden.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Saving..." => "Opslaan",
"Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
"You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index 97b3a27a9d0b7c772d640610beae89c6b2a16ea2..b99d0751540d4008389f1b53ebb8b775d0a24f1f 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,3 +1,5 @@
- "Lagrar …"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/oc.php b/apps/files_encryption/l10n/oc.php
index 0a34c4cda12199ca891d94bb33cc6c2b34169cab..87d1e6ceffb79e302346e413ed3b23aac43adde5 100644
--- a/apps/files_encryption/l10n/oc.php
+++ b/apps/files_encryption/l10n/oc.php
@@ -1,3 +1,5 @@
- "Enregistra..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 3928afb1d5c65be919b2d6cb91de3b0668ef52bb..ca4502ff6aa0219e7466657c0b41ba623770d07b 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,4 +1,5 @@
- "Klucz odzyskiwania włączony",
"Could not enable recovery key. Please check your recovery key password!" => "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
@@ -7,6 +8,10 @@
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
+"Missing requirements." => "Brak wymagań.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
+"Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
"Saving..." => "Zapisywanie...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
"You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
@@ -31,3 +36,4 @@
"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 1563243c9931185b2a742e2672fc327435ef1300..5b8a68657b78d2a5d88c174b9925048b864db970 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,5 @@
- "Recuperação de chave habilitada com sucesso",
"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
@@ -8,8 +9,9 @@
"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
-"Missing requirements." => "Requisitos em falta.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+"Missing requirements." => "Requisitos não encontrados.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
"Saving..." => "Salvando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
@@ -17,7 +19,7 @@
"Encryption" => "Criptografia",
"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
"Recovery key password" => "Senha da chave de recuperação",
-"Enabled" => "Habilidado",
+"Enabled" => "Habilitado",
"Disabled" => "Desabilitado",
"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
"Old Recovery key password" => "Senha antiga da chave de recuperação",
@@ -27,10 +29,11 @@
"Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
"Old log-in password" => "Senha antiga de login",
-"Current log-in password" => "Atual senha de login",
+"Current log-in password" => "Senha de login atual",
"Update Private Key Password" => "Atualizar senha de chave privada",
"Enable password recovery:" => "Habilitar recuperação de senha:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index d3cf596fda501d66e9a077db8e53c1182bd69bee..53335ab7297e70e608593396f0a6899ca4cb1293 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,19 +1,30 @@
- "Chave de recuperação activada com sucesso",
"Could not enable recovery key. Please check your recovery key password!" => "Não foi possível activar a chave de recuperação. Por favor verifique a password da chave de recuperação!",
"Recovery key successfully disabled" => "Chave de recuperação descativada com sucesso",
"Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação.",
"Password successfully changed." => "Password alterada com sucesso.",
"Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
+"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado.",
+"Missing requirements." => "Faltam alguns requisitos.",
"Saving..." => "A guardar...",
"personal settings" => "configurações personalizadas ",
"Encryption" => "Encriptação",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
+"Recovery key password" => "Chave de recuperação da conta",
"Enabled" => "Activado",
"Disabled" => "Desactivado",
+"Change recovery key password:" => "Alterar a chave de recuperação:",
+"Old Recovery key password" => "Chave anterior de recuperação da conta",
+"New Recovery key password" => "Nova chave de recuperação da conta",
"Change Password" => "Mudar a Password",
+"Old log-in password" => "Password anterior da conta",
+"Current log-in password" => "Password actual da conta",
"Enable password recovery:" => "ativar recuperação do password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opção, tornar-lhe-a possível a obtenção de acesso aos seus ficheiros encriptados caso perca a password.",
"File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros",
"Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 9e04b627c42688174e7bd239a30b06d67eae872a..3dcdce324184ff6c362474f5131d98d474918511 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,6 @@
- "Se salvează...",
"Encryption" => "Încriptare"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 5bb803de2d0a8f14746aca00444dda2f5768cc57..76fd8c5ba53d68e086873049b3b33154e0bf370d 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,5 @@
- "Ключ восстановления успешно установлен",
"Could not enable recovery key. Please check your recovery key password!" => "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!",
"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
"Missing requirements." => "Требования отсутствуют.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что PHP 5.3.3 или новее установлен и что расширение OpenSSL PHP включен и настроен. В настоящее время, шифрование для приложения было отключено.",
"Saving..." => "Сохранение...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
"You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Настройки файла восстановления обновлены",
"Could not update file recovery" => "Невозможно обновить файл восстановления"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
deleted file mode 100644
index 1351f63f89b8e87ba4b736fc449e52cabed6f1f6..0000000000000000000000000000000000000000
--- a/apps/files_encryption/l10n/ru_RU.php
+++ /dev/null
@@ -1,3 +0,0 @@
- "Сохранение"
-);
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index 6c678bb3a4f93ba7dafa670e571d742969a2bc76..5f5330df54746f6a2b71e120149036581ff86e54 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,6 @@
- "සුරැකෙමින් පවතී...",
"Encryption" => "ගුප්ත කේතනය"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index d8894e537061533dceeb8a21743df3f2a47d759f..a723d80773b6751b7fb9f465995f2a2c56a55aec 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,4 +1,5 @@
- "Záchranný kľúč bol úspešne povolený",
"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
@@ -25,3 +26,4 @@
"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 8b28ba011558afb74eae6f4af23926550322336f..8b2f264c62e92935d58e1150b49b193cb1806d2e 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,5 @@
- "Ključ za obnovitev gesla je bil uspešno nastavljen",
"Could not enable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče nastaviti. Preverite ključ!",
"Recovery key successfully disabled" => "Ključ za obnovitev gesla je bil uspešno onemogočen",
@@ -8,6 +9,9 @@
"Private key password successfully updated." => "Zasebni ključ za geslo je bil uspešno posodobljen.",
"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah.",
+"Missing requirements." => "Manjkajoče zahteve",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, da imate na strežniku nameščen paket PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno.",
+"Following users are not set up for encryption:" => "Naslednji uporabniki še nimajo nastavljenega šifriranja:",
"Saving..." => "Poteka shranjevanje ...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.",
"You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v",
@@ -32,3 +36,4 @@
"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index a36e37c1790f1e7158feb4d1c3fcdaea563058a4..cbf87dcf4d27e717945b18604afd7acdb111912c 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,6 @@
- "Чување у току...",
"Encryption" => "Шифровање"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 2cef6686fce37b83eb4586680489cea68fa4a245..88ba6b471597312f046379199e75f53ea096e868 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,4 +1,5 @@
- "Återställningsnyckeln har framgångsrikt aktiverats",
"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
"Missing requirements." => "Krav som saknas",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
+"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
"Saving..." => "Sparar...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
"You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
"Could not update file recovery" => "Kunde inte uppdatera filåterställning"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 63fe9ecde86944b117bd14a603506940ddd76e6a..9dec6de3acb361bac78191a586bc43f0de256478 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,6 @@
- "சேமிக்கப்படுகிறது...",
"Encryption" => "மறைக்குறியீடு"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 6cab4370ccf2413b2140c49bbd0fdfb4ea39edc1..7bf3e2765aada2e77738fb41477e38e7557e8406 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,6 @@
- "กำลังบันทึกข้อมูล...",
"Encryption" => "การเข้ารหัส"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 24c6fa472782376a2373f1709b05038253cb9cdc..7fdda1a5bf6e6b0d6aa6cd721bbcd1f4b0ef5c66 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,5 @@
- "Kurtarma anahtarı başarıyla etkinleştirildi",
"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
@@ -13,3 +14,4 @@
"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
"Could not update file recovery" => "Dosya kurtarma güncellenemedi"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 954d95b4132977305ae13648d6c430b91157ac08..25b3f68634b3a6e273259804f7590043a59098fe 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,4 +1,6 @@
- "ساقلاۋاتىدۇ…",
"Encryption" => "شىفىرلاش"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 1c176a391423e5abf4e8d6332bd7a14b0d62c7d2..680beddfe680f72a72753efa561323cf9c0f19ff 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,4 +1,6 @@
- "Зберігаю...",
"Encryption" => "Шифрування"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index d11569bb94c443a971dc08716f9467a2571cdad8..18882be63a198b583e23af8ba9d2016ec16a0efd 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,4 +1,5 @@
- "Đã đổi mật khẩu.",
"Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
"Saving..." => "Đang lưu...",
@@ -7,3 +8,4 @@
"Disabled" => "Tắt",
"Change Password" => "Đổi Mật khẩu"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 3c405a81ace8ddfb0ee74281b823a911faa19477..0f9f459c771ab3145b7983b4148c37c566483d10 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,6 @@
- "保存中...",
"Encryption" => "加密"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index a3939165c7a74d247a61ddf9f3d16f5caf6a44fa..c4c52f4ac2e72e46112e739e5cdc90d345175528 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,5 @@
- "恢复密钥成功启用",
"Could not enable recovery key. Please check your recovery key password!" => "不能启用恢复密钥。请检查恢复密钥密码!",
"Recovery key successfully disabled" => "恢复密钥成功禁用",
@@ -32,3 +33,4 @@
"File recovery settings updated" => "文件恢复设置已更新",
"Could not update file recovery" => "不能更新文件恢复"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0a38a2ddf856ddb1e460af9821642559a44d6e5d..edbeb0f1c66b83a4ce6bc0840e7892202cbf769d 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,3 +1,5 @@
- "加密"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index cc43ec37a432204aa8ef32eaa4a8bfa0f4129d9b..02dc49cc3d944f70f54b84dfaa8636a80610dd97 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,8 +1,8 @@
- "成功變更密碼。",
"Could not change the password. Maybe the old password was not correct." => "無法變更密碼,或許是輸入的舊密碼不正確。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私鑰不正確! 感覺像是密碼在 ownCloud 系統之外被改變(例:您的目錄)。 您可以在個人設定中更新私鑰密碼取回已加密的檔案。",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "請確認已安裝 PHP 5.3.3 或更新的版本並啟用 OpenSSL PHP 且正確設定。目前 encryption app 不可使用。",
"Saving..." => "儲存中...",
"Encryption" => "加密",
"Enabled" => "已啓用",
@@ -14,3 +14,4 @@
"File recovery settings updated" => "檔案還原設定已更新",
"Could not update file recovery" => "無法更新檔案還原設定"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 6543a0de5f3b94b8a059e0bf01f1b1a32260041d..3947b7d0c3b83c307726abc9e67ec802813e1fb1 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,6 @@
namespace OCA\Encryption;
-//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
/**
@@ -57,7 +56,9 @@ class Crypt {
if ($res === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
- \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+ while ($msg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
+ }
} elseif (openssl_pkey_export($res, $privateKey)) {
// Get public key
$keyDetails = openssl_pkey_get_details($res);
@@ -84,7 +85,7 @@ class Crypt {
* blocks with encryption alone, hence padding is added to achieve the
* required length.
*/
- public static function addPadding($data) {
+ private static function addPadding($data) {
$padded = $data . 'xx';
@@ -97,7 +98,7 @@ class Crypt {
* @param string $padded padded data to remove padding from
* @return string unpadded data on success, false on error
*/
- public static function removePadding($padded) {
+ private static function removePadding($padded) {
if (substr($padded, -2) === 'xx') {
@@ -205,7 +206,7 @@ class Crypt {
* @param string $passphrase
* @return string encrypted file content
*/
- public static function encrypt($plainContent, $iv, $passphrase = '') {
+ private static function encrypt($plainContent, $iv, $passphrase = '') {
if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $encryptedContent;
@@ -226,7 +227,7 @@ class Crypt {
* @throws \Exception
* @return string decrypted file content
*/
- public static function decrypt($encryptedContent, $iv, $passphrase) {
+ private static function decrypt($encryptedContent, $iv, $passphrase) {
if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
@@ -246,7 +247,7 @@ class Crypt {
* @param string $iv IV to be concatenated
* @returns string concatenated content
*/
- public static function concatIv($content, $iv) {
+ private static function concatIv($content, $iv) {
$combined = $content . '00iv00' . $iv;
@@ -259,7 +260,7 @@ class Crypt {
* @param string $catFile concatenated data to be split
* @returns array keys: encrypted, iv
*/
- public static function splitIv($catFile) {
+ private static function splitIv($catFile) {
// Fetch encryption metadata from end of file
$meta = substr($catFile, -22);
@@ -376,34 +377,6 @@ class Crypt {
}
-
- /**
- * @brief Creates symmetric keyfile content using a generated key
- * @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
- public static function symmetricEncryptFileContentKeyfile($plainContent) {
-
- $key = self::generateKey();
-
- if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {
-
- return array(
- 'key' => $key,
- 'encrypted' => $encryptedContent
- );
-
- } else {
-
- return false;
-
- }
-
- }
-
/**
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
@@ -486,43 +459,11 @@ class Crypt {
}
- /**
- * @brief Asymetrically encrypt a string using a public key
- * @param $plainContent
- * @param $publicKey
- * @return string encrypted file
- */
- public static function keyEncrypt($plainContent, $publicKey) {
-
- openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);
-
- return $encryptedContent;
-
- }
-
- /**
- * @brief Asymetrically decrypt a file using a private key
- * @param $encryptedContent
- * @param $privatekey
- * @return string decrypted file
- */
- public static function keyDecrypt($encryptedContent, $privatekey) {
-
- $result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
-
- if ($result) {
- return $plainContent;
- }
-
- return $result;
-
- }
-
/**
* @brief Generates a pseudo random initialisation vector
* @return String $iv generated IV
*/
- public static function generateIv() {
+ private static function generateIv() {
if ($random = openssl_random_pseudo_bytes(12, $strong)) {
@@ -548,7 +489,7 @@ class Crypt {
}
/**
- * @brief Generate a pseudo random 1024kb ASCII key
+ * @brief Generate a pseudo random 1024kb ASCII key, used as file key
* @returns $key Generated key
*/
public static function generateKey() {
@@ -574,13 +515,13 @@ class Crypt {
}
/**
- * @brief Get the blowfish encryption handeler for a key
+ * @brief Get the blowfish encryption handler for a key
* @param $key string (optional)
* @return \Crypt_Blowfish blowfish object
*
- * if the key is left out, the default handeler will be used
+ * if the key is left out, the default handler will be used
*/
- public static function getBlowfish($key = '') {
+ private static function getBlowfish($key = '') {
if ($key) {
@@ -594,38 +535,6 @@ class Crypt {
}
- /**
- * @param $passphrase
- * @return mixed
- */
- public static function legacyCreateKey($passphrase) {
-
- // Generate a random integer
- $key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);
-
- // Encrypt the key with the passphrase
- $legacyEncKey = self::legacyEncrypt($key, $passphrase);
-
- return $legacyEncKey;
-
- }
-
- /**
- * @brief encrypts content using legacy blowfish system
- * @param string $content the cleartext message you want to encrypt
- * @param string $passphrase
- * @returns string encrypted content
- *
- * This function encrypts an content
- */
- public static function legacyEncrypt($content, $passphrase = '') {
-
- $bf = self::getBlowfish($passphrase);
-
- return $bf->encrypt($content);
-
- }
-
/**
* @brief decrypts content using legacy blowfish system
* @param string $content the cleartext message you want to decrypt
@@ -663,4 +572,4 @@ class Crypt {
}
}
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index a9a78026d969aa3784d9a9ed98ef0eecd88bac26..0209a5d18b78a555bfd17397428aed58cded46e1 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -259,6 +259,21 @@ class Helper {
return (bool) $result;
}
+
+ /**
+ * check some common errors if the server isn't configured properly for encryption
+ * @return bool true if configuration seems to be OK
+ */
+ public static function checkConfiguration() {
+ if(openssl_pkey_new(array('private_key_bits' => 4096))) {
+ return true;
+ } else {
+ while ($msg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
+ }
+ return false;
+ }
+ }
/**
* @brief glob uses different pattern than regular expressions, escape glob pattern only
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9d351983e2a6816d9eed7d34e03bdbe5e21da70a..d89fe1e33b9fa560063182db3adc3d08c3b89044 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -21,30 +21,6 @@
*
*/
-# Bugs
-# ----
-# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Sharing all files to admin for recovery purposes still in progress
-# Possibly public links are broken (not tested since last merge of master)
-
-
-# Missing features
-# ----------------
-# Make sure user knows if large files weren't encrypted
-
-
-# Test
-# ----
-# Test that writing files works when recovery is enabled, and sharing API is disabled
-# Test trashbin support
-
-
-// Old Todo:
-// - Crypt/decrypt button in the userinterface
-// - Setting if crypto should be on by default
-// - Add a setting "Don´t encrypt files larger than xx because of performance
-// reasons"
-
namespace OCA\Encryption;
/**
@@ -57,45 +33,6 @@ namespace OCA\Encryption;
class Util {
- // Web UI:
-
- //// DONE: files created via web ui are encrypted
- //// DONE: file created & encrypted via web ui are readable in web ui
- //// DONE: file created & encrypted via web ui are readable via webdav
-
-
- // WebDAV:
-
- //// DONE: new data filled files added via webdav get encrypted
- //// DONE: new data filled files added via webdav are readable via webdav
- //// DONE: reading unencrypted files when encryption is enabled works via
- //// webdav
- //// DONE: files created & encrypted via web ui are readable via webdav
-
-
- // Legacy support:
-
- //// DONE: add method to check if file is encrypted using new system
- //// DONE: add method to check if file is encrypted using old system
- //// DONE: add method to fetch legacy key
- //// DONE: add method to decrypt legacy encrypted data
-
-
- // Admin UI:
-
- //// DONE: changing user password also changes encryption passphrase
-
- //// TODO: add support for optional recovery in case of lost passphrase / keys
- //// TODO: add admin optional required long passphrase for users
- //// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-
-
- // Integration testing:
-
- //// TODO: test new encryption with versioning
- //// DONE: test new encryption with sharing
- //// TODO: test new encryption with proxies
-
const MIGRATION_COMPLETED = 1; // migration to new encryption completed
const MIGRATION_IN_PROGRESS = -1; // migration is running
const MIGRATION_OPEN = 0; // user still needs to be migrated
@@ -1093,46 +1030,22 @@ class Util {
}
/**
- * @brief Decrypt a keyfile without knowing how it was encrypted
+ * @brief Decrypt a keyfile
* @param string $filePath
- * @param string $fileOwner
* @param string $privateKey
* @return bool|string
- * @note Checks whether file was encrypted with openssl_seal or
- * openssl_encrypt, and decrypts accrdingly
- * @note This was used when 2 types of encryption for keyfiles was used,
- * but now we've switched to exclusively using openssl_seal()
*/
- public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey) {
+ private function decryptKeyfile($filePath, $privateKey) {
// Get the encrypted keyfile
- // NOTE: the keyfile format depends on how it was encrypted! At
- // this stage we don't know how it was encrypted
$encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
- // We need to decrypt the keyfile
- // Has the file been shared yet?
- if (
- $this->userId === $fileOwner
- && !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
- ) {
-
- // The file has no shareKey, and its keyfile must be
- // decrypted conventionally
- $plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
+ // The file has a shareKey and must use it for decryption
+ $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
-
- } else {
-
- // The file has a shareKey and must use it for decryption
- $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
-
- $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
-
- }
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
return $plainKeyfile;
-
}
/**
@@ -1171,7 +1084,7 @@ class Util {
$fileOwner = \OC\Files\Filesystem::getOwner($filePath);
// Decrypt keyfile
- $plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+ $plainKeyfile = $this->decryptKeyfile($filePath, $privateKey);
// Re-enc keyfile to (additional) sharekeys
$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index cd4be9acc47169d5f8e0a8ebb1ae652d0288a290..630b50481e581eec1a4d710d2dfe7d49ebad42ab 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -115,130 +115,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
}
- /**
- * @large
- * @return String
- */
- function testGenerateIv() {
-
- $iv = Encryption\Crypt::generateIv();
-
- $this->assertEquals(16, strlen($iv));
-
- return $iv;
-
- }
-
- /**
- * @large
- * @depends testGenerateIv
- */
- function testConcatIv($iv) {
-
- $catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
-
- // Fetch encryption metadata from end of file
- $meta = substr($catFile, -22);
-
- $identifier = substr($meta, 0, 6);
-
- // Fetch IV from end of file
- $foundIv = substr($meta, 6);
-
- $this->assertEquals('00iv00', $identifier);
-
- $this->assertEquals($iv, $foundIv);
-
- // Remove IV and IV identifier text to expose encrypted content
- $data = substr($catFile, 0, -22);
-
- $this->assertEquals($this->dataLong, $data);
-
- return array(
- 'iv' => $iv
- ,
- 'catfile' => $catFile
- );
-
- }
-
- /**
- * @medium
- * @depends testConcatIv
- */
- function testSplitIv($testConcatIv) {
-
- // Split catfile into components
- $splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
-
- // Check that original IV and split IV match
- $this->assertEquals($testConcatIv['iv'], $splitCatfile['iv']);
-
- // Check that original data and split data match
- $this->assertEquals($this->dataLong, $splitCatfile['encrypted']);
-
- }
-
- /**
- * @medium
- * @return string padded
- */
- function testAddPadding() {
-
- $padded = Encryption\Crypt::addPadding($this->dataLong);
-
- $padding = substr($padded, -2);
-
- $this->assertEquals('xx', $padding);
-
- return $padded;
-
- }
-
- /**
- * @medium
- * @depends testAddPadding
- */
- function testRemovePadding($padded) {
-
- $noPadding = Encryption\Crypt::RemovePadding($padded);
-
- $this->assertEquals($this->dataLong, $noPadding);
-
- }
-
- /**
- * @medium
- */
- function testEncrypt() {
-
- $random = openssl_random_pseudo_bytes(13);
-
- $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
-
- $this->assertNotEquals($this->dataUrl, $crypted);
-
- }
-
- /**
- * @medium
- */
- function testDecrypt() {
-
- $random = openssl_random_pseudo_bytes(13);
-
- $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
-
- $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
-
- $decrypt = Encryption\Crypt::decrypt($crypted, $iv, 'hat');
-
- $this->assertEquals($this->dataUrl, $decrypt);
-
- }
-
function testDecryptPrivateKey() {
// test successful decrypt
@@ -364,14 +240,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
//print_r($r);
// Join IVs and their respective data chunks
- $e = array(
- $r[0] . $r[1],
- $r[2] . $r[3],
- $r[4] . $r[5],
- $r[6] . $r[7],
- $r[8] . $r[9],
- $r[10] . $r[11]
- ); //.$r[11], $r[12].$r[13], $r[14] );
+ $e = array();
+ $i = 0;
+ while ($i < count($r)-1) {
+ $e[] = $r[$i] . $r[$i+1];
+ $i = $i + 2;
+ }
//print_r($e);
@@ -466,24 +340,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->view->unlink($this->userId . '/files/' . $filename);
}
- /**
- * @medium
- */
- function testSymmetricEncryptFileContentKeyfile() {
-
- # TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->dataUrl);
-
- $this->assertNotEquals($this->dataUrl, $crypted['encrypted']);
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted['encrypted'], $crypted['key']);
-
- $this->assertEquals($this->dataUrl, $decrypt);
-
- }
-
/**
* @medium
*/
@@ -526,49 +382,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
}
- /**
- * @medium
- */
- function testKeyEncrypt() {
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt data
- $crypted = Encryption\Crypt::keyEncrypt($this->dataUrl, $pair1['publicKey']);
-
- $this->assertNotEquals($this->dataUrl, $crypted);
-
- // Decrypt data
- $decrypt = Encryption\Crypt::keyDecrypt($crypted, $pair1['privateKey']);
-
- $this->assertEquals($this->dataUrl, $decrypt);
-
- }
-
- /**
- * @medium
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptShort() {
-
- $crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
-
- $this->assertNotEquals($this->dataShort, $crypted);
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
/**
* @medium
* @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptShort
*/
- function testLegacyDecryptShort($crypted) {
+ function testLegacyDecryptShort() {
+
+ $crypted = $this->legacyEncrypt($this->dataShort, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
@@ -576,55 +396,17 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
}
- /**
- * @medium
- * @brief test encryption using legacy blowfish method
- */
- function testLegacyEncryptLong() {
-
- $crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
-
- $this->assertNotEquals($this->dataLong, $crypted);
-
- # TODO: search inencrypted text for actual content to ensure it
- # genuine transformation
-
- return $crypted;
-
- }
-
/**
* @medium
* @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
*/
- function testLegacyDecryptLong($crypted) {
+ function testLegacyDecryptLong() {
+
+ $crypted = $this->legacyEncrypt($this->dataLong, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataLong, $decrypted);
-
- $this->assertFalse(Encryption\Crypt::getBlowfish(''));
- }
-
- /**
- * @medium
- * @brief test generation of legacy encryption key
- * @depends testLegacyDecryptShort
- */
- function testLegacyCreateKey() {
-
- // Create encrypted key
- $encKey = Encryption\Crypt::legacyCreateKey($this->pass);
-
- // Decrypt key
- $key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
-
- $this->assertTrue(is_numeric($key));
-
- // Check that key is correct length
- $this->assertEquals(20, strlen($key));
-
}
/**
@@ -871,4 +653,20 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// tear down
$view->unlink($filename);
}
+
+
+ /**
+ * @brief encryption using legacy blowfish method
+ * @param $data string data to encrypt
+ * @param $passwd string password
+ * @return string
+ */
+ function legacyEncrypt($data, $passwd) {
+
+ $bf = new \Crypt_Blowfish($passwd);
+ $crypted = $bf->encrypt($data);
+
+ return $crypted;
+ }
+
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index a07bd19c1dd21b3db49bfa2475702ca18ce38ff0..7b8fd5d124de2a5d6d78e77776bd6fa91ec57045 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -141,7 +141,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
*/
function testSetFileKey() {
- $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+ $key = $this->randomKey;
$file = 'unittest-' . time() . '.txt';
@@ -149,27 +149,17 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $this->dataShort);
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
-
- //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
- Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
-
- $this->assertTrue($this->view->file_exists(
- '/' . $this->userId . '/files_encryption/keyfiles/' . $file . '.key'));
+ Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key);
- // enable encryption proxy
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = true;
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $file . '.key'));
// cleanup
$this->view->unlink('/' . $this->userId . '/files/' . $file);
// change encryption proxy to previous state
\OC_FileProxy::$enabled = $proxyStatus;
-
}
/**
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 0fe16976c4d8c4b2ab01246c7d039f983ce48298..59d4adc6fee7c11e7faf28080b1d23354eebc69c 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -884,8 +884,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = $proxyStatus;
// share the file
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
-
+ try {
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+ } catch (Exception $e) {
+ $this->assertEquals(0, strpos($e->getMessage(), "Following users are not set up for encryption"));
+ }
+
+
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
diff --git a/apps/files_external/l10n/af_ZA.php b/apps/files_external/l10n/af_ZA.php
index cf9b951828d37de8c9b72ba32f7c45a4fe83daef..261c44310fddc54f7343ae77dcf3614c25f299bb 100644
--- a/apps/files_external/l10n/af_ZA.php
+++ b/apps/files_external/l10n/af_ZA.php
@@ -1,3 +1,5 @@
- "Gebruikers"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index a53bfe48bc3c82a5f1659537d337390903c6f136..905d221e886d43f4ec75fec51336841f9f81d9ee 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,7 @@
- "مجموعات",
"Users" => "المستخدمين",
"Delete" => "إلغاء"
);
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index fcb01152bf83135b17bf3821c411c4a70cf38bfb..17665d222863efc70f2d8a451b207d3c615e797f 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,4 +1,5 @@
- "Достъпът е даден",
"Grant access" => "Даване на достъп",
"External Storage" => "Външно хранилище",
@@ -16,3 +17,4 @@
"SSL root certificates" => "SSL основни сертификати",
"Import Root Certificate" => "Импортиране на основен сертификат"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 0f032df9f05782566bf6f92f82a3dcb02a6fe6c9..0591dbba55c42a934e1674959ae29d3c1dd50e00 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -1,4 +1,5 @@
- "অধিগমনের অনুমতি প্রদান করা হলো",
"Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
"Grant access" => "অধিগমনের অনুমতি প্রদান কর",
@@ -18,3 +19,4 @@
"SSL root certificates" => "SSL রুট সনদপত্র",
"Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 90ac954301f827110222c7abf00c5187e97c00fb..c1d6ec077b4cdb36caefead8b2e48d97cb93ca09 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -1,4 +1,5 @@
- "S'ha concedit l'accés",
"Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
"Grant access" => "Concedeix accés",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificats SSL root",
"Import Root Certificate" => "Importa certificat root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 12603044d63ee36907d3bf21af1829eec5084957..a574e0506cf365c90ee92e4a08f27b1ed810423a 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,12 +1,13 @@
- "Přístup povolen",
"Error configuring Dropbox storage" => "Chyba při nastavení úložiště Dropbox",
"Grant access" => "Povolit přístup",
"Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
"Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
"
Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "
Varování: není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje.",
-"
Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "
Varování: není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
-"
Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "
Varování: není nainstalována, nebo povolena, podpora Curl v PHP. Není možné připojení oddílů ownCloud, WebDAV, či GoogleDrive. Prosím požádejte svého správce systému ať ji nainstaluje.",
+"
Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "
Varování: podpora FTP v PHP není povolena nebo není nainstalována. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
+"
Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "
Varování: podpora CURL v PHP není povolena nebo není nainstalována. Není možné připojení oddílů ownCloud, WebDAV, či GoogleDrive. Prosím požádejte svého správce systému ať ji nainstaluje.",
"External Storage" => "Externí úložiště",
"Folder name" => "Název složky",
"External storage" => "Externí úložiště",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Kořenové certifikáty SSL",
"Import Root Certificate" => "Importovat kořenového certifikátu"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index 78bbb987eb89093f6cd7b433b0db498071696f8e..33992789cb3b8cb4b508e4eb125b5829806352ed 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,5 +1,7 @@
- "Grwpiau",
"Users" => "Defnyddwyr",
"Delete" => "Dileu"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index f2c1e45778d34c42f15eb8c7ac220c73025cee0d..3a25142b36d7982f377b6b1677b5e4b78250fcc7 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -1,4 +1,5 @@
- "Adgang godkendt",
"Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
"Grant access" => "Godkend adgang",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-rodcertifikater",
"Import Root Certificate" => "Importer rodcertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 8dfa0eafbb4b037fa9910a93f0223bb1651f2ee4..b2c72f768891ffb67ba97181e350d604c9574d47 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -1,4 +1,5 @@
- "Zugriff gestattet",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-Root-Zertifikate",
"Import Root Certificate" => "Root-Zertifikate importieren"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 9b7ab4d53ca80523d2dee4b7f998aa83e14c14f7..8f6a25cb522f17c23e425e9b9b162993fd4150c8 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -1,4 +1,5 @@
- "Zugriff gestattet",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-Root-Zertifikate",
"Import Root Certificate" => "Root-Zertifikate importieren"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 62703b08fbc1422f2b7b9b95bd65643009da7825..0161c0901d68060fd91663c5f5c06b5a3f0cd0fc 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,4 +1,5 @@
- "Προσβαση παρασχέθηκε",
"Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
"Grant access" => "Παροχή πρόσβασης",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Πιστοποιητικά SSL root",
"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index b0afb77498f28d39dcc65fa278b1172f8eda92a2..5697221cac09f94982d6ab1f52045fea6657e192 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,4 +1,5 @@
- "Alirpermeso donita",
"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
"Grant access" => "Doni alirpermeson",
@@ -19,3 +20,4 @@
"SSL root certificates" => "Radikaj SSL-atestoj",
"Import Root Certificate" => "Enporti radikan ateston"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index d145a176f7191e13985e8d0f95a26fe91db096c3..5179d9329a55014a2d75d6efddf50c0ec63d0a7e 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,4 +1,5 @@
- "Acceso concedido",
"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
"Grant access" => "Conceder acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados raíz SSL",
"Import Root Certificate" => "Importar certificado raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index c1b3ac63886b5a166f43f6f09d36176629e5a508..a0bb3a8dfeaa6b45936f4d690cd2e95a3e9e1dea 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -1,4 +1,5 @@
- "Acceso permitido",
"Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
"Grant access" => "Permitir acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "certificados SSL raíz",
"Import Root Certificate" => "Importar certificado raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 465201df4dd3834a40f41c088ca9f7a2c1ce1199..a7e623eb7dac6311db20b7b0f2c29decff33be81 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,4 +1,5 @@
- "Ligipääs on antud",
"Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
"Grant access" => "Anna ligipääs",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root sertifikaadid",
"Import Root Certificate" => "Impordi root sertifikaadid"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 9dc1f3e9c033a63d70988cc672be544ee2812f14..db92e2f001cfee85faac417ad454192b47f569eb 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,4 +1,5 @@
- "Sarrera baimendua",
"Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
"Grant access" => "Baimendu sarrera",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL erro ziurtagiriak",
"Import Root Certificate" => "Inportatu Erro Ziurtagiria"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 036a34c09925095dd0ddb53d8594fb30e31161bd..216893811cb4e796ca2abea7dc143e10d263058d 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,4 +1,5 @@
- "مجوز دسترسی صادر شد",
"Error configuring Dropbox storage" => "خطا به هنگام تنظیم فضای دراپ باکس",
"Grant access" => " مجوز اعطا دسترسی",
@@ -24,3 +25,4 @@
"SSL root certificates" => "گواهی های اصلی SSL ",
"Import Root Certificate" => "وارد کردن گواهی اصلی"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index ba39d140fbc87f922ee3e02fd645ac34168fa6f8..9632aa255ea4c5c4c165e2987d03359c63e56047 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -1,4 +1,5 @@
- "Pääsy sallittu",
"Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
"Grant access" => "Salli pääsy",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-juurivarmenteet",
"Import Root Certificate" => "Tuo juurivarmenne"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 5006133a7b688cc4e59bb84d097a777acc5ac7ec..f6b1a75200c3437509b3e7025f53b1b447d8ee19 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -1,4 +1,5 @@
- "Accès autorisé",
"Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
"Grant access" => "Autoriser l'accès",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificats racine SSL",
"Import Root Certificate" => "Importer un certificat racine"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 77f23c39bc3f95b1c37bd7c5cfc2b4d6708f7559..3dda999dd18ce0b67b371eefd102aa3dd5cd9b98 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -1,4 +1,5 @@
- "Concedeuse acceso",
"Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
"Grant access" => "Permitir o acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL root",
"Import Root Certificate" => "Importar o certificado root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 9cba045d1eafe5d12b01ba1c05bbb5261af7f44c..e99c9f5193d89e99c048717c8c76c1a698d6b682 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -1,4 +1,5 @@
- "הוענקה גישה",
"Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
"Grant access" => "הענקת גישה",
@@ -19,3 +20,4 @@
"SSL root certificates" => "שורש אישורי אבטחת SSL ",
"Import Root Certificate" => "ייבוא אישור אבטחת שורש"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hi.php b/apps/files_external/l10n/hi.php
index 0482efc4b23d20d9675fd371d1f1d8fc8a55e4a5..7df96572596a7781b219b9c5745591a935119d1a 100644
--- a/apps/files_external/l10n/hi.php
+++ b/apps/files_external/l10n/hi.php
@@ -1,3 +1,5 @@
- "उपयोगकर्ता"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
index 24f27ddf81bc2a1067493880089e0db8c9fa0156..91536e0b873ec0ee03fbc19a35e4a5146b8912de 100644
--- a/apps/files_external/l10n/hr.php
+++ b/apps/files_external/l10n/hr.php
@@ -1,5 +1,7 @@
- "Grupe",
"Users" => "Korisnici",
"Delete" => "Obriši"
);
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index b88737a19abde8df8d97c60f132795cc2f4c8d30..23fe916eba65acf3085718f48fa813bcb72a27b9 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -1,4 +1,5 @@
- "Érvényes hozzáférés",
"Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani",
"Grant access" => "Megadom a hozzáférést",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL tanúsítványok",
"Import Root Certificate" => "SSL tanúsítványok importálása"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
index 3b80487278a16a8f1f7b407908ea855f3f5def10..f933bec8feb91959b1303f8d028dda1c815ccf3e 100644
--- a/apps/files_external/l10n/hy.php
+++ b/apps/files_external/l10n/hy.php
@@ -1,3 +1,5 @@
- "Ջնջել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
index f57f96688bf4c0d532e338be9f4fce3f0d276d2a..47b0f89b8b5b5c2406a04c311472f3d02c0dbd60 100644
--- a/apps/files_external/l10n/ia.php
+++ b/apps/files_external/l10n/ia.php
@@ -1,5 +1,7 @@
- "Gruppos",
"Users" => "Usatores",
"Delete" => "Deler"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 30cd28bba1c91fb9f70fcd6809a12040c796f830..53ab79ae7eea955ffb0477efcb4fe99295a50fa2 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,4 +1,5 @@
- "Akses diberikan",
"Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
"Grant access" => "Berikan hak akses",
@@ -23,3 +24,4 @@
"SSL root certificates" => "Sertifikat root SSL",
"Import Root Certificate" => "Impor Sertifikat Root"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 6af53096facafd5205ff3deb9529ab3576397049..d2229d1fcdd8e7c19256fa148d409f6c0e976f78 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -1,4 +1,5 @@
- "Aðgengi veitt",
"Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
"Grant access" => "Veita aðgengi",
@@ -21,3 +22,4 @@
"SSL root certificates" => "SSL rótar skilríki",
"Import Root Certificate" => "Flytja inn rótar skilríki"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 4c70a04022ecba70b8b9845d10047a256a8c5dcb..b53663beb564598cf79944b6d4f9aeafb2cb5791 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -1,4 +1,5 @@
- "Accesso consentito",
"Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
"Grant access" => "Concedi l'accesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificati SSL radice",
"Import Root Certificate" => "Importa certificato radice"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index 97dd4e119d4d9fdecdbe1bc41dfac60d830bdcfd..fc528f035c2b9f142842dfe405be48538bfb943f 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -1,4 +1,5 @@
- "アクセスは許可されました",
"Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
"Grant access" => "アクセスを許可",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSLルート証明書",
"Import Root Certificate" => "ルート証明書をインポート"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka.php b/apps/files_external/l10n/ka.php
index 14c0625e1f280d2661e7dd33cb07e27814ef1fe4..f6356d2cef83005942ee5e3e5ee4b8db773a25ab 100644
--- a/apps/files_external/l10n/ka.php
+++ b/apps/files_external/l10n/ka.php
@@ -1,3 +1,5 @@
- "მომხმარებლები"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index b0845555b4b41d6d46b76cffb628dd6b61ee37af..445d40e70899ea33a99017a2b2a2fd154ab8ed46 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,4 +1,5 @@
- "დაშვება მინიჭებულია",
"Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს",
"Grant access" => "დაშვების მინიჭება",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root სერთიფიკატები",
"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 803b489c218313cae5ce99d463eebee15e753d59..64d815a5bcb59e2d2ea5a7248a6bd2db43a2d11a 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -1,4 +1,5 @@
- "접근 허가됨",
"Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류",
"Grant access" => "접근 권한 부여",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 루트 인증서",
"Import Root Certificate" => "루트 인증서 가져오기"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index 59eabb36c9ffd7f5779582ff862c0ff9723ee4ea..39778bce07238a15a01a931bba6b46475a73ce42 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
- "ناوی بوخچه",
"Users" => "بهكارهێنهر"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 4e78227ec4854d4d7281a9fc69199347bde8c6f1..13233bf36262761dffc5eb70baa1fc379d9c65d1 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,6 +1,8 @@
- "Dossiers Numm:",
"Groups" => "Gruppen",
"Users" => "Benotzer",
"Delete" => "Läschen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 29c962d9a8057b2898921ce6113494c5b9b5ac76..57cdfe6722a97e21b216b7a00f030ec2eb238d87 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,4 +1,5 @@
- "Priėjimas suteiktas",
"Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą",
"Grant access" => "Suteikti priėjimą",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL sertifikatas",
"Import Root Certificate" => "Įkelti pagrindinį sertifikatą"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index b37dbcbdc16adbeeace1cbaf2588e5ce6bec524f..bc9e3aeefe7634c284bb5e596374fa4a50d5744c 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -1,4 +1,5 @@
- "Piešķirta pieeja",
"Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi",
"Grant access" => "Piešķirt pieeju",
@@ -23,3 +24,4 @@
"SSL root certificates" => "SSL saknes sertifikāti",
"Import Root Certificate" => "Importēt saknes sertifikātus"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 1f1a1c27831fd1a6d97e8f5bb4b23b0c13068082..e410b398ac95473cd7c943bd5f4699513f920add 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,4 +1,5 @@
- "Пристапот е дозволен",
"Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
"Grant access" => "Дозволи пристап",
@@ -21,3 +22,4 @@
"SSL root certificates" => "SSL root сертификати",
"Import Root Certificate" => "Увези"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
index 2fdb089ebc6f42d110ca755d899f683269f4fcc2..4e33263a8631b252528a3f09ab5f1bc1df76aa6f 100644
--- a/apps/files_external/l10n/ms_MY.php
+++ b/apps/files_external/l10n/ms_MY.php
@@ -1,5 +1,7 @@
- "Kumpulan",
"Users" => "Pengguna",
"Delete" => "Padam"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
index 5acfbb0321e780fbde7413815f045f9ec50a4366..1cbe5f0fe52b691a7f0bde497b1c5fb043ba05a0 100644
--- a/apps/files_external/l10n/my_MM.php
+++ b/apps/files_external/l10n/my_MM.php
@@ -1,3 +1,5 @@
- "သုံးစွဲသူ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index ea8648303d1be23bec5c75f626e4f1f5ccaf63ec..cb31ac89227f9f4c6bac176edf275eb765042508 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -1,4 +1,5 @@
- "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root-sertifikater",
"Import Root Certificate" => "Importer root-sertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ded5a861a8b50ca0509b0dce2ceb65b97c96715e..35e63b09a352d5639655bc1801683396f651fd73 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -1,4 +1,5 @@
- "Toegang toegestaan",
"Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
"Grant access" => "Sta toegang toe",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root certificaten",
"Import Root Certificate" => "Importeer root certificaat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 998c3f824578b5d2553d84eecd777aff27a8c4ff..7bb38f14cee42a817458068331022b1fef4d2af3 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,6 +1,8 @@
- "Innstillingar",
"Groups" => "Grupper",
"Users" => "Brukarar",
"Delete" => "Slett"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
index 47db011473f714e564a7f6f4879819579babee4c..99f2fd507d2b86388c61f60e17c95878940b082a 100644
--- a/apps/files_external/l10n/oc.php
+++ b/apps/files_external/l10n/oc.php
@@ -1,5 +1,7 @@
- "Grops",
"Users" => "Usancièrs",
"Delete" => "Escafa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index e03ded1e70a222268880990d6d7fc2339755e9e4..f5501b9755b47091ca0047f3ae232031746284b6 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -1,4 +1,5 @@
- "Dostęp do",
"Error configuring Dropbox storage" => "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
"Grant access" => "Udziel dostępu",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Główny certyfikat SSL",
"Import Root Certificate" => "Importuj główny certyfikat"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index bc3c356a5175f89f4d93437da084f4b67376aa4b..f69bbc1ebe62e0e0a7de8397dd6aecf371873876 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -1,4 +1,5 @@
- "Acesso concedido",
"Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
"Grant access" => "Permitir acesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL raíz",
"Import Root Certificate" => "Importar Certificado Raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 0a05d1f8825fb3654dae7470c8b54616aa82dcf6..3f2afd33f079d364f2eb12a7b985492f3a706228 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -1,4 +1,5 @@
- "Acesso autorizado",
"Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
"Grant access" => "Conceder acesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL de raiz",
"Import Root Certificate" => "Importar Certificado Root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index ed23b4cca8f7c52266f92e96603956a8bd59eb9b..7115d09ea94780ab2e8ac624b2ef8238a8146427 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,4 +1,5 @@
- "Acces permis",
"Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
"Grant access" => "Permite accesul",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificate SSL root",
"Import Root Certificate" => "Importă certificat root"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index d2c5292bac414da45f92ca36d928ff3ff087d238..50c25acba06833573977bbba3e7c71ee5eae5be2 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -1,4 +1,5 @@
- "Доступ предоставлен",
"Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
"Grant access" => "Предоставление доступа",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Корневые сертификаты SSL",
"Import Root Certificate" => "Импортировать корневые сертификаты"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
deleted file mode 100644
index a43417dfbc1a134a783914c108680fa888d81f06..0000000000000000000000000000000000000000
--- a/apps/files_external/l10n/ru_RU.php
+++ /dev/null
@@ -1,4 +0,0 @@
- "Группы",
-"Delete" => "Удалить"
-);
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index cc9cb9b9ce50084b2bb06281e90782e5c9df89c9..cad928accef3604aa3b0d97d98a553b6435fb9fe 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -1,4 +1,5 @@
- "පිවිසීමට හැක",
"Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්යාස කිරීමේ දෝශයක් ඇත",
"Grant access" => "පිවිසුම ලබාදෙන්න",
@@ -19,3 +20,4 @@
"SSL root certificates" => "SSL මූල සහතිකයන්",
"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 33edcb9d4c8c112202b001263ff202486b01156e..ca445387bcae8d08b7dc5f40245791fa92791156 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,4 +1,5 @@
- "Prístup povolený",
"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
"Grant access" => "Povoliť prístup",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Koreňové SSL certifikáty",
"Import Root Certificate" => "Importovať koreňový certifikát"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 09b91b913e9a796899b1b8b96d7756939b5e8814..b0fcbf9eb69d306a9c12de375ee42410cb9e20dd 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -1,4 +1,5 @@
- "Dostop je odobren",
"Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
"Grant access" => "Odobri dostop",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Korenska potrdila SSL",
"Import Root Certificate" => "Uvozi korensko potrdilo"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index d5393aa38527a242df701d3002ca1c60335c346c..42de15edadc8ddad3b715e774dfd974ef81eec25 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -1,4 +1,6 @@
- "Përdoruesit",
"Delete" => "Elimino"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
index 2554c498ddafc60584bcbd399f6b4190d60b3749..c456daa004db0dcd52418dd33b016015a99698cf 100644
--- a/apps/files_external/l10n/sr.php
+++ b/apps/files_external/l10n/sr.php
@@ -1,5 +1,7 @@
- "Групе",
"Users" => "Корисници",
"Delete" => "Обриши"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
index 24f27ddf81bc2a1067493880089e0db8c9fa0156..a2489bbc64b7db27bb2e2644bc785bc5ace4630a 100644
--- a/apps/files_external/l10n/sr@latin.php
+++ b/apps/files_external/l10n/sr@latin.php
@@ -1,5 +1,7 @@
- "Grupe",
"Users" => "Korisnici",
"Delete" => "Obriši"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 80e68ab6e0645305d0440d03cd8c17372b5fb4d8..2c0b0ab69e4dd508b939fd0b80fb4be3b097f2cd 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -1,4 +1,5 @@
- "Åtkomst beviljad",
"Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
"Grant access" => "Bevilja åtkomst",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL rotcertifikat",
"Import Root Certificate" => "Importera rotcertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index cee3b6edb8a2b669287a99296b232c942e17c651..bb663a4fcb6a31f26f4d8a4b064d49038ac764e3 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -1,4 +1,5 @@
- "அனுமதி வழங்கப்பட்டது",
"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
"Grant access" => "அனுமதியை வழங்கல்",
@@ -19,3 +20,4 @@
"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index 3d31f6438f586ab936a37a0dca4cf1cc7ccc8e40..7f8d893d46382d80d7c621bcd1ae161d70e65cc7 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,5 +1,7 @@
- "సంచయం పేరు",
"Users" => "వాడుకరులు",
"Delete" => "తొలగించు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 2f733eab9e8f4efca77ffada056b5a28167bb900..f2ea35f10f4783252a3a3ce87ae3733241da516b 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -1,4 +1,5 @@
- "การเข้าถึงได้รับอนุญาตแล้ว",
"Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
"Grant access" => "อนุญาตให้เข้าถึงได้",
@@ -21,3 +22,4 @@
"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 3c3c0c24f97ad6baa6c8529f8272b5aed44ff0b1..cc52c425b8d67c344a2aedf67d357b163900fe89 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,4 +1,5 @@
- "Giriş kabul edildi",
"Error configuring Dropbox storage" => "Dropbox depo yapılandırma hatası",
"Grant access" => "Erişim sağlandı",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL kök sertifikaları",
"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
index 2d1dea989063c0cc93a38882d4c7303f60e6ae1e..ae20f7424da7e96e56d7547f07d1aec42e948b16 100644
--- a/apps/files_external/l10n/ug.php
+++ b/apps/files_external/l10n/ug.php
@@ -1,4 +1,5 @@
- "قىسقۇچ ئاتى",
"External storage" => "سىرتقى ساقلىغۇچ",
"Configuration" => "سەپلىمە",
@@ -7,3 +8,4 @@
"Users" => "ئىشلەتكۈچىلەر",
"Delete" => "ئۆچۈر"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 34d19af0ee94ac061e583979c4dc7ba9521fb3a8..e535b455d10aacbab34ceb58d786423a5f99506e 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,4 +1,5 @@
- "Доступ дозволено",
"Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
"Grant access" => "Дозволити доступ",
@@ -6,6 +7,7 @@
"Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
"
Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "
Попередження: Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його.",
"
Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "
Попередження: Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.",
+"
Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "
Попередження: Підтримка CURL в PHP не увімкнута чи не встановлена. Під'єднанатися OwnCloud / WebDav або Google Drive неможливе. Попрохайте системного адміністратора встановити її.",
"External Storage" => "Зовнішні сховища",
"Folder name" => "Ім'я теки",
"External storage" => "Зовнішнє сховище",
@@ -23,3 +25,4 @@
"SSL root certificates" => "SSL корневі сертифікати",
"Import Root Certificate" => "Імпортувати корневі сертифікати"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
index 278357b4d68c5ec2cb0ed08de2979f0c75aeacb1..56df17991bcf1d655b943a3906474043e1ba1047 100644
--- a/apps/files_external/l10n/ur_PK.php
+++ b/apps/files_external/l10n/ur_PK.php
@@ -1,3 +1,5 @@
- "یوزرز"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 769f9e2a0976aa443ffda271da4e10fe6de52959..da8ac419cdaa9f95e69f842d55931f9fd74366d5 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -1,4 +1,5 @@
- "Đã cấp quyền truy cập",
"Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
"Grant access" => "Cấp quyền truy cập",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Chứng chỉ SSL root",
"Import Root Certificate" => "Nhập Root Certificate"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
index 47298f8007dbfc9b2fa59ceed1e90334347f357f..3633de6314e2057deaa31e7fbbf863f124d88b74 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
- "已授予权限",
"Error configuring Dropbox storage" => "配置 Dropbox 存储出错",
"Grant access" => "授予权限",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 根证书",
"Import Root Certificate" => "导入根证书"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 8157923183cc92a1909a3b06cb7c28b1c8ec2089..5e2c2e4fe0c5b80b27f5e700e0061a00caa4a8b7 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,4 +1,5 @@
- "权限已授予。",
"Error configuring Dropbox storage" => "配置Dropbox存储时出错",
"Grant access" => "授权",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL根证书",
"Import Root Certificate" => "导入根证书"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index a85b5a03b8a57a72423892c9f6446fb6b36f6087..76e0ed69d27fa72ab2b56f77b254e757b29f262a 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -1,5 +1,7 @@
- "群組",
"Users" => "用戶",
"Delete" => "刪除"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index a8314dcef03660b8b3ecd734b66c340f5fb3c610..d85d18a1c321634dd24af794f60119c9d92adc59 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,4 +1,5 @@
- "允許存取",
"Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
"Grant access" => "允許存取",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 根憑證",
"Import Root Certificate" => "匯入根憑證"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index f2dd6108b1a27286d3896f52048f2c5ff9949567..f4d1940b184140ad20e6b659a0cf1d790beacefd 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -33,10 +33,25 @@ use Aws\S3\Exception\S3Exception;
class AmazonS3 extends \OC\Files\Storage\Common {
+ /**
+ * @var \Aws\S3\S3Client
+ */
private $connection;
+ /**
+ * @var string
+ */
private $bucket;
+ /**
+ * @var array
+ */
private static $tmpFiles = array();
+ /**
+ * @var bool
+ */
private $test = false;
+ /**
+ * @var int
+ */
private $timeout = 15;
private function normalizePath($path) {
@@ -96,6 +111,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
throw new \Exception("Creation of bucket failed.");
}
}
@@ -129,6 +145,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -150,6 +167,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$path
);
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -184,6 +202,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -221,6 +240,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return opendir('fakedir://amazons3' . $path);
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
}
@@ -249,6 +269,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return $stat;
} catch(S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
}
@@ -269,6 +290,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return 'dir';
}
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -293,6 +315,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -315,6 +338,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
'SaveAs' => $tmpFile
));
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -361,6 +385,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
'Key' => $path
));
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -398,6 +423,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$this->testTimeout();
}
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -417,6 +443,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
} else {
@@ -432,6 +459,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
));
$this->testTimeout();
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
@@ -514,6 +542,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
unlink($tmpFile);
} catch (S3Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index e3a2cf0b30b347a7e136d055e79bdb5896318b65..14e974d65caab802b7b3615cbdf3fa44283c71c7 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -93,14 +93,18 @@ class OC_Mount_Config {
'root' => '&Root',
'secure' => '!Secure ftps://'));
- if(OC_Mount_Config::checksmbclient()) $backends['\OC\Files\Storage\SMB']=array(
- 'backend' => 'SMB / CIFS',
- 'configuration' => array(
- 'host' => 'URL',
- 'user' => 'Username',
- 'password' => '*Password',
- 'share' => 'Share',
- 'root' => '&Root'));
+ if (!OC_Util::runningOnWindows()) {
+ if (OC_Mount_Config::checksmbclient()) {
+ $backends['\OC\Files\Storage\SMB'] = array(
+ 'backend' => 'SMB / CIFS',
+ 'configuration' => array(
+ 'host' => 'URL',
+ 'user' => 'Username',
+ 'password' => '*Password',
+ 'share' => 'Share',
+ 'root' => '&Root'));
+ }
+ }
if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\DAV']=array(
'backend' => 'ownCloud / WebDAV',
@@ -444,8 +448,10 @@ class OC_Mount_Config {
public static function checkDependencies() {
$l= new OC_L10N('files_external');
$txt='';
- if(!OC_Mount_Config::checksmbclient()) {
- $txt.=$l->t('
Warning: "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'
';
+ if (!OC_Util::runningOnWindows()) {
+ if(!OC_Mount_Config::checksmbclient()) {
+ $txt.=$l->t('
Warning: "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'
';
+ }
}
if(!OC_Mount_Config::checkphpftp()) {
$txt.=$l->t('
Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'
';
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 4869322d87a9f9fcd78f21b24690ec7a46d3508e..f98be318f1ce61b380459cb1dbb70880bb396a5e 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -173,6 +173,7 @@ class DAV extends \OC\Files\Storage\Common{
curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path);
curl_setopt($curl, CURLOPT_FILE, $fp);
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_exec ($curl);
curl_close ($curl);
diff --git a/apps/files_sharing/css/404.css b/apps/files_sharing/css/404.css
new file mode 100644
index 0000000000000000000000000000000000000000..2ed81df3b86fc50750c7ff0dad544043cb80ae28
--- /dev/null
+++ b/apps/files_sharing/css/404.css
@@ -0,0 +1,12 @@
+
+#body-login .error-broken-link{
+ text-align:left;color:#fff;
+}
+
+#body-login .error-broken-link ul{
+ margin:10px 0 10px 0;
+}
+
+#body-login .error-broken-link ul li{
+ list-style: disc;list-style-position:inside;cursor:default;
+}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index eb5a6e8cb7fe27e001353a3e348757e60b4638a9..b2efafde4e78868fcd062582bdad7e6c2c15d685 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -4,6 +4,10 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
+ $('#fileList').one('fileActionsReady',function(){
+ OC.Share.loadIcons('file');
+ });
+
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
if ($('#dir').val() == '/') {
var item = $('#dir').val() + filename;
@@ -33,6 +37,5 @@ $(document).ready(function() {
OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
}
});
- OC.Share.loadIcons('file');
}
-});
+});
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
index 04e194530b1579dd85e08b1ccdacee1964f70d0e..946cc3a5bb81832b2ddb23908ff05bdb91ed2f2f 100644
--- a/apps/files_sharing/l10n/af_ZA.php
+++ b/apps/files_sharing/l10n/af_ZA.php
@@ -1,3 +1,5 @@
- "Wagwoord"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 043c7ee1b27781ea5ceb5be6fa4eec1430a0cd3b..ff7b40d16bcde171fa92ce65d9bb974706e660ea 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,4 +1,5 @@
- "كلمة المرور",
"Submit" => "تطبيق",
"%s shared the folder %s with you" => "%s شارك المجلد %s معك",
@@ -8,3 +9,4 @@
"Cancel upload" => "إلغاء رفع الملفات",
"No preview available for" => "لا يوجد عرض مسبق لـ"
);
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 8e719ba23562924b2b957067e2416d615b9e1d0f..1094870fd0fc20648a87bbb25da2e6d50df77541 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,4 +1,5 @@
- "Парола",
"Submit" => "Потвърждение",
"%s shared the folder %s with you" => "%s сподели папката %s с Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Спри качването",
"No preview available for" => "Няма наличен преглед за"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index baa0c5c707c8af76dc77ab4de89a2cbcc53093f5..71b948e347ba311b6dd8b13ea07ef25a3d1dc841 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,4 +1,5 @@
- "কূটশব্দ",
"Submit" => "জমা দিন",
"%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
@@ -8,3 +9,4 @@
"Cancel upload" => "আপলোড বাতিল কর",
"No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 9d2ab5031c13825586b84f108a69cc2b01812ce7..cbe8f86e253d8eb6aecfffa8b7c7ec1d8cea0882 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,7 +1,14 @@
- "la contrasenya és incorrecta. Intenteu-ho de nou.",
"Password" => "Contrasenya",
"Submit" => "Envia",
+"Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.",
+"Reasons might be:" => "Les raons podrien ser:",
+"the item was removed" => "l'element ha estat eliminat",
+"the link expired" => "l'enllaç ha vençut",
+"sharing is disabled" => "s'ha desactivat la compartició",
+"For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
"%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós",
"%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós",
"Download" => "Baixa",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancel·la la pujada",
"No preview available for" => "No hi ha vista prèvia disponible per a"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index a57764a18bc49a646370a74e12197b5486914a15..7258dedcf6d76c47e81942539cb89a8ca978ca29 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,6 +1,14 @@
- "Heslo není správné. Zkuste to znovu.",
"Password" => "Heslo",
"Submit" => "Odeslat",
+"Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.",
+"Reasons might be:" => "Možné důvody:",
+"the item was removed" => "položka byla odebrána",
+"the link expired" => "platnost odkazu vypršela",
+"sharing is disabled" => "sdílení je zakázané",
+"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
"%s shared the folder %s with you" => "%s s Vámi sdílí složku %s",
"%s shared the file %s with you" => "%s s Vámi sdílí soubor %s",
"Download" => "Stáhnout",
@@ -8,3 +16,4 @@
"Cancel upload" => "Zrušit odesílání",
"No preview available for" => "Náhled není dostupný pro"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 6ff3e274c39af1ceaaf70d0ea43178bcb3ac90c5..66fbc4e1d1c3f249e88eacce8391967c75e78dbe 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,4 +1,5 @@
- "Cyfrinair",
"Submit" => "Cyflwyno",
"%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
@@ -8,3 +9,4 @@
"Cancel upload" => "Diddymu llwytho i fyny",
"No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index cf82e93d4adfa576a591149bb2192d48d4204cc1..0ca0f38161a38836f4858b9dec22d062d2ac2015 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -1,7 +1,14 @@
- "Kodeordet er forkert. Prøv igen.",
"Password" => "Kodeord",
"Submit" => "Send",
+"Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.",
+"Reasons might be:" => "Årsagen kan være:",
+"the item was removed" => "Filen blev fjernet",
+"the link expired" => "linket udløb",
+"sharing is disabled" => "deling er deaktiveret",
+"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
"%s shared the folder %s with you" => "%s delte mappen %s med dig",
"%s shared the file %s with you" => "%s delte filen %s med dig",
"Download" => "Download",
@@ -9,3 +16,4 @@
"Cancel upload" => "Fortryd upload",
"No preview available for" => "Forhåndsvisning ikke tilgængelig for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index ad2d171aa9f2a0607eff9125550af65e0b94bb50..afed17d8839443916bbd9c10c2c899a57152017f 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,7 +1,14 @@
- "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
"Password" => "Passwort",
"Submit" => "Absenden",
+"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+"Reasons might be:" => "Gründe könnten sein:",
+"the item was removed" => "Die Elemente wurden entfernt",
+"the link expired" => "Der Link ist abgelaufen",
+"sharing is disabled" => "Teilen ist deaktiviert",
+"For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat.",
"%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt",
"%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt",
"Download" => "Download",
@@ -9,3 +16,4 @@
"Cancel upload" => "Upload abbrechen",
"No preview available for" => "Es ist keine Vorschau verfügbar für"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index cac7b7591d66f560cca368112db490c8c812310d..1bd24f9d9c4bf47ebb1020c2f4a14e3b256a617a 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,7 +1,14 @@
- "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" => "Passwort",
"Submit" => "Bestätigen",
+"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+"Reasons might be:" => "Gründe könnten sein:",
+"the item was removed" => "Das Element wurde entfernt",
+"the link expired" => "Der Link ist abgelaufen",
+"sharing is disabled" => "Teilen ist deaktiviert",
+"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
"Download" => "Herunterladen",
@@ -9,3 +16,4 @@
"Cancel upload" => "Upload abbrechen",
"No preview available for" => "Es ist keine Vorschau verfügbar für"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index b7b893537186f831731d6491ee43e00c1a9b17bd..93486a831b1972921f716e5deeebfa5d83d7a928 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,6 +1,14 @@
- "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.",
"Password" => "Συνθηματικό",
"Submit" => "Καταχώρηση",
+"Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
+"Reasons might be:" => "Οι λόγοι μπορεί να είναι:",
+"the item was removed" => "το αντικείμενο απομακρύνθηκε",
+"the link expired" => "ο σύνδεσμος έληξε",
+"sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε",
+"For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
"%s shared the folder %s with you" => "%s μοιράστηκε τον φάκελο %s μαζί σας",
"%s shared the file %s with you" => "%s μοιράστηκε το αρχείο %s μαζί σας",
"Download" => "Λήψη",
@@ -8,3 +16,4 @@
"Cancel upload" => "Ακύρωση αποστολής",
"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index cb40c5a168088bf194258df39224b23268a651ee..a60f1fe72f21bbd77cf7d26638589765ba881bb2 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,4 +1,5 @@
- "Secret Code",
"Submit" => "Submit",
"%s shared the folder %s with you" => "%s shared the folder %s with you",
@@ -6,3 +7,4 @@
"Download" => "Download",
"No preview available for" => "No preview available for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index d3ca5370a2c7947efa339341143c66b2d8ecbcf6..70e703bda91a9ad41709c0aa7614ffcc5e809d91 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,4 +1,5 @@
- "Pasvorto",
"Submit" => "Sendi",
"%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
@@ -8,3 +9,4 @@
"Cancel upload" => "Nuligi alŝuton",
"No preview available for" => "Ne haveblas antaŭvido por"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 1b65cf0c1903b13b8df0c056805fc1c55ff51207..1f238d083fbdb07945ba2980ee1266b34f71c460 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,7 +1,14 @@
- "La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
+"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.",
+"Reasons might be:" => "Las causas podrían ser:",
+"the item was removed" => "el elemento fue eliminado",
+"the link expired" => "el enlace expiró",
+"sharing is disabled" => "compartir está desactivado",
+"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
"%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
"%s shared the file %s with you" => "%s compartió el fichero %s contigo",
"Download" => "Descargar",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancelar subida",
"No preview available for" => "No hay vista previa disponible para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 90bfe704d22a8d102ba53af9d325c1dfa20e1c46..fed0b1e7b30f9b4ed4520296b79b3ca1f23b14bb 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -1,4 +1,5 @@
- "La contraseña no es correcta. Probá de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
@@ -9,3 +10,4 @@
"Cancel upload" => "Cancelar subida",
"No preview available for" => "La vista preliminar no está disponible para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 78fe436398c7d652a5b07c69a85eaaee173ca1a7..fe230902ff1b9f75cb727b7094b41c04fbb9f8d1 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,7 +1,14 @@
- "Parool on vale. Proovi uuesti.",
"Password" => "Parool",
"Submit" => "Saada",
+"Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
+"Reasons might be:" => "Põhjused võivad olla:",
+"the item was removed" => "üksus on eemaldatud",
+"the link expired" => "link on aegunud",
+"sharing is disabled" => "jagamine on peatatud",
+"For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
"%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
"%s shared the file %s with you" => "%s jagas sinuga faili %s",
"Download" => "Lae alla",
@@ -9,3 +16,4 @@
"Cancel upload" => "Tühista üleslaadimine",
"No preview available for" => "Eelvaadet pole saadaval"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 1d8891792fb9e28249fc72163dd85dda8550d943..8e13c24a9267bb5ba9425cbb0f1348b4388b8d7f 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,4 +1,5 @@
- "Pasahitza ez da egokia. Saiatu berriro.",
"Password" => "Pasahitza",
"Submit" => "Bidali",
@@ -9,3 +10,4 @@
"Cancel upload" => "Ezeztatu igoera",
"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat "
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 7a744c8463d5cfd44fc1f9b553ad12f46699102f..48888f798a0a1e505b8ed09b1de3994d277c6b36 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,4 +1,5 @@
- "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
"Password" => "گذرواژه",
"Submit" => "ثبت",
@@ -9,3 +10,4 @@
"Cancel upload" => "متوقف کردن بار گذاری",
"No preview available for" => "هیچگونه پیش نمایشی موجود نیست"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 370cbd987445eb8f44be7e73622b8e2c28a455a6..42905be57a686d0e48c543442683b9c80a8c58be 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,7 +1,14 @@
- "Väärä salasana. Yritä uudelleen.",
"Password" => "Salasana",
"Submit" => "Lähetä",
+"Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.",
+"Reasons might be:" => "Mahdollisia syitä:",
+"the item was removed" => "kohde poistettiin",
+"the link expired" => "linkki vanheni",
+"sharing is disabled" => "jakaminen on poistettu käytöstä",
+"For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.",
"%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
"%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi",
"Download" => "Lataa",
@@ -9,3 +16,4 @@
"Cancel upload" => "Peru lähetys",
"No preview available for" => "Ei esikatselua kohteelle"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 32aa6e0065aeadee4a74256d1a34503ddd4dd616..b263cd87959d17c21270c8e6b03ff3fea41826a1 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,4 +1,5 @@
- "Le mot de passe est incorrect. Veuillez réessayer.",
"Password" => "Mot de passe",
"Submit" => "Envoyer",
@@ -9,3 +10,4 @@
"Cancel upload" => "Annuler l'envoi",
"No preview available for" => "Pas d'aperçu disponible pour"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 2d8de8e101972f8928909d8be11db12962e2da47..66b1f0e5ffce5aefa5e9e4fa23836c76c4abe83e 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,7 +1,14 @@
- "O contrasinal é incorrecto. Ténteo de novo.",
"Password" => "Contrasinal",
"Submit" => "Enviar",
+"Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.",
+"Reasons might be:" => "As razóns poderían ser:",
+"the item was removed" => "o elemento foi retirado",
+"the link expired" => "a ligazón caducou",
+"sharing is disabled" => "foi desactivada a compartición",
+"For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
"%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
"%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
"Download" => "Descargar",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancelar o envío",
"No preview available for" => "Sen vista previa dispoñíbel para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 41fc314f3c2c07bd266f116cc773b812dd7c26ab..f8b304898ce75dda95ca1b0c24f28e0387d17a9a 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,4 +1,5 @@
- "סיסמא",
"Submit" => "שליחה",
"%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "ביטול ההעלאה",
"No preview available for" => "אין תצוגה מקדימה זמינה עבור"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 560df54fc94879dc4a36194c970aa8fc1400a6a7..74a2c320438158d5d3dfb359556d07927acc09bc 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,3 +1,5 @@
- "पासवर्ड"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index d5763a8ddb8f9ef48be2a8cac0016a7f484c9987..87eb9567067f2df42fbbaea6bd149c5e7adeb44f 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,7 +1,9 @@
- "Lozinka",
"Submit" => "Pošalji",
"Download" => "Preuzimanje",
"Upload" => "Učitaj",
"Cancel upload" => "Prekini upload"
);
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 15ff6ff3c2bd90c9c4ed3d2a70ab687e339d1325..7ef69b1e0b67cb7a9a70bada4807c0f8f91918b6 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -1,7 +1,14 @@
- "A megadott jelszó nem megfelelő. Próbálja újra!",
"Password" => "Jelszó",
"Submit" => "Elküld",
+"Sorry, this link doesn’t seem to work anymore." => "Sajnos úgy tűnik, ez a link már nem működik.",
+"Reasons might be:" => "Ennek az oka a következő lehet:",
+"the item was removed" => "az állományt időközben eltávolították",
+"the link expired" => "lejárt a link érvényességi ideje",
+"sharing is disabled" => "letiltásra került a megosztás",
+"For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
"%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s",
"%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s",
"Download" => "Letöltés",
@@ -9,3 +16,4 @@
"Cancel upload" => "A feltöltés megszakítása",
"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: "
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
index 438e8a7433cfde7ccdab2b0e2a3c466fb56a415f..d4cb416f45a895f0c390032f0445d94956955488 100644
--- a/apps/files_sharing/l10n/hy.php
+++ b/apps/files_sharing/l10n/hy.php
@@ -1,4 +1,6 @@
- "Հաստատել",
"Download" => "Բեռնել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 01acba5108a1826f84e46f9b971c566bec173b33..5112501073d965f6d1603eec60d9b855238936cc 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,6 +1,8 @@
- "Contrasigno",
"Submit" => "Submitter",
"Download" => "Discargar",
"Upload" => "Incargar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index cc6e591834ca19ec3db0aafa8ca420422d73bd4e..a4d73bd2b7527df7f490ba4b671aff7692dd42a0 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,4 +1,5 @@
- "Sandi",
"Submit" => "Kirim",
"%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
@@ -8,3 +9,4 @@
"Cancel upload" => "Batal pengunggahan",
"No preview available for" => "Tidak ada pratinjau tersedia untuk"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index 222459f7a00aa366f407b6de219db6cf52f2cfd4..05241d3f9e6cc8c85ff67bcd6b3ac6193853daf9 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,4 +1,5 @@
- "Lykilorð",
"Submit" => "Senda",
"%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
@@ -8,3 +9,4 @@
"Cancel upload" => "Hætta við innsendingu",
"No preview available for" => "Yfirlit ekki í boði fyrir"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index cf25c53ca388923aedaa8fa4d1e37c6f5cbf7613..a611e0641c8c09ca1b06a2ef3682e908fef4d14a 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,7 +1,14 @@
- "La password è errata. Prova ancora.",
"Password" => "Password",
"Submit" => "Invia",
+"Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.",
+"Reasons might be:" => "I motivi potrebbero essere:",
+"the item was removed" => "l'elemento è stato rimosso",
+"the link expired" => "il collegamento è scaduto",
+"sharing is disabled" => "la condivisione è disabilitata",
+"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
"%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te",
"%s shared the file %s with you" => "%s ha condiviso il file %s con te",
"Download" => "Scarica",
@@ -9,3 +16,4 @@
"Cancel upload" => "Annulla il caricamento",
"No preview available for" => "Nessuna anteprima disponibile per"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index d2bc2d11245a5c17f1f0470efd9a42db7ee9180f..4f7d5b31c2f70792133008f3a0b57128bd0173ed 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,7 +1,14 @@
- "パスワードが間違っています。再試行してください。",
"Password" => "パスワード",
"Submit" => "送信",
+"Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
+"Reasons might be:" => "理由は以下の通りと考えられます:",
+"the item was removed" => "アイテムが削除されました",
+"the link expired" => "リンクの期限が切れています",
+"sharing is disabled" => "共有が無効になっています",
+"For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
"%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
"Download" => "ダウンロード",
@@ -9,3 +16,4 @@
"Cancel upload" => "アップロードをキャンセル",
"No preview available for" => "プレビューはありません"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka.php b/apps/files_sharing/l10n/ka.php
index 0270d5d6f8c6a5516cb1e294839a69882573385e..a9b046e03b6d54a307afa37a01691770a20fd49c 100644
--- a/apps/files_sharing/l10n/ka.php
+++ b/apps/files_sharing/l10n/ka.php
@@ -1,4 +1,6 @@
- "პაროლი",
"Download" => "გადმოწერა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index c88cc59cf8dc88127a32640577f206814af037d3..a5a80b3c5a19a931ea15fae0ba861248f806d286 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,4 +1,5 @@
- "პაროლი",
"Submit" => "გაგზავნა",
"%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "ატვირთვის გაუქმება",
"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index d2cf52447f17cdd8f0fc02fa32c02e66cb65ebcb..f3a94a70979a25676f57553b41abb90b41c48446 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -1,4 +1,5 @@
- "암호",
"Submit" => "제출",
"%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
@@ -8,3 +9,4 @@
"Cancel upload" => "업로드 취소",
"No preview available for" => "다음 항목을 미리 볼 수 없음:"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 576671aaa754d8749db5f7ffdab06fdf49f0d660..55576a19c36d797a1723cb4c67bd8da8a28ce287 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
- "وشەی تێپەربو",
"Submit" => "ناردن",
"%s shared the folder %s with you" => "%s دابهشی کردووه بوخچهی %s لهگهڵ تۆ",
@@ -7,3 +8,4 @@
"Upload" => "بارکردن",
"No preview available for" => "هیچ پێشبینیهك ئاماده نیه بۆ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index a604affee64501a4c0ee7a60c36534e2e80a9eb9..d37a1d9d22a35b75c0a757520c549c8f9c7e0c54 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,4 +1,5 @@
- "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
"Password" => "Passwuert",
"Submit" => "Fortschécken",
@@ -9,3 +10,4 @@
"Cancel upload" => "Upload ofbriechen",
"No preview available for" => "Keeng Preview do fir"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 0f9347377c9176dc60fc5a4ae288481ee6151a15..5d0e58e2fb295dc0023bd474c08b839542cb5aca 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,4 +1,5 @@
- "Slaptažodis",
"Submit" => "Išsaugoti",
"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
@@ -8,3 +9,4 @@
"Cancel upload" => "Atšaukti siuntimą",
"No preview available for" => "Peržiūra nėra galima"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index be021b8e7a04720373b1f22d676136194cb45bb3..0eb04fb966f34744d712a922116d2dec18355b66 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,4 +1,5 @@
- "Parole",
"Submit" => "Iesniegt",
"%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "Atcelt augšupielādi",
"No preview available for" => "Nav pieejams priekšskatījums priekš"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index ed04035ea5da9d6610efc80f1dd962c6d9cd0b96..c913b2beaf74494e6dfe22e3c5774cbac3250311 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,4 +1,5 @@
- "Лозинка",
"Submit" => "Прати",
"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Откажи прикачување",
"No preview available for" => "Нема достапно преглед за"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 0a6a05b77815f008a1d80f28248182829b7fec5d..0a3d08bbc176d341a836176dd7de39a0d5dd9ee0 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,7 +1,9 @@
- "Kata laluan",
"Submit" => "Hantar",
"Download" => "Muat turun",
"Upload" => "Muat naik",
"Cancel upload" => "Batal muat naik"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index 4b37ab8b48a75365370546eab07a0037df38d5f8..f44010004cdb04c290cf23b461e454370eac0ab1 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,5 +1,7 @@
- "စကားဝှက်",
"Submit" => "ထည့်သွင်းမည်",
"Download" => "ဒေါင်းလုတ်"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 65eadd3ccaec4477e5c2f59a755830d1c6c19c1b..dd8a8edf31388bd0d34fb8e43c3b3cf4076fc8ff 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,4 +1,5 @@
- "Passordet er feil. Prøv på nytt.",
"Password" => "Passord",
"Submit" => "Send inn",
@@ -9,3 +10,4 @@
"Cancel upload" => "Avbryt opplasting",
"No preview available for" => "Forhåndsvisning ikke tilgjengelig for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 90f2f2290ff64996caba2631d09e65e225903d85..9c46a1ab4b3225a5efa80674fd87eb8d8f68de15 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,7 +1,14 @@
- "Wachtwoord ongeldig. Probeer het nogmaals.",
"Password" => "Wachtwoord",
"Submit" => "Verzenden",
+"Sorry, this link doesn’t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
+"Reasons might be:" => "Redenen kunnen zijn:",
+"the item was removed" => "bestand was verwijderd",
+"the link expired" => "de link is verlopen",
+"sharing is disabled" => "delen is uitgeschakeld",
+"For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
"%s shared the folder %s with you" => "%s deelt de map %s met u",
"%s shared the file %s with you" => "%s deelt het bestand %s met u",
"Download" => "Downloaden",
@@ -9,3 +16,4 @@
"Cancel upload" => "Upload afbreken",
"No preview available for" => "Geen voorbeeldweergave beschikbaar voor"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index afa3eabe8cf3dafc4af74a89cf6063d533bfc5a8..bcb6538b09f22b1a6b880ff63f8eec2b56239185 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,4 +1,5 @@
- "Passord",
"Submit" => "Send",
"%s shared the folder %s with you" => "%s delte mappa %s med deg",
@@ -8,3 +9,4 @@
"Cancel upload" => "Avbryt opplasting",
"No preview available for" => "Inga førehandsvising tilgjengeleg for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 4ec48b151a83a8809c00edb4e4dbbd712f485d18..493ddb4dfd3d31b038654563bbecca48ee16ab28 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,7 +1,9 @@
- "Senhal",
"Submit" => "Sosmetre",
"Download" => "Avalcarga",
"Upload" => "Amontcarga",
"Cancel upload" => " Anulla l'amontcargar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 39039da77b6d73f8165c466b4f3b61b0b1dfde45..43c7e2e31447d69a92ecbccf4f37b96fb5d869f7 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,6 +1,14 @@
- "To hasło jest niewłaściwe. Spróbuj ponownie.",
"Password" => "Hasło",
"Submit" => "Wyślij",
+"Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.",
+"Reasons might be:" => "Możliwe powody:",
+"the item was removed" => "element został usunięty",
+"the link expired" => "link wygasł",
+"sharing is disabled" => "Udostępnianie jest wyłączone",
+"For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
"%s shared the folder %s with you" => "%s współdzieli folder z tobą %s",
"%s shared the file %s with you" => "%s współdzieli z tobą plik %s",
"Download" => "Pobierz",
@@ -8,3 +16,4 @@
"Cancel upload" => "Anuluj wysyłanie",
"No preview available for" => "Podgląd nie jest dostępny dla"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index c82989857a9965b2958fc8672e54c88e3bcb2924..9fc1cacf7cbddcc42dc45a312d4dc497e3488fde 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,7 +1,14 @@
- "Senha incorreta. Tente novamente.",
"Password" => "Senha",
"Submit" => "Submeter",
+"Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais funcionar.",
+"Reasons might be:" => "As razões podem ser:",
+"the item was removed" => "o item foi removido",
+"the link expired" => "o link expirou",
+"sharing is disabled" => "compartilhamento está desativada",
+"For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
"%s shared the folder %s with you" => "%s compartilhou a pasta %s com você",
"%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
"Download" => "Baixar",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancelar upload",
"No preview available for" => "Nenhuma visualização disponível para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 8b02e73606223b3f819716f9355f1e181f5b75ef..73dc2a3e1f35f742a803c79cb126d29da36d6c27 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,7 +1,14 @@
- "Password errada, por favor tente de novo",
"Password" => "Password",
"Submit" => "Submeter",
+"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
+"Reasons might be:" => "As razões poderão ser:",
+"the item was removed" => "O item foi removido",
+"the link expired" => "O link expirou",
+"sharing is disabled" => "A partilha está desativada",
+"For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link",
"%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
"%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
"Download" => "Transferir",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancelar envio",
"No preview available for" => "Não há pré-visualização para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 3197068cdd131f6ce16903f717915e1bb6e21572..d17152ff1b1b300f5cb1a39de7389448b8c096ab 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,4 +1,5 @@
- "Parola este incorectă. Încercaţi din nou.",
"Password" => "Parolă",
"Submit" => "Trimite",
@@ -9,3 +10,4 @@
"Cancel upload" => "Anulează încărcarea",
"No preview available for" => "Nici o previzualizare disponibilă pentru "
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 77332c183f64a75bbf3de9151c7c3cb6f8b9788d..f42f1d9aeb6af6cac2b77168b4d258322787a6ed 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,7 +1,14 @@
- "Неверный пароль. Попробуйте еще раз.",
"Password" => "Пароль",
"Submit" => "Отправить",
+"Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.",
+"Reasons might be:" => "Причиной может быть:",
+"the item was removed" => "объект был удалён",
+"the link expired" => "срок ссылки истёк",
+"sharing is disabled" => "обмен отключен",
+"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку.",
"%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас",
"%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас",
"Download" => "Скачать",
@@ -9,3 +16,4 @@
"Cancel upload" => "Отмена загрузки",
"No preview available for" => "Предпросмотр недоступен для"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
deleted file mode 100644
index 2cadd163462aaa92e781eb415cde248d47a4d088..0000000000000000000000000000000000000000
--- a/apps/files_sharing/l10n/ru_RU.php
+++ /dev/null
@@ -1,3 +0,0 @@
- "Загрузка"
-);
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 27b9d649a0af5bccde4812ff61a83ce4b353d43a..6135f09213968e899ccfb91531fb17af32a8a381 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,4 +1,5 @@
- "මුර පදය",
"Submit" => "යොමු කරන්න",
"%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
@@ -8,3 +9,4 @@
"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
"No preview available for" => "පූර්වදර්ශනයක් නොමැත"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 77173b44345c5f3d6def6067d7a45e146f25e879..31ecb28b602f113ab6391df502ee45637a7911fd 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,6 +1,14 @@
- "Heslo je chybné. Skúste to znova.",
"Password" => "Heslo",
"Submit" => "Odoslať",
+"Sorry, this link doesn’t seem to work anymore." => "To je nepríjemné, ale tento odkaz už nie je funkčný.",
+"Reasons might be:" => "Možné dôvody:",
+"the item was removed" => "položka bola presunutá",
+"the link expired" => "linke vypršala platnosť",
+"sharing is disabled" => "zdieľanie je zakázané",
+"For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
"%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
"%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
"Download" => "Sťahovanie",
@@ -8,3 +16,4 @@
"Cancel upload" => "Zrušiť odosielanie",
"No preview available for" => "Žiaden náhľad k dispozícii pre"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 39d2fca81cb25ca3fcb6aa55b5065edecccaf21f..cbd4f5fea2234b4262c28e0f856e0252dab73c95 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,4 +1,5 @@
- "Geslo",
"Submit" => "Pošlji",
"%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
@@ -8,3 +9,4 @@
"Cancel upload" => "Prekliči pošiljanje",
"No preview available for" => "Predogled ni na voljo za"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 1c0e0aa2bd138347c466a4aa7b026201dce73744..ae29e5738ffdd8f67c3ad72b96a497e55cf09907 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,4 +1,5 @@
- "Kodi",
"Submit" => "Parashtro",
"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "Anulo ngarkimin",
"No preview available for" => "Shikimi paraprak nuk është i mundur për"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index f893ec0ab422f3139a249a2630a69577481dc8ea..3b97d15419a117e84b76619299eab7ea60e8841f 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,7 +1,9 @@
- "Лозинка",
"Submit" => "Пошаљи",
"Download" => "Преузми",
"Upload" => "Отпреми",
"Cancel upload" => "Прекини отпремање"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index c45f711e15f559c362bcfe68c2dd093695a067b7..1a6be6257616931897ee0fdc389ae857264ab058 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,6 +1,8 @@
- "Lozinka",
"Submit" => "Pošalji",
"Download" => "Preuzmi",
"Upload" => "Pošalji"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index dac5e33ec509d32d591401601ccf80c839b771b0..b8a5f8629a6ef8b3a2d13df1efa4bfbd5ab707da 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,7 +1,14 @@
- "Lösenordet är fel. Försök igen.",
"Password" => "Lösenord",
"Submit" => "Skicka",
+"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.",
+"Reasons might be:" => "Orsaker kan vara:",
+"the item was removed" => "objektet togs bort",
+"the link expired" => "giltighet för länken har gått ut",
+"sharing is disabled" => "delning är inaktiverat",
+"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.",
"%s shared the folder %s with you" => "%s delade mappen %s med dig",
"%s shared the file %s with you" => "%s delade filen %s med dig",
"Download" => "Ladda ner",
@@ -9,3 +16,4 @@
"Cancel upload" => "Avbryt uppladdning",
"No preview available for" => "Ingen förhandsgranskning tillgänglig för"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 6e69855be11d34e8d84940ee5c410e4458bda74c..b4eb0fb7fb84914ce945a9220d6aafdefa541ab1 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,4 +1,5 @@
- "கடவுச்சொல்",
"Submit" => "சமர்ப்பிக்குக",
"%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
@@ -8,3 +9,4 @@
"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
"No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php
index 1e2eedc684412607f66fba52489aef0edf896b6b..94ca7650e5ffe4b950b95c02dc4d23dfbbdf49ee 100644
--- a/apps/files_sharing/l10n/te.php
+++ b/apps/files_sharing/l10n/te.php
@@ -1,3 +1,5 @@
- "సంకేతపదం"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 608c86d586a872640075786bb72dfc601a870ed4..060bd8bed9472307fa6733aafde4108818138e0b 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,4 +1,5 @@
- "รหัสผ่าน",
"Submit" => "ส่ง",
"%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
@@ -8,3 +9,4 @@
"Cancel upload" => "ยกเลิกการอัพโหลด",
"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 4da9c17c7e8b72783b842cf9ddc2bafc92d55d5d..a5bcff82cf333989387942ca40546049e12352ca 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,4 +1,5 @@
- "Parola",
"Submit" => "Gönder",
"%s shared the folder %s with you" => "%s sizinle paylaşılan %s klasör",
@@ -8,3 +9,4 @@
"Cancel upload" => "Yüklemeyi iptal et",
"No preview available for" => "Kullanılabilir önizleme yok"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 9f9c7beb4105911ac014b4588e7a1c49421e0008..43ee9f77bcd8198244163019ca3323bb82d3bfdb 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,7 +1,9 @@
- "ئىم",
"Submit" => "تاپشۇر",
"Download" => "چۈشۈر",
"Upload" => "يۈكلە",
"Cancel upload" => "يۈكلەشتىن ۋاز كەچ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 8ef7f1bd8adb32a0dd10bae742eac0d6722bdfba..b6a7784c6908ccb1cc16a2f53e3afa98262b4f08 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,4 +1,5 @@
- "Пароль",
"Submit" => "Передати",
"%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Перервати завантаження",
"No preview available for" => "Попередній перегляд недоступний для"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index 745f2f930d193b6c5ab9142a040ea800afa902a1..4f6767c26a136e2c22a894ee0ab5ecd31ccedb3b 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -1,3 +1,5 @@
- "پاسورڈ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index d75fb1dc53f0e5223899b3c1ff4324ceaf9703e9..00e8e094c367ded734e2e3b9c352e6f78e678e42 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -1,4 +1,5 @@
- "Mật khẩu",
"Submit" => "Xác nhận",
"%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
@@ -8,3 +9,4 @@
"Cancel upload" => "Hủy upload",
"No preview available for" => "Không có xem trước cho"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
index 2dd79ec38d4fb8a3cf3255f36c286eceb9076d2d..5c426672c886b455c8bcda966ab428b5d34c1a46 100644
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -1,6 +1,14 @@
- "密码错误。请重试。",
"Password" => "密码",
"Submit" => "提交",
+"Sorry, this link doesn’t seem to work anymore." => "对不起,这个链接看起来是错误的。",
+"Reasons might be:" => "原因可能是:",
+"the item was removed" => "项目已经移除",
+"the link expired" => "链接已过期",
+"sharing is disabled" => "分享已经被禁用",
+"For more info, please ask the person who sent this link." => "欲了解更多信息,请联系将此链接发送给你的人。",
"%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
"%s shared the file %s with you" => "%s 与您分享了文件 %s",
"Download" => "下载",
@@ -8,3 +16,4 @@
"Cancel upload" => "取消上传",
"No preview available for" => "没有预览可用于"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index c7fa08b81f03277826543f42b244743c931087e9..37898a1cd0069be5fdead9e798e70ac72c11ccdf 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -1,4 +1,5 @@
- "密码",
"Submit" => "提交",
"%s shared the folder %s with you" => "%s与您共享了%s文件夹",
@@ -8,3 +9,4 @@
"Cancel upload" => "取消上传",
"No preview available for" => "没有预览"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 8f9b7900c2ccf2f839d665ec778b14d67121370c..434420264eade4bfc3a2d91b59d8ecf71ff9fde8 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,5 +1,7 @@
- "密碼",
"Download" => "下載",
"Upload" => "上傳"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index b172879469fe1dffd90f686829d2a38b79d2782d..b950cbf8c9ec086644cf615e106988e347ec7125 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,4 +1,5 @@
- "密碼",
"Submit" => "送出",
"%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
@@ -8,3 +9,4 @@
"Cancel upload" => "取消上傳",
"No preview available for" => "無法預覽"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 3f8e29345a7f2e0118986a6afe4a66f2ed90537c..741ab145384b3d2745613cab1b26001156809632 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -234,6 +234,12 @@ if (isset($path)) {
} else {
OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
}
+
+$errorTemplate = new OCP\Template('files_sharing', 'part.404', '');
+$errorContent = $errorTemplate->fetchPage();
+
header('HTTP/1.0 404 Not Found');
+OCP\Util::addStyle('files_sharing', '404');
$tmpl = new OCP\Template('', '404', 'guest');
+$tmpl->assign('content', $errorContent);
$tmpl->printPage();
diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php
new file mode 100644
index 0000000000000000000000000000000000000000..b5152e1511a988fdff7dff2e1a3f3dc3c96c7dea
--- /dev/null
+++ b/apps/files_sharing/templates/part.404.php
@@ -0,0 +1,12 @@
+
+ -
+
t('Sorry, this link doesn’t seem to work anymore.')) ?>
+ t('Reasons might be:')); ?>
+
+ - t('the item was removed')); ?>
+ - t('the link expired')); ?>
+ - t('sharing is disabled')); ?>
+
+ t('For more info, please ask the person who sent this link.')); ?>
+
+
\ No newline at end of file
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 16c39ab385382507cdd4a6069c31a2d4cca66805..92361b65f63e01fc7120d0cf6a622c53e2671d71 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -13,7 +13,7 @@ $success = array();
$i = 0;
foreach ($list as $file) {
- if ( $dirlisting=='0') {
+ if ( $dirlisting === '0') {
$delimiter = strrpos($file, '.d');
$filename = substr($file, 0, $delimiter);
$timestamp = substr($file, $delimiter+2);
diff --git a/apps/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e54c7e77b989ec2c518201b76eea845d0930763
--- /dev/null
+++ b/apps/files_trashbin/ajax/isEmpty.php
@@ -0,0 +1,14 @@
+ array("isEmpty" => $trashStatus)));
+
+
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 9d78f166765b13f44344bfb1a3361cd8aec6f7d2..e39004cc0d54ee5758e6d6251d0690b82d1c7f68 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -12,7 +12,7 @@ $success = array();
$i = 0;
foreach ($list as $file) {
- if ( $dirlisting=='0') {
+ if ( $dirlisting === '0') {
$delimiter = strrpos($file, '.d');
$filename = substr($file, 0, $delimiter);
$timestamp = substr($file, $delimiter+2);
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 6f1c364737e1939ba462bc7cfa9ace10ca3c68e7..2dbaefe7a78ebdca37331f3619f0a7db4e3b2bb1 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -24,7 +24,7 @@ if ($dir) {
$dirContent = $view->opendir($dir);
$i = 0;
while($entryName = readdir($dirContent)) {
- if ( $entryName != '.' && $entryName != '..' ) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
$pos = strpos($dir.'/', '/', 1);
$tmp = substr($dir, 0, $pos);
$pos = strrpos($tmp, '.d');
@@ -54,13 +54,13 @@ foreach ($result as $r) {
$i['timestamp'] = $r['timestamp'];
$i['mimetype'] = $r['mime'];
$i['type'] = $r['type'];
- if ($i['type'] == 'file') {
+ if ($i['type'] === 'file') {
$fileinfo = pathinfo($r['id']);
$i['basename'] = $fileinfo['filename'];
$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
}
$i['directory'] = $r['location'];
- if ($i['directory'] == '/') {
+ if ($i['directory'] === '/') {
$i['directory'] = '';
}
$i['permissions'] = OCP\PERMISSION_READ;
@@ -68,9 +68,9 @@ foreach ($result as $r) {
}
function fileCmp($a, $b) {
- if ($a['type'] == 'dir' and $b['type'] != 'dir') {
+ if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
return -1;
- } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
+ } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
return 1;
} else {
return strnatcasecmp($a['name'], $b['name']);
@@ -83,7 +83,7 @@ usort($files, "fileCmp");
$pathtohere = '';
$breadcrumb = array();
foreach (explode('/', $dir) as $i) {
- if ($i != '') {
+ if ($i !== '') {
if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
$name = $match[1];
} else {
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 87dfea491e76afd917c9ba0bcad616be57612b9f..b14a7240cbe5d0c211b9665492d302136b8e6428 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -8,6 +8,7 @@ $(document).ready(function() {
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
+ disableActions();
$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
function(result){
@@ -15,9 +16,10 @@ $(document).ready(function() {
var row = document.getElementById(result.data.success[i].filename);
row.parentNode.removeChild(row);
}
- if (result.status != 'success') {
+ if (result.status !== 'success') {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
}
+ enableActions();
});
});
@@ -34,7 +36,7 @@ $(document).ready(function() {
var newHTML = '
';
var files = tr.attr('data-file');
deleteAction[0].outerHTML = newHTML;
-
+ disableActions();
$.post(OC.filePath('files_trashbin','ajax','delete.php'),
{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
function(result){
@@ -42,9 +44,10 @@ $(document).ready(function() {
var row = document.getElementById(result.data.success[i].filename);
row.parentNode.removeChild(row);
}
- if (result.status != 'success') {
+ if (result.status !== 'success') {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
}
+ enableActions();
});
});
@@ -72,7 +75,7 @@ $(document).ready(function() {
var rows = $(this).parent().parent().parent().children('tr');
for (var i = start; i < end; i++) {
$(rows).each(function(index) {
- if (index == i) {
+ if (index === i) {
var checkbox = $(this).children().children('input:checkbox');
$(checkbox).attr('checked', 'checked');
$(checkbox).parent().parent().addClass('selected');
@@ -98,7 +101,7 @@ $(document).ready(function() {
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
-
+ disableActions();
for (var i=0; i
span.name').text(t('files','Name'));
$('#modified').text(t('files','Deleted'));
$('table').removeClass('multiselect');
@@ -182,21 +188,13 @@ function processSelection(){
$('.selectedActions').show();
var selection='';
if(selectedFolders.length>0){
- if(selectedFolders.length==1){
- selection+=t('files','1 folder');
- }else{
- selection+=t('files','{count} folders',{count: selectedFolders.length});
- }
+ selection += n('files', '%n folder', '%n folders', selectedFolders.length);
if(selectedFiles.length>0){
selection+=' & ';
}
}
if(selectedFiles.length>0){
- if(selectedFiles.length==1){
- selection+=t('files','1 file');
- }else{
- selection+=t('files','{count} files',{count: selectedFiles.length});
- }
+ selection += n('files', '%n file', '%n files', selectedFiles.length);
}
$('#headerName>span.name').text(selection);
$('#modified').text('');
@@ -236,3 +234,13 @@ function getSelectedFiles(property){
function fileDownloadPath(dir, file) {
return OC.filePath('files_trashbin', '', 'download.php') + '?file='+encodeURIComponent(file);
}
+
+function enableActions() {
+ $(".action").css("display", "inline");
+ $(":input:checkbox").css("display", "inline");
+}
+
+function disableActions() {
+ $(".action").css("display", "none");
+ $(":input:checkbox").css("display", "none");
+}
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index f36133db547948a97806359b82f8459cc7e232b2..710a9d14196ee4704c5265c2239fd03b76f35f38 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,4 +1,5 @@
- "تعذّر حذف%s بشكل دائم",
"Couldn't restore %s" => "تعذّر استرجاع %s ",
"perform restore operation" => "إبدء عملية الإستعادة",
@@ -7,12 +8,11 @@
"Delete permanently" => "حذف بشكل دائم",
"Name" => "اسم",
"Deleted" => "تم الحذف",
-"1 folder" => "مجلد عدد 1",
-"{count} folders" => "{count} مجلدات",
-"1 file" => "ملف واحد",
-"{count} files" => "{count} ملفات",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
"Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
"Restore" => "استعيد",
"Delete" => "إلغاء",
"Deleted Files" => "الملفات المحذوفه"
);
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 1e0953b013a5657a5b8d0f40baa7e1904435927b..3c12e6906ed661ef08bed666f120de9f40bc3d0d 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -1,4 +1,5 @@
- "Невъзможно перманентното изтриване на %s",
"Couldn't restore %s" => "Невъзможно възтановяване на %s",
"perform restore operation" => "извършване на действие по възстановяване",
@@ -7,12 +8,11 @@
"Delete permanently" => "Изтриване завинаги",
"Name" => "Име",
"Deleted" => "Изтрито",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 файл",
-"{count} files" => "{count} файла",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
"Restore" => "Възтановяване",
"Delete" => "Изтриване",
"Deleted Files" => "Изтрити файлове"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index 75b071bfa7432dab12c1303049c4b8a57ef9aee0..c3741dbd1dba4bf49cc903babc1217403cde6c30 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -1,9 +1,9 @@
- "সমস্যা",
"Name" => "রাম",
-"1 folder" => "১টি ফোল্ডার",
-"{count} folders" => "{count} টি ফোল্ডার",
-"1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "মুছে"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index b7540f653d678d28fb17e1cfe0e36829293930d4..6e226b7fc8534b2aafab433cbccafddb964d8ab3 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -1,4 +1,5 @@
- "No s'ha pogut esborrar permanentment %s",
"Couldn't restore %s" => "No s'ha pogut restaurar %s",
"perform restore operation" => "executa l'operació de restauració",
@@ -7,12 +8,12 @@
"Delete permanently" => "Esborra permanentment",
"Name" => "Nom",
"Deleted" => "Eliminat",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetes",
-"1 file" => "1 fitxer",
-"{count} files" => "{count} fitxers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "restaurat",
"Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
"Restore" => "Recupera",
"Delete" => "Esborra",
"Deleted Files" => "Fitxers eliminats"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index 416b6b231d5a63f5331aae8bdbcaf2db150e46b5..383d2a217f7c49d666a4fe8d4b39c1189491ae1a 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
- "Nelze trvale odstranit %s",
"Couldn't restore %s" => "Nelze obnovit %s",
"perform restore operation" => "provést obnovu",
@@ -7,12 +8,12 @@
"Delete permanently" => "Trvale odstranit",
"Name" => "Název",
"Deleted" => "Smazáno",
-"1 folder" => "1 složka",
-"{count} folders" => "{count} složky",
-"1 file" => "1 soubor",
-"{count} files" => "{count} soubory",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "obnoveno",
"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
"Restore" => "Obnovit",
"Delete" => "Smazat",
"Deleted Files" => "Smazané soubory"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 055e8d8654dd68ae2f0a22c0a17d6e61d5ce9b76..123a445c2c1d0697a615d2043f0e31b75c12c37f 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -1,4 +1,5 @@
- "Methwyd dileu %s yn barhaol",
"Couldn't restore %s" => "Methwyd adfer %s",
"perform restore operation" => "gweithrediad adfer",
@@ -7,12 +8,11 @@
"Delete permanently" => "Dileu'n barhaol",
"Name" => "Enw",
"Deleted" => "Wedi dileu",
-"1 folder" => "1 blygell",
-"{count} folders" => "{count} plygell",
-"1 file" => "1 ffeil",
-"{count} files" => "{count} ffeil",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
"Restore" => "Adfer",
"Delete" => "Dileu",
"Deleted Files" => "Ffeiliau Ddilewyd"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 16f98baed7e879d806030dbb3ea0d497f8fb3074..2fbc08938789690676e04c6c8e4e196d586bdb2d 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -1,4 +1,5 @@
- "Kunne ikke slette %s permanent",
"Couldn't restore %s" => "Kunne ikke gendanne %s",
"perform restore operation" => "udfør gendannelsesoperation",
@@ -7,12 +8,12 @@
"Delete permanently" => "Slet permanent",
"Name" => "Navn",
"Deleted" => "Slettet",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"restored" => "Gendannet",
"Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
"Restore" => "Gendan",
"Delete" => "Slet",
"Deleted Files" => "Slettede filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 4dd9033969e485482ec028e2f90530d3e7ed7a6a..ad6e0839bd61481f401842dbeacb0ef3158faf84 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -1,4 +1,5 @@
- "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
@@ -7,12 +8,12 @@
"Delete permanently" => "Endgültig löschen",
"Name" => "Name",
"Deleted" => "gelöscht",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("","%n Ordner"),
+"_%n file_::_%n files_" => array("","%n Dateien"),
+"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
"Restore" => "Wiederherstellen",
"Delete" => "Löschen",
"Deleted Files" => "Gelöschte Dateien"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 829b5026e1a354d5fc07ec4a325d86422e0eef4d..0df6941280109e1d617e421447a21aa0e5e4aa35 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,4 +1,5 @@
- "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
@@ -7,12 +8,12 @@
"Delete permanently" => "Endgültig löschen",
"Name" => "Name",
"Deleted" => "Gelöscht",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Dateien","%n Dateien"),
+"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
"Restore" => "Wiederherstellen",
"Delete" => "Löschen",
"Deleted Files" => "Gelöschte Dateien"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index f95d90ada6171ae224c1c3a90494bd4e5530b3c9..759e5299e4200c58acca5df8a0801e1d5f2f5ba8 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -1,4 +1,5 @@
- "Αδύνατη η μόνιμη διαγραφή του %s",
"Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
"perform restore operation" => "εκτέλεση λειτουργία επαναφοράς",
@@ -7,12 +8,12 @@
"Delete permanently" => "Μόνιμη διαγραφή",
"Name" => "Όνομα",
"Deleted" => "Διαγράφηκε",
-"1 folder" => "1 φάκελος",
-"{count} folders" => "{count} φάκελοι",
-"1 file" => "1 αρχείο",
-"{count} files" => "{count} αρχεία",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "έγινε επαναφορά",
"Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
"Restore" => "Επαναφορά",
"Delete" => "Διαγραφή",
"Deleted Files" => "Διαγραμμένα Αρχεία"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 161e9c3e88ac110eac7d7d2ec79938ed755a3506..d1e30cba58883a032b8e099d308a9cf8cafaf0e4 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,12 +1,12 @@
- "Eraro",
"Delete permanently" => "Forigi por ĉiam",
"Name" => "Nomo",
-"1 folder" => "1 dosierujo",
-"{count} folders" => "{count} dosierujoj",
-"1 file" => "1 dosiero",
-"{count} files" => "{count} dosierujoj",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Restore" => "Restaŭri",
"Delete" => "Forigi",
"Deleted Files" => "Forigitaj dosieroj"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index b2d5a2aed268320da0c79911173aeb4f2fce69b5..956d89ae6880d44befddef8290d8ea46c3947562 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,4 +1,5 @@
- "No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
"perform restore operation" => "restaurar",
@@ -7,12 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetas",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
"Restore" => "Recuperar",
"Delete" => "Eliminar",
"Deleted Files" => "Archivos Eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index de7494ca69e879b7100ebcb96e3766d71c8ef57c..6f47255b50652bf06c450dc91f35bfc8df1d7385 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -1,4 +1,5 @@
- "No fue posible borrar %s de manera permanente",
"Couldn't restore %s" => "No se pudo restaurar %s",
"perform restore operation" => "Restaurar",
@@ -7,12 +8,11 @@
"Delete permanently" => "Borrar de manera permanente",
"Name" => "Nombre",
"Deleted" => "Borrado",
-"1 folder" => "1 directorio",
-"{count} folders" => "{count} directorios",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
"Restore" => "Recuperar",
"Delete" => "Borrar",
"Deleted Files" => "Archivos eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 3d3b46a180823b469bfcf364ccaa548aaa0f2bf0..2cfcafa804e5bc6d6a65e96cbcfa7c906368f5fd 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -1,4 +1,5 @@
- "%s jäädavalt kustutamine ebaõnnestus",
"Couldn't restore %s" => "%s ei saa taastada",
"perform restore operation" => "soorita taastamine",
@@ -7,12 +8,12 @@
"Delete permanently" => "Kustuta jäädavalt",
"Name" => "Nimi",
"Deleted" => "Kustutatud",
-"1 folder" => "1 kaust",
-"{count} folders" => "{count} kausta",
-"1 file" => "1 fail",
-"{count} files" => "{count} faili",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "taastatud",
"Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
"Restore" => "Taasta",
"Delete" => "Kustuta",
"Deleted Files" => "Kustutatud failid"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 45b77b7990c23d6449f6090d5cb9ef17c99b8816..b114dc3386a3f3a7fd7c6391c356ded31b68d37d 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -1,4 +1,5 @@
- "Ezin izan da %s betirako ezabatu",
"Couldn't restore %s" => "Ezin izan da %s berreskuratu",
"perform restore operation" => "berreskuratu",
@@ -7,12 +8,11 @@
"Delete permanently" => "Ezabatu betirako",
"Name" => "Izena",
"Deleted" => "Ezabatuta",
-"1 folder" => "karpeta bat",
-"{count} folders" => "{count} karpeta",
-"1 file" => "fitxategi bat",
-"{count} files" => "{count} fitxategi",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
"Restore" => "Berrezarri",
"Delete" => "Ezabatu",
"Deleted Files" => "Ezabatutako Fitxategiak"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 6ecc6feacbf8d7bf15750547cc75cc9094f95d46..654f20a5f1c7418a3cfd073db073a586099f8401 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -1,4 +1,5 @@
- "%s را نمی توان برای همیشه حذف کرد",
"Couldn't restore %s" => "%s را نمی توان بازگرداند",
"perform restore operation" => "انجام عمل بازگرداندن",
@@ -7,12 +8,11 @@
"Delete permanently" => "حذف قطعی",
"Name" => "نام",
"Deleted" => "حذف شده",
-"1 folder" => "1 پوشه",
-"{count} folders" => "{ شمار} پوشه ها",
-"1 file" => "1 پرونده",
-"{count} files" => "{ شمار } فایل ها",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
"Restore" => "بازیابی",
"Delete" => "حذف",
"Deleted Files" => "فایلهای حذف شده"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index fd6edf398ea017164b971f00f955bf8748c6b8f4..f03950981c08c00cbc6036b99ed3d39f16ce4539 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -1,4 +1,5 @@
- "Kohdetta %s ei voitu poistaa pysyvästi",
"Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
"perform restore operation" => "suorita palautustoiminto",
@@ -7,12 +8,12 @@
"Delete permanently" => "Poista pysyvästi",
"Name" => "Nimi",
"Deleted" => "Poistettu",
-"1 folder" => "1 kansio",
-"{count} folders" => "{count} kansiota",
-"1 file" => "1 tiedosto",
-"{count} files" => "{count} tiedostoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
+"restored" => "palautettu",
"Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
"Restore" => "Palauta",
"Delete" => "Poista",
"Deleted Files" => "Poistetut tiedostot"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 8198e3e32a8287454400b8926b3b54341692bb1e..8854190e2ceb7827bc8d7e26ea85b96bbecad34f 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -1,4 +1,5 @@
- "Impossible d'effacer %s de façon permanente",
"Couldn't restore %s" => "Impossible de restaurer %s",
"perform restore operation" => "effectuer l'opération de restauration",
@@ -7,12 +8,11 @@
"Delete permanently" => "Supprimer de façon définitive",
"Name" => "Nom",
"Deleted" => "Effacé",
-"1 folder" => "1 dossier",
-"{count} folders" => "{count} dossiers",
-"1 file" => "1 fichier",
-"{count} files" => "{count} fichiers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
"Restore" => "Restaurer",
"Delete" => "Supprimer",
"Deleted Files" => "Fichiers effacés"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index b9b3c8a1e5c73663530541360eb39d45459c230a..568c17607fe0eb90554711df084aae6ce981bf21 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -1,4 +1,5 @@
- "Non foi posíbel eliminar %s permanente",
"Couldn't restore %s" => "Non foi posíbel restaurar %s",
"perform restore operation" => "realizar a operación de restauración",
@@ -7,12 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Eliminado",
-"1 folder" => "1 cartafol",
-"{count} folders" => "{count} cartafoles",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
+"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
"Restore" => "Restablecer",
"Delete" => "Eliminar",
"Deleted Files" => "Ficheiros eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 853d4e1925abe81b00b9ba51d8f5f122f74426b0..6aa6264a315914829450a6a1cc4069de9e12d92e 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,4 +1,5 @@
- "לא ניתן למחוק את %s לצמיתות",
"Couldn't restore %s" => "לא ניתן לשחזר את %s",
"perform restore operation" => "ביצוע פעולת שחזור",
@@ -7,12 +8,11 @@
"Delete permanently" => "מחיקה לצמיתות",
"Name" => "שם",
"Deleted" => "נמחק",
-"1 folder" => "תיקייה אחת",
-"{count} folders" => "{count} תיקיות",
-"1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
"Restore" => "שחזור",
"Delete" => "מחיקה",
"Deleted Files" => "קבצים שנמחקו"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index a65d876e1f06311cbb151b7af98a2268ba6615bc..d227b4979aadbc0e0929e603a69b682b34c88469 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,5 +1,9 @@
- "Greška",
"Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Obriši"
);
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 5e64bc04e03132ab36250716d23d24e2efd8eec0..aac6cf780001a1b143f0943ce40b8615616ecb2c 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -1,4 +1,5 @@
- "Nem sikerült %s végleges törlése",
"Couldn't restore %s" => "Nem sikerült %s visszaállítása",
"perform restore operation" => "a visszaállítás végrehajtása",
@@ -7,12 +8,12 @@
"Delete permanently" => "Végleges törlés",
"Name" => "Név",
"Deleted" => "Törölve",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} mappa",
-"1 file" => "1 fájl",
-"{count} files" => "{count} fájl",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "visszaállítva",
"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
"Restore" => "Visszaállítás",
"Delete" => "Törlés",
"Deleted Files" => "Törölt fájlok"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
index 3b80487278a16a8f1f7b407908ea855f3f5def10..6ff58b56202081827d5ef70cc85325aa7c0803e0 100644
--- a/apps/files_trashbin/l10n/hy.php
+++ b/apps/files_trashbin/l10n/hy.php
@@ -1,3 +1,7 @@
- array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Ջնջել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index dea25b30ba45adc3b79a7625bed071f62e29890f..c583344a81e1b624563f77b1be7ec8f0654082a2 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,5 +1,9 @@
- "Error",
"Name" => "Nomine",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Deler"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 62a63d515a3749ac279aa642c8132f22d0a1da05..6aad1302f43e4442d7c50d3d2f7acbd5877e221a 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -1,4 +1,5 @@
- "Tidak dapat menghapus permanen %s",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
"perform restore operation" => "jalankan operasi pemulihan",
@@ -7,12 +8,11 @@
"Delete permanently" => "Hapus secara permanen",
"Name" => "Nama",
"Deleted" => "Dihapus",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} folder",
-"1 file" => "1 berkas",
-"{count} files" => "{count} berkas",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
"Restore" => "Pulihkan",
"Delete" => "Hapus",
"Deleted Files" => "Berkas yang Dihapus"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 12267c6695a30511218476c545d50fc2d50e6ded..55ae433646147d0694d9324c949d3de602173718 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -1,9 +1,9 @@
- "Villa",
"Name" => "Nafn",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} möppur",
-"1 file" => "1 skrá",
-"{count} files" => "{count} skrár",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Eyða"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 795fd6ea1674618537b7380e7040b98d77591300..0dc2b938f8a76769fe785d716e1d5f57e6c0db1f 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -1,4 +1,5 @@
- "Impossibile eliminare %s definitivamente",
"Couldn't restore %s" => "Impossibile ripristinare %s",
"perform restore operation" => "esegui operazione di ripristino",
@@ -7,12 +8,12 @@
"Delete permanently" => "Elimina definitivamente",
"Name" => "Nome",
"Deleted" => "Eliminati",
-"1 folder" => "1 cartella",
-"{count} folders" => "{count} cartelle",
-"1 file" => "1 file",
-"{count} files" => "{count} file",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "ripristinati",
"Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
"Restore" => "Ripristina",
"Delete" => "Elimina",
"Deleted Files" => "File eliminati"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index db5783bf4328a690bc12794794ed8d0f7873c6f9..eb9748d57c04af064215003511089c12b805b199 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,4 +1,5 @@
- "%s を完全に削除出来ませんでした",
"Couldn't restore %s" => "%s を復元出来ませんでした",
"perform restore operation" => "復元操作を実行する",
@@ -7,12 +8,12 @@
"Delete permanently" => "完全に削除する",
"Name" => "名前",
"Deleted" => "削除済み",
-"1 folder" => "1 フォルダ",
-"{count} folders" => "{count} フォルダ",
-"1 file" => "1 ファイル",
-"{count} files" => "{count} ファイル",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%n file_::_%n files_" => array("%n個のファイル"),
+"restored" => "復元済",
"Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!",
"Restore" => "復元",
"Delete" => "削除",
"Deleted Files" => "削除されたファイル"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 667eb500eb9f11ea6e716a642849d582be03c466..236d8951e9dcf47368d21fab951bbd7b5e0a7967 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -1,4 +1,5 @@
- "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
"Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
"perform restore operation" => "მიმდინარეობს აღდგენის ოპერაცია",
@@ -7,12 +8,11 @@
"Delete permanently" => "სრულად წაშლა",
"Name" => "სახელი",
"Deleted" => "წაშლილი",
-"1 folder" => "1 საქაღალდე",
-"{count} folders" => "{count} საქაღალდე",
-"1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
"Restore" => "აღდგენა",
"Delete" => "წაშლა",
"Deleted Files" => "წაშლილი ფაილები"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 42ad87e98d2247283f347a1df1e85f5de1e4f83e..f2e604d75915416e9825bae5b97db30f9f1883a7 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,11 +1,11 @@
- "오류",
"Delete permanently" => "영원히 삭제",
"Name" => "이름",
-"1 folder" => "폴더 1개",
-"{count} folders" => "폴더 {count}개",
-"1 file" => "파일 1개",
-"{count} files" => "파일 {count}개",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Restore" => "복원",
"Delete" => "삭제"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
index 67fdd7d08fa910660052b87b9adaa4ba95746bdb..3f110f06002b4386638af1efde66098d4cd25096 100644
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ b/apps/files_trashbin/l10n/ku_IQ.php
@@ -1,4 +1,8 @@
- "ههڵه",
-"Name" => "ناو"
+"Name" => "ناو",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index 2065ee03d3204b97d1d4fa1552d85bc3f15cd55c..cbfd515a8b3fd2c335ae318a7eca8af7fe3b554f 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,5 +1,9 @@
- "Fehler",
"Name" => "Numm",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Läschen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 7df63bd7f28b94c5bda6aa4cffdb1a10c8bbc5ed..c4a12ff21755aff9c89634d80665430c68699333 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -1,4 +1,5 @@
- "Nepavyko negrįžtamai ištrinti %s",
"Couldn't restore %s" => "Nepavyko atkurti %s",
"perform restore operation" => "atkurti",
@@ -7,12 +8,11 @@
"Delete permanently" => "Ištrinti negrįžtamai",
"Name" => "Pavadinimas",
"Deleted" => "Ištrinti",
-"1 folder" => "1 aplankalas",
-"{count} folders" => "{count} aplankalai",
-"1 file" => "1 failas",
-"{count} files" => "{count} failai",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
"Restore" => "Atstatyti",
"Delete" => "Ištrinti",
"Deleted Files" => "Ištrinti failai"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index b1b8c3e6b03ab09e82f55a411a9395e0e0fdb8e1..ccbf117fdad7050a82bda7cb97b06f3bfdc739d8 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -1,4 +1,5 @@
- "Nevarēja pilnībā izdzēst %s",
"Couldn't restore %s" => "Nevarēja atjaunot %s",
"perform restore operation" => "veikt atjaunošanu",
@@ -7,12 +8,11 @@
"Delete permanently" => "Dzēst pavisam",
"Name" => "Nosaukums",
"Deleted" => "Dzēsts",
-"1 folder" => "1 mape",
-"{count} folders" => "{count} mapes",
-"1 file" => "1 datne",
-"{count} files" => "{count} datnes",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
"Restore" => "Atjaunot",
"Delete" => "Dzēst",
"Deleted Files" => "Dzēstās datnes"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 175399249e55dd20bafb3a64e17b6b2f6d949fd2..965518dbc86e043c42cb8c7ac0246a9eb9365f54 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -1,9 +1,9 @@
- "Грешка",
"Name" => "Име",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеки",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Избриши"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 52a997aab15678a8157171a982614f6a911c36cd..1b5ca07c70cff20792d903193d4cf04b1fa6b19f 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,5 +1,9 @@
- "Ralat",
"Name" => "Nama",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Delete" => "Padam"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 43ad018049447a8d0a1b6c1bcf98a031bf498680..8a69b3d87aa1d0f1f8d43dce3ae55a7c61f01eb5 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -1,4 +1,5 @@
- "Kunne ikke slette %s fullstendig",
"Couldn't restore %s" => "Kunne ikke gjenopprette %s",
"perform restore operation" => "utfør gjenopprettings operasjon",
@@ -7,12 +8,11 @@
"Delete permanently" => "Slett permanent",
"Name" => "Navn",
"Deleted" => "Slettet",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
"Deleted Files" => "Slettet filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 91844a14b663eca3c3be1984becb1ecd6e7a9cbb..2c6dcb2fcbf2d2266001e6c7087c10c9da6003c1 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -1,4 +1,5 @@
- "Kon %s niet permanent verwijderen",
"Couldn't restore %s" => "Kon %s niet herstellen",
"perform restore operation" => "uitvoeren restore operatie",
@@ -7,12 +8,12 @@
"Delete permanently" => "Verwijder definitief",
"Name" => "Naam",
"Deleted" => "Verwijderd",
-"1 folder" => "1 map",
-"{count} folders" => "{count} mappen",
-"1 file" => "1 bestand",
-"{count} files" => "{count} bestanden",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "hersteld",
"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
"Restore" => "Herstellen",
"Delete" => "Verwijder",
"Deleted Files" => "Verwijderde bestanden"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 454ea2b05753198172040752659ff7bc99149290..9e351668e33626bd279e9638c59a2939bc8a27bf 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,4 +1,5 @@
- "Klarte ikkje sletta %s for godt",
"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
"perform restore operation" => "utfør gjenoppretting",
@@ -7,12 +8,11 @@
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
"Deleted" => "Sletta",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
"Deleted Files" => "Sletta filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index fa9e097f6ca53fd35c4462ec4f9b2e3a26d95855..a62902c3b7e89ca6bc1d54f4a4c3d798d7bfc997 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,5 +1,9 @@
- "Error",
"Name" => "Nom",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Escafa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 5c9f558f11fd610ed79046a6cd880493f05e0a6d..e8295e2ff038bd599cc2962ef918d8a3fac93018 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -1,4 +1,5 @@
- "Nie można trwale usunąć %s",
"Couldn't restore %s" => "Nie można przywrócić %s",
"perform restore operation" => "wykonywanie operacji przywracania",
@@ -7,12 +8,12 @@
"Delete permanently" => "Trwale usuń",
"Name" => "Nazwa",
"Deleted" => "Usunięte",
-"1 folder" => "1 folder",
-"{count} folders" => "Ilość folderów: {count}",
-"1 file" => "1 plik",
-"{count} files" => "Ilość plików: {count}",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "przywrócony",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
"Delete" => "Usuń",
"Deleted Files" => "Usunięte pliki"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 9dad8a40a85e4ab5abbae6e09579db6a7dc5d75a..1e3c67ba027a48389c527fa45287e80e0b9675eb 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -1,4 +1,5 @@
- "Não foi possível excluir %s permanentemente",
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "realizar operação de restauração",
@@ -7,12 +8,12 @@
"Delete permanently" => "Excluir permanentemente",
"Name" => "Nome",
"Deleted" => "Excluído",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 arquivo",
-"{count} files" => "{count} arquivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
"Restore" => "Restaurar",
"Delete" => "Excluir",
"Deleted Files" => "Arquivos Apagados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index ba85158b70e1a4c3a098232f3e5595b5454409e5..0c88d132b5cc00eb299bbf25a4c7f1d975071b87 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -1,4 +1,5 @@
- "Não foi possível eliminar %s de forma permanente",
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "executar a operação de restauro",
@@ -7,12 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Apagado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "Restaurado",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Restore" => "Restaurar",
"Delete" => "Eliminar",
"Deleted Files" => "Ficheiros Apagados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 3af21b7e3f367ab670c38fa81358d1db4835668e..0b1d2cd9e179cb5020e2538fd02912daddaced54 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,10 +1,10 @@
- "Eroare",
"Delete permanently" => "Stergere permanenta",
"Name" => "Nume",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} foldare",
-"1 file" => "1 fisier",
-"{count} files" => "{count} fisiere",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Șterge"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 0d55703cdc064b7e4ddfa58330e571f1fe60a936..909e4d7131fabe07aef9b7fe0d48b473718bcfe7 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -1,4 +1,5 @@
- "%s не может быть удалён навсегда",
"Couldn't restore %s" => "%s не может быть восстановлен",
"perform restore operation" => "выполнить операцию восстановления",
@@ -7,12 +8,12 @@
"Delete permanently" => "Удалено навсегда",
"Name" => "Имя",
"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлов",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "восстановлен",
"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
"Restore" => "Восстановить",
"Delete" => "Удалить",
"Deleted Files" => "Удаленные файлы"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
deleted file mode 100644
index 8636e417ecb207808d94e78c9acc8e05d51d1266..0000000000000000000000000000000000000000
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Ошибка",
-"Name" => "Имя",
-"Delete" => "Удалить"
-);
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index 48ea423a4c4b3339e7e38dc8627d4d79c7847b3d..6dad84437cf37981ac08e7593a85c60e3a1d7739 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,7 +1,9 @@
- "දෝෂයක්",
"Name" => "නම",
-"1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "මකා දමන්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7cef36ef1c0805436aed68f7816bc32542f19f33..0f78da5fc3dc96e0d554b9467163777f68494437 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -1,4 +1,5 @@
- "Nemožno zmazať %s navždy",
"Couldn't restore %s" => "Nemožno obnoviť %s",
"perform restore operation" => "vykonať obnovu",
@@ -7,12 +8,12 @@
"Delete permanently" => "Zmazať trvalo",
"Name" => "Názov",
"Deleted" => "Zmazané",
-"1 folder" => "1 priečinok",
-"{count} folders" => "{count} priečinkov",
-"1 file" => "1 súbor",
-"{count} files" => "{count} súborov",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "obnovené",
"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
"Restore" => "Obnoviť",
"Delete" => "Zmazať",
"Deleted Files" => "Zmazané súbory"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 8c8446d4e5b0d2ac2e762755b8801326769adfd0..eb2d42a18ff4d489d722c06fb06f630c10e505ab 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -1,4 +1,5 @@
- "Datoteke %s ni mogoče dokončno izbrisati.",
"Couldn't restore %s" => "Ni mogoče obnoviti %s",
"perform restore operation" => "izvedi opravilo obnavljanja",
@@ -7,12 +8,11 @@
"Delete permanently" => "Izbriši dokončno",
"Name" => "Ime",
"Deleted" => "Izbrisano",
-"1 folder" => "1 mapa",
-"{count} folders" => "{count} map",
-"1 file" => "1 datoteka",
-"{count} files" => "{count} datotek",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
"Restore" => "Obnovi",
"Delete" => "Izbriši",
"Deleted Files" => "Izbrisane datoteke"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index ce3ed947ccd57c106321d8150b3a484f2adca86d..1b7b5b828c81e08db327277b77d964d062fd0cfa 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -1,4 +1,5 @@
- "Nuk munda ta eliminoj përfundimisht %s",
"Couldn't restore %s" => "Nuk munda ta rivendos %s",
"perform restore operation" => "ekzekuto operacionin e rivendosjes",
@@ -7,12 +8,11 @@
"Delete permanently" => "Elimino përfundimisht",
"Name" => "Emri",
"Deleted" => "Eliminuar",
-"1 folder" => "1 dosje",
-"{count} folders" => "{count} dosje",
-"1 file" => "1 skedar",
-"{count} files" => "{count} skedarë",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
"Restore" => "Rivendos",
"Delete" => "Elimino",
"Deleted Files" => "Skedarë të eliminuar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 280c2b028204dcca9d3be74749416cdef968d070..7311e759f989ca7747c0a47533d6011c4a2efa82 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,14 +1,14 @@
- "врати у претходно стање",
"Error" => "Грешка",
"Delete permanently" => "Обриши за стално",
"Name" => "Име",
"Deleted" => "Обрисано",
-"1 folder" => "1 фасцикла",
-"{count} folders" => "{count} фасцикле/и",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеке/а",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
"Restore" => "Врати",
"Delete" => "Обриши"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 2cb86adfd405423190d97c24b545ae11bc04795f..483d1e3ca2b89bb2451fc108921db95f82bbbdf7 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,4 +1,8 @@
- "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Obriši"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index d56d8946f34d63602f5ed6eb903abe49aa2c3fd9..b0752cbbe8b5ea5e036dde2445716a9618b982b7 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -1,4 +1,5 @@
- "Kunde inte radera %s permanent",
"Couldn't restore %s" => "Kunde inte återställa %s",
"perform restore operation" => "utför återställning",
@@ -7,12 +8,12 @@
"Delete permanently" => "Radera permanent",
"Name" => "Namn",
"Deleted" => "Raderad",
-"1 folder" => "1 mapp",
-"{count} folders" => "{count} mappar",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "återställd",
"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
"Restore" => "Återskapa",
"Delete" => "Radera",
"Deleted Files" => "Raderade filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index 2badaa8546772cbb10f2e49c63879a472209375c..ed93b459c7db36046316ae7af68f8c9cdd60a7fc 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -1,9 +1,9 @@
- "வழு",
"Name" => "பெயர்",
-"1 folder" => "1 கோப்புறை",
-"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
-"1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "நீக்குக"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
index 9b36ac4272eff1e0af94a04ba38c519b27d98946..0d803a8e648535a642a395e14e6ea56dee5edc6f 100644
--- a/apps/files_trashbin/l10n/te.php
+++ b/apps/files_trashbin/l10n/te.php
@@ -1,6 +1,10 @@
- "పొరపాటు",
"Delete permanently" => "శాశ్వతంగా తొలగించు",
"Name" => "పేరు",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "తొలగించు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 82d3cd2353095a6244fec279cd1d589193440c1d..31caa11aac303bc0226b360145f37404b31858e7 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,14 +1,14 @@
- "ดำเนินการคืนค่า",
"Error" => "ข้อผิดพลาด",
"Name" => "ชื่อ",
"Deleted" => "ลบแล้ว",
-"1 folder" => "1 โฟลเดอร์",
-"{count} folders" => "{count} โฟลเดอร์",
-"1 file" => "1 ไฟล์",
-"{count} files" => "{count} ไฟล์",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
"Restore" => "คืนค่า",
"Delete" => "ลบ",
"Deleted Files" => "ไฟล์ที่ลบทิ้ง"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index 53c143c3a9d184ceaf3798472e0cff11be04f594..f25b179bc1efbcbc47cb3da9e86f6c77663e64c2 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,4 +1,5 @@
- "%s Kalıcı olarak silinemedi",
"Couldn't restore %s" => "%s Geri yüklenemedi",
"perform restore operation" => "Geri yükleme işlemini gerçekleştir",
@@ -7,12 +8,12 @@
"Delete permanently" => "Kalıcı olarak sil",
"Name" => "İsim",
"Deleted" => "Silindi",
-"1 folder" => "1 dizin",
-"{count} folders" => "{count} dizin",
-"1 file" => "1 dosya",
-"{count} files" => "{count} dosya",
+"_%n folder_::_%n folders_" => array("","%n dizin"),
+"_%n file_::_%n files_" => array("","%n dosya"),
+"restored" => "geri yüklendi",
"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.",
"Restore" => "Geri yükle",
"Delete" => "Sil",
"Deleted Files" => "Silinen Dosyalar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
index c369e385f740c1950fd7a105c8901054eecb10fd..ad983aee18b7cc425e530b0e0466355a18b9adfb 100644
--- a/apps/files_trashbin/l10n/ug.php
+++ b/apps/files_trashbin/l10n/ug.php
@@ -1,11 +1,12 @@
- "خاتالىق",
"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
"Name" => "ئاتى",
"Deleted" => "ئۆچۈرۈلدى",
-"1 folder" => "1 قىسقۇچ",
-"1 file" => "1 ھۆججەت",
-"{count} files" => "{count} ھۆججەت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
"Delete" => "ئۆچۈر"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index ffc9ab02f4895268910d613baaf119d1f12724c2..aa4b65950323fffba703987029b83c41ccf884d5 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -1,4 +1,5 @@
- "Неможливо видалити %s назавжди",
"Couldn't restore %s" => "Неможливо відновити %s",
"perform restore operation" => "виконати операцію відновлення",
@@ -7,12 +8,12 @@
"Delete permanently" => "Видалити назавжди",
"Name" => "Ім'я",
"Deleted" => "Видалено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлів",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "відновлено",
"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
"Restore" => "Відновити",
"Delete" => "Видалити",
"Deleted Files" => "Видалено Файлів"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index e13a623fecc335ac65e09bcaeca82fe9abb71099..f6c6a3da3c84b3f5c08590b20530b8c2e84a5d01 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,3 +1,7 @@
- "ایرر"
+ "ایرر",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index a8924c541f8fee86f3624037731ee8b6032b7f0b..072d799fa6819d0cedd041904f80463b338f9b83 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -1,4 +1,5 @@
- "Không thể óa %s vĩnh viễn",
"Couldn't restore %s" => "Không thể khôi phục %s",
"perform restore operation" => "thực hiện phục hồi",
@@ -7,12 +8,11 @@
"Delete permanently" => "Xóa vĩnh vễn",
"Name" => "Tên",
"Deleted" => "Đã xóa",
-"1 folder" => "1 thư mục",
-"{count} folders" => "{count} thư mục",
-"1 file" => "1 tập tin",
-"{count} files" => "{count} tập tin",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
"Restore" => "Khôi phục",
"Delete" => "Xóa",
"Deleted Files" => "File đã xóa"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 1ab193517f80076db48537af0ccc65c901eec2d3..eaa97bb1b6ff7730c4a3b9841d27e140b5e73996 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,10 +1,12 @@
- "出错",
"Delete permanently" => "永久删除",
"Name" => "名称",
-"1 folder" => "1 个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
-"Delete" => "删除"
+"_%n folder_::_%n folders_" => array("%n 个文件夹"),
+"_%n file_::_%n files_" => array("%n 个文件"),
+"Restore" => "恢复",
+"Delete" => "删除",
+"Deleted Files" => "删除的文件"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 9c0f0bb3b75186fd002fed1ffa292764f81ae3f7..6609f57d9cff1d1260524b9e5d19f30c6f901963 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -1,4 +1,5 @@
- "无法彻底删除文件%s",
"Couldn't restore %s" => "无法恢复%s",
"perform restore operation" => "执行恢复操作",
@@ -7,12 +8,11 @@
"Delete permanently" => "永久删除",
"Name" => "名称",
"Deleted" => "已删除",
-"1 folder" => "1个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
"Restore" => "恢复",
"Delete" => "删除",
"Deleted Files" => "已删除文件"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
index 53dd9869219e08d2f69033b64c7b8fbc8545359b..3f0d663baeb10ee308c1ca65edae8e5bbd1a63c6 100644
--- a/apps/files_trashbin/l10n/zh_HK.php
+++ b/apps/files_trashbin/l10n/zh_HK.php
@@ -1,6 +1,9 @@
- "錯誤",
"Name" => "名稱",
-"{count} folders" => "{}文件夾",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Delete" => "刪除"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index a9dcba8f7d73ea151c6cd6aff67bfdf2a0723a96..ab6b75c57848602a3621eda654ae14f73015fc81 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,4 +1,5 @@
- "無法永久刪除 %s",
"Couldn't restore %s" => "無法復原 %s",
"perform restore operation" => "進行復原動作",
@@ -7,12 +8,11 @@
"Delete permanently" => "永久刪除",
"Name" => "名稱",
"Deleted" => "已刪除",
-"1 folder" => "1 個資料夾",
-"{count} folders" => "{count} 個資料夾",
-"1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的!",
"Restore" => "復原",
"Delete" => "刪除",
"Deleted Files" => "已刪除的檔案"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index f1df1d7ec77f9106e7b7ed4c1a2542d44b81118b..b2c6bc1df50988c960f5dfb54a96ab29f4aad8a2 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -56,4 +56,8 @@ class Hooks {
Trashbin::deleteUser($uid);
}
}
+
+ public static function post_write_hook($params) {
+ Trashbin::resizeTrash(\OCP\User::getUser());
+ }
}
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index cdf8d950e6082d5ec4aa10981ca7c4dc0e6ed92a..323f25eac2fb5a65ce1bc8326994a417df31c135 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -25,7 +25,7 @@ namespace OCA\Files_Trashbin;
class Trashbin {
// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
- const DEFAULT_RETENTION_OBLIGATION = 180;
+ const DEFAULT_RETENTION_OBLIGATION = 30;
// unit: percentage; 50% of available disk space/quota
const DEFAULTMAXSIZE = 50;
@@ -72,6 +72,11 @@ class Trashbin {
$mime = $view->getMimeType('files' . $file_path);
if ($view->is_dir('files' . $file_path)) {
+ $dirContent = $view->getDirectoryContent('files' . $file_path);
+ // no need to move empty folders to the trash bin
+ if (empty($dirContent)) {
+ return true;
+ }
$type = 'dir';
} else {
$type = 'file';
@@ -100,8 +105,8 @@ class Trashbin {
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
- $trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
- $trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
+ $trashbinSize += self::retainVersions($file_path, $filename, $timestamp);
+ $trashbinSize += self::retainEncryptionKeys($file_path, $filename, $timestamp);
} else {
\OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR);
}
@@ -114,14 +119,13 @@ class Trashbin {
/**
* Move file versions to trash so that they can be restored later
*
- * @param \OC\Files\View $view
* @param $file_path path to original file
* @param $filename of deleted file
* @param $timestamp when the file was deleted
*
* @return size of stored versions
*/
- private static function retainVersions($view, $file_path, $filename, $timestamp) {
+ private static function retainVersions($file_path, $filename, $timestamp) {
$size = 0;
if (\OCP\App::isEnabled('files_versions')) {
@@ -154,14 +158,13 @@ class Trashbin {
/**
* Move encryption keys to trash so that they can be restored later
*
- * @param \OC\Files\View $view
* @param $file_path path to original file
* @param $filename of deleted file
* @param $timestamp when the file was deleted
*
* @return size of encryption keys
*/
- private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
+ private static function retainEncryptionKeys($file_path, $filename, $timestamp) {
$size = 0;
if (\OCP\App::isEnabled('files_encryption')) {
@@ -262,14 +265,14 @@ class Trashbin {
$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
$result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
- if (count($result) != 1) {
+ if (count($result) !== 1) {
\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
return false;
}
// if location no longer exists, restore file in the root directory
$location = $result[0]['location'];
- if ($result[0]['location'] != '/' &&
+ if ($result[0]['location'] !== '/' &&
(!$view->is_dir('files' . $result[0]['location']) ||
!$view->isUpdatable('files' . $result[0]['location']))) {
$location = '';
@@ -283,11 +286,11 @@ class Trashbin {
$location = '';
}
- $source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
- $target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $filename);
-
// we need a extension in case a file/dir with the same name already exists
- $ext = self::getUniqueExtension($location, $filename, $view);
+ $uniqueFilename = self::getUniqueFilename($location, $filename, $view);
+
+ $source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
+ $target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
$mtime = $view->filemtime($source);
// disable proxy to prevent recursive calls
@@ -295,24 +298,24 @@ class Trashbin {
\OC_FileProxy::$enabled = false;
// restore file
- $restoreResult = $view->rename($source, $target . $ext);
+ $restoreResult = $view->rename($source, $target);
// handle the restore result
if ($restoreResult) {
$fakeRoot = $view->getRoot();
$view->chroot('/' . $user . '/files');
- $view->touch('/' . $location . '/' . $filename . $ext, $mtime);
+ $view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
$view->chroot($fakeRoot);
- \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext),
+ \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
- if ($view->is_dir($target . $ext)) {
- $trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target . $ext));
+ if ($view->is_dir($target)) {
+ $trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target));
} else {
- $trashbinSize -= $view->filesize($target . $ext);
+ $trashbinSize -= $view->filesize($target);
}
- $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
- $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
+ $trashbinSize -= self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+ $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp);
if ($timestamp) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
@@ -338,15 +341,16 @@ class Trashbin {
*
* @param \OC\Files\View $view file view
* @param $file complete path to file
- * @param $filename name of file
- * @param $ext file extension in case a file with the same $filename already exists
+ * @param $filename name of file once it was deleted
+ * @param $uniqueFilename new file name to restore the file without overwriting existing files
* @param $location location if file
* @param $timestamp deleteion time
*
* @return size of restored versions
*/
- private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
+ private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
$size = 0;
+
if (\OCP\App::isEnabled('files_versions')) {
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -355,7 +359,7 @@ class Trashbin {
$user = \OCP\User::getUser();
$rootView = new \OC\Files\View('/');
- $target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
+ $target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
list($owner, $ownerPath) = self::getUidAndFilename($target);
@@ -392,20 +396,20 @@ class Trashbin {
* @param \OC\Files\View $view
* @param $file complete path to file
* @param $filename name of file
- * @param $ext file extension in case a file with the same $filename already exists
+ * @param $uniqueFilename new file name to restore the file without overwriting existing files
* @param $location location of file
* @param $timestamp deleteion time
*
* @return size of restored encrypted file
*/
- private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+ private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
$size = 0;
if (\OCP\App::isEnabled('files_encryption')) {
$user = \OCP\User::getUser();
$rootView = new \OC\Files\View('/');
- $target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
+ $target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
list($owner, $ownerPath) = self::getUidAndFilename($target);
@@ -482,14 +486,11 @@ class Trashbin {
// get current sharing state
$sharingEnabled = \OCP\Share::isEnabled();
- // get the final filename
- $target = \OC\Files\Filesystem::normalizePath($location . '/' . $filename);
-
// get users sharing this file
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target . $ext, $user);
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target, $user);
// Attempt to set shareKey
- $util->setSharedFileKeyfiles($session, $usersSharing, $target . $ext);
+ $util->setSharedFileKeyfiles($session, $usersSharing, $target);
}
}
@@ -667,9 +668,32 @@ class Trashbin {
return $availableSpace;
}
+ /**
+ * @brief resize trash bin if necessary after a new file was added to ownCloud
+ * @param string $user user id
+ */
+ public static function resizeTrash($user) {
+
+ $size = self::getTrashbinSize($user);
+
+ if ($size === false || $size < 0) {
+ $size = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
+ }
+
+ $freeSpace = self::calculateFreeSpace($size);
+
+ if ($freeSpace < 0) {
+ $newSize = $size - self::expire($size);
+ if ($newSize !== $size) {
+ self::setTrashbinSize($user, $newSize);
+ }
+ }
+ }
+
/**
* clean up the trash bin
* @param current size of the trash bin
+ * @return size of expired files
*/
private static function expire($trashbinSize) {
@@ -780,18 +804,28 @@ class Trashbin {
* @param $view filesystem view relative to users root directory
* @return string with unique extension
*/
- private static function getUniqueExtension($location, $filename, $view) {
- $ext = '';
+ private static function getUniqueFilename($location, $filename, $view) {
+ $ext = pathinfo($filename, PATHINFO_EXTENSION);
+ $name = pathinfo($filename, PATHINFO_FILENAME);
+ $l = \OC_L10N::get('files_trashbin');
+
+ // if extension is not empty we set a dot in front of it
+ if ($ext !== '') {
+ $ext = '.' . $ext;
+ }
+
if ($view->file_exists('files' . $location . '/' . $filename)) {
- $tmpext = '.restored';
- $ext = $tmpext;
- $i = 1;
- while ($view->file_exists('files' . $location . '/' . $filename . $ext)) {
- $ext = $tmpext . $i;
+ $i = 2;
+ $uniqueName = $name . " (".$l->t("restored").")". $ext;
+ while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
+ $uniqueName = $name . " (".$l->t("restored") . " " . $i . ")" . $ext;
$i++;
}
+
+ return $uniqueName;
}
- return $ext;
+
+ return $filename;
}
/**
@@ -827,7 +861,7 @@ class Trashbin {
$result = $query->execute(array($user))->fetchAll();
if ($result) {
- return $result[0]['size'];
+ return (int)$result[0]['size'];
}
return false;
}
@@ -855,6 +889,23 @@ class Trashbin {
\OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
//Listen to delete user signal
\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+ //Listen to post write hook
+ \OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA\Files_Trashbin\Hooks", "post_write_hook");
+ }
+
+ /**
+ * @brief check if trash bin is empty for a given user
+ * @param string $user
+ */
+ public static function isEmpty($user) {
+
+ $trashSize = self::getTrashbinSize($user);
+
+ if ($trashSize !== false && $trashSize > 0) {
+ return false;
+ }
+
+ return true;
}
}
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 66ec36df867093975df8de6193669c5e5e7f3a77..371765fa69a658783cef13020e8d8d5d167fe531 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,7 +5,7 @@
t('Nothing in here. Your trash bin is empty!'))?>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 85bb16ffa2d2822a90d3d9e315e45256ce9680f0..8ecab58e5c809c462580d8e31f28fe3ad393b994 100644
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -12,7 +12,7 @@
-