diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-19 11:44:21 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-19 11:44:21 +0100 |
| commit | c216c4777be147a04ab27c6af9e25e8b2fc9677d (patch) | |
| tree | d6cb262ac0a1d697ea9a3edc413e43a3e95b57bc /apps/files_encryption | |
| parent | effea790c7200d1a9e5605407dcefc8ab71146b8 (diff) | |
| parent | b9fc240b838439444061824cb191ce22c4c4c052 (diff) | |
| download | nextcloud-server-c216c4777be147a04ab27c6af9e25e8b2fc9677d.tar.gz nextcloud-server-c216c4777be147a04ab27c6af9e25e8b2fc9677d.zip | |
Merge branch 'master' into close-session-faster-master
Conflicts:
apps/files/ajax/upgrade.php
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/l10n/ar.php | 1 | ||||
| -rw-r--r-- | apps/files_encryption/l10n/ca.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php index cf6c265027c..345c01a0d4a 100644 --- a/apps/files_encryption/l10n/ar.php +++ b/apps/files_encryption/l10n/ar.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "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 مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة.", "Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Initial encryption started... This can take some time. Please wait." => "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.", +"Initial encryption running... Please try again later." => "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا", "Go directly to your " => "انتقل مباشرة الى ", "personal settings" => "اعدادات شخصية", "Encryption" => "التشفير", diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php index 23897c18186..3414796f62b 100644 --- a/apps/files_encryption/l10n/ca.php +++ b/apps/files_encryption/l10n/ca.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "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ó:", "Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.", +"Initial encryption running... Please try again later." => "encriptació inicial en procés... Proveu-ho més tard.", "Go directly to your " => "Vés directament a", "personal settings" => "arranjament personal", "Encryption" => "Xifrat", |