summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files/ajax/delete.php7
-rw-r--r--apps/files/ajax/newfile.php9
-rw-r--r--apps/files/css/files.css11
-rw-r--r--apps/files/css/upload.css2
-rw-r--r--apps/files/l10n/bg_BG.js13
-rw-r--r--apps/files/l10n/bg_BG.json13
-rw-r--r--apps/files/l10n/da.js2
-rw-r--r--apps/files/l10n/da.json2
-rw-r--r--apps/files/l10n/eu.js11
-rw-r--r--apps/files/l10n/eu.json11
-rw-r--r--apps/files/l10n/id.js18
-rw-r--r--apps/files/l10n/id.json18
-rw-r--r--apps/files/l10n/ja.js2
-rw-r--r--apps/files/l10n/ja.json2
-rw-r--r--apps/files/l10n/lv.js2
-rw-r--r--apps/files/l10n/lv.json2
-rw-r--r--apps/files/l10n/nb_NO.js2
-rw-r--r--apps/files/l10n/nb_NO.json2
-rw-r--r--apps/files/l10n/pt_PT.js9
-rw-r--r--apps/files/l10n/pt_PT.json9
-rw-r--r--apps/files/lib/helper.php19
-rw-r--r--apps/files_encryption/appinfo/info.xml3
-rw-r--r--apps/files_encryption/command/migratekeys.php12
-rw-r--r--apps/files_encryption/l10n/bg_BG.js2
-rw-r--r--apps/files_encryption/l10n/bg_BG.json2
-rw-r--r--apps/files_encryption/l10n/cs_CZ.js6
-rw-r--r--apps/files_encryption/l10n/cs_CZ.json6
-rw-r--r--apps/files_encryption/l10n/da.js6
-rw-r--r--apps/files_encryption/l10n/da.json6
-rw-r--r--apps/files_encryption/l10n/de_DE.js4
-rw-r--r--apps/files_encryption/l10n/de_DE.json4
-rw-r--r--apps/files_encryption/l10n/eu.js5
-rw-r--r--apps/files_encryption/l10n/eu.json5
-rw-r--r--apps/files_encryption/l10n/id.js9
-rw-r--r--apps/files_encryption/l10n/id.json9
-rw-r--r--apps/files_encryption/l10n/nb_NO.js1
-rw-r--r--apps/files_encryption/l10n/nb_NO.json1
-rw-r--r--apps/files_encryption/l10n/pt_PT.js2
-rw-r--r--apps/files_encryption/l10n/pt_PT.json2
-rw-r--r--apps/files_encryption/lib/migration.php19
-rw-r--r--apps/files_external/appinfo/app.php129
-rw-r--r--apps/files_external/js/dropbox.js5
-rw-r--r--apps/files_external/js/google.js5
-rw-r--r--apps/files_external/l10n/bg_BG.js2
-rw-r--r--apps/files_external/l10n/bg_BG.json2
-rw-r--r--apps/files_external/l10n/de.js2
-rw-r--r--apps/files_external/l10n/de.json2
-rw-r--r--apps/files_external/l10n/de_DE.js2
-rw-r--r--apps/files_external/l10n/de_DE.json2
-rw-r--r--apps/files_external/l10n/eu.js3
-rw-r--r--apps/files_external/l10n/eu.json3
-rw-r--r--apps/files_external/l10n/fr.js2
-rw-r--r--apps/files_external/l10n/fr.json2
-rw-r--r--apps/files_external/l10n/nb_NO.js1
-rw-r--r--apps/files_external/l10n/nb_NO.json1
-rw-r--r--apps/files_sharing/ajax/testremote.php1
-rw-r--r--apps/files_sharing/l10n/bg_BG.js15
-rw-r--r--apps/files_sharing/l10n/bg_BG.json15
-rw-r--r--apps/files_sharing/l10n/de.js6
-rw-r--r--apps/files_sharing/l10n/de.json6
-rw-r--r--apps/files_sharing/l10n/de_DE.js8
-rw-r--r--apps/files_sharing/l10n/de_DE.json8
-rw-r--r--apps/files_sharing/l10n/eu.js18
-rw-r--r--apps/files_sharing/l10n/eu.json18
-rw-r--r--apps/files_sharing/l10n/fr.js4
-rw-r--r--apps/files_sharing/l10n/fr.json4
-rw-r--r--apps/files_sharing/l10n/gl.js1
-rw-r--r--apps/files_sharing/l10n/gl.json1
-rw-r--r--apps/files_sharing/l10n/id.js27
-rw-r--r--apps/files_sharing/l10n/id.json27
-rw-r--r--apps/files_sharing/l10n/it.js2
-rw-r--r--apps/files_sharing/l10n/it.json2
-rw-r--r--apps/files_sharing/l10n/ja.js3
-rw-r--r--apps/files_sharing/l10n/ja.json3
-rw-r--r--apps/files_sharing/l10n/lv.js46
-rw-r--r--apps/files_sharing/l10n/lv.json46
-rw-r--r--apps/files_sharing/l10n/nb_NO.js3
-rw-r--r--apps/files_sharing/l10n/nb_NO.json3
-rw-r--r--apps/files_sharing/l10n/pt_PT.js14
-rw-r--r--apps/files_sharing/l10n/pt_PT.json14
-rw-r--r--apps/files_sharing/l10n/sk_SK.js1
-rw-r--r--apps/files_sharing/l10n/sk_SK.json1
-rw-r--r--apps/files_trashbin/l10n/bg_BG.js4
-rw-r--r--apps/files_trashbin/l10n/bg_BG.json4
-rw-r--r--apps/files_trashbin/l10n/eu.js4
-rw-r--r--apps/files_trashbin/l10n/eu.json4
-rw-r--r--apps/files_trashbin/l10n/id.js5
-rw-r--r--apps/files_trashbin/l10n/id.json5
-rw-r--r--apps/files_trashbin/l10n/lv.js2
-rw-r--r--apps/files_trashbin/l10n/lv.json2
-rw-r--r--apps/files_trashbin/l10n/pt_PT.js1
-rw-r--r--apps/files_trashbin/l10n/pt_PT.json1
-rw-r--r--apps/files_versions/l10n/ar.js6
-rw-r--r--apps/files_versions/l10n/ar.json6
-rw-r--r--apps/files_versions/l10n/lv.js3
-rw-r--r--apps/files_versions/l10n/lv.json3
-rw-r--r--apps/user_ldap/ajax/wizard.php2
-rw-r--r--apps/user_ldap/appinfo/info.xml3
-rw-r--r--apps/user_ldap/appinfo/update.php48
-rw-r--r--apps/user_ldap/appinfo/version2
-rw-r--r--apps/user_ldap/js/settings.js14
-rw-r--r--apps/user_ldap/l10n/ar.js1
-rw-r--r--apps/user_ldap/l10n/ar.json1
-rw-r--r--apps/user_ldap/l10n/de.js8
-rw-r--r--apps/user_ldap/l10n/de.json8
-rw-r--r--apps/user_ldap/l10n/de_DE.js6
-rw-r--r--apps/user_ldap/l10n/de_DE.json6
-rw-r--r--apps/user_ldap/l10n/eu.js4
-rw-r--r--apps/user_ldap/l10n/eu.json4
-rw-r--r--apps/user_ldap/l10n/id.js4
-rw-r--r--apps/user_ldap/l10n/id.json4
-rw-r--r--apps/user_ldap/l10n/ja.js12
-rw-r--r--apps/user_ldap/l10n/ja.json12
-rw-r--r--apps/user_ldap/l10n/pt_PT.js1
-rw-r--r--apps/user_ldap/l10n/pt_PT.json1
-rw-r--r--apps/user_ldap/l10n/ru.js68
-rw-r--r--apps/user_ldap/l10n/ru.json68
-rw-r--r--apps/user_ldap/lib/connection.php2
118 files changed, 737 insertions, 322 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 61caa7618da..1a810f6954c 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -36,7 +36,12 @@ foreach ($files as $file) {
}
// get array with updated storage stats (e.g. max file size) after upload
-$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+try {
+ $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+} catch(\OCP\Files\NotFoundException $e) {
+ OCP\JSON::error(['data' => ['message' => 'File not found']]);
+ return;
+}
if ($success) {
OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 0eb144aca56..159a8b5d7a3 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -3,9 +3,8 @@
// Init owncloud
global $eventSource;
-if(!OC_User::isLoggedIn()) {
- exit;
-}
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::callCheck();
\OC::$server->getSession()->close();
@@ -17,8 +16,6 @@ $source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
if($source) {
$eventSource = \OC::$server->createEventSource();
-} else {
- OC_JSON::callCheck();
}
function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
@@ -138,7 +135,7 @@ if($source) {
}
}
}
- $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
+ $result = \OC\Files\Filesystem::file_put_contents($target, $sourceStream);
}
if($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f04d6f8352a..1d6b4ad9e07 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -13,6 +13,11 @@
}
.actions.hidden { display: none; }
+.actions.creatable {
+ position: relative;
+ z-index: -30;
+}
+
#new {
z-index: 1010;
float: left;
@@ -34,19 +39,21 @@
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom: none;
+ background: #f8f8f8;
}
#new > ul {
display: none;
position: fixed;
min-width: 112px;
- z-index: 10;
+ z-index: -10;
padding: 8px;
padding-bottom: 0;
- margin-top: 14px;
+ margin-top: 13.5px;
margin-left: -1px;
text-align: left;
background: #f8f8f8;
border: 1px solid #ddd;
+ border: 1px solid rgba(190, 190, 190, 0.901961);
border-radius: 5px;
border-top-left-radius: 0;
box-shadow: 0 2px 7px rgba(170,170,170,.4);
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index adf1e9d13f8..bd60f831388 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -8,6 +8,8 @@
margin-left: 3px;
overflow: hidden;
vertical-align: top;
+ position: relative;
+ z-index: -20;
}
#upload .icon-upload {
position: relative;
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index b7fc758007c..1d9417b154e 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -53,7 +53,9 @@ OC.L10N.register(
"Disconnect storage" : "Извади дисковото устройство.",
"Unshare" : "Премахни Споделяне",
"Download" : "Изтегли",
+ "Select" : "Избери",
"Pending" : "Чакащо",
+ "Unable to determine date" : "Неуспешно установяване на дата",
"Error moving file." : "Грешка при местенето на файла.",
"Error moving file" : "Грешка при преместването на файла.",
"Error" : "Грешка",
@@ -72,8 +74,9 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
"{dirs} and {files}" : "{dirs} и {files}",
+ "Favorited" : "Отбелязано в любими",
"Favorite" : "Любими",
"%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит",
"%s could not be renamed" : "%s не може да бъде преименуван.",
@@ -93,9 +96,15 @@ OC.L10N.register(
"From link" : "От връзка",
"Upload" : "Качване",
"Cancel upload" : "Отказване на качването",
+ "No files yet" : "Все още няма файлове",
+ "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Upload too large" : "Прекалено голям файл за качване.",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
"Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
- "Currently scanning" : "В момента се търси"
+ "Currently scanning" : "В момента се търси",
+ "No favorites" : "Няма любими",
+ "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 05871b7f863..d8835e4e55f 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -51,7 +51,9 @@
"Disconnect storage" : "Извади дисковото устройство.",
"Unshare" : "Премахни Споделяне",
"Download" : "Изтегли",
+ "Select" : "Избери",
"Pending" : "Чакащо",
+ "Unable to determine date" : "Неуспешно установяване на дата",
"Error moving file." : "Грешка при местенето на файла.",
"Error moving file" : "Грешка при преместването на файла.",
"Error" : "Грешка",
@@ -70,8 +72,9 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
"{dirs} and {files}" : "{dirs} и {files}",
+ "Favorited" : "Отбелязано в любими",
"Favorite" : "Любими",
"%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит",
"%s could not be renamed" : "%s не може да бъде преименуван.",
@@ -91,9 +94,15 @@
"From link" : "От връзка",
"Upload" : "Качване",
"Cancel upload" : "Отказване на качването",
+ "No files yet" : "Все още няма файлове",
+ "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Upload too large" : "Прекалено голям файл за качване.",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
"Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
- "Currently scanning" : "В момента се търси"
+ "Currently scanning" : "В момента се търси",
+ "No favorites" : "Няма любими",
+ "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index b5f2446c7ee..80ca71ef04d 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -104,7 +104,7 @@ OC.L10N.register(
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
- "Currently scanning" : "Indlæser",
+ "Currently scanning" : "Skanning er i gang",
"No favorites" : "Ingen foretrukne",
"Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her"
},
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index b0c9ca107f5..27a70fa59c3 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -102,7 +102,7 @@
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
- "Currently scanning" : "Indlæser",
+ "Currently scanning" : "Skanning er i gang",
"No favorites" : "Ingen foretrukne",
"Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index b1f60461345..0db6c61e466 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -55,11 +55,13 @@ OC.L10N.register(
"Download" : "Deskargatu",
"Select" : "hautatu",
"Pending" : "Zain",
+ "Unable to determine date" : "Ezin izan da data zehaztu",
"Error moving file." : "Errorea fitxategia mugitzean.",
"Error moving file" : "Errorea fitxategia mugitzean",
"Error" : "Errorea",
"Could not rename file" : "Ezin izan da fitxategia berrizendatu",
"Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+ "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
"Name" : "Izena",
"Size" : "Tamaina",
"Modified" : "Aldatuta",
@@ -75,6 +77,7 @@ OC.L10N.register(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"_matches '{filter}'_::_match '{filter}'_" : ["",""],
"{dirs} and {files}" : "{dirs} eta {files}",
+ "Favorited" : "Gogokoa",
"Favorite" : "Gogokoa",
"%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
"%s could not be renamed" : "%s ezin da berrizendatu",
@@ -94,9 +97,15 @@ OC.L10N.register(
"From link" : "Estekatik",
"Upload" : "Igo",
"Cancel upload" : "Ezeztatu igoera",
+ "No files yet" : "Oraingoz fitxategirik ez",
+ "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Upload too large" : "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
- "Currently scanning" : "Eskaneatzen une honetan"
+ "Currently scanning" : "Eskaneatzen une honetan",
+ "No favorites" : "Gogokorik ez",
+ "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 79b98f6feb8..1529fd880f9 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -53,11 +53,13 @@
"Download" : "Deskargatu",
"Select" : "hautatu",
"Pending" : "Zain",
+ "Unable to determine date" : "Ezin izan da data zehaztu",
"Error moving file." : "Errorea fitxategia mugitzean.",
"Error moving file" : "Errorea fitxategia mugitzean",
"Error" : "Errorea",
"Could not rename file" : "Ezin izan da fitxategia berrizendatu",
"Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+ "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
"Name" : "Izena",
"Size" : "Tamaina",
"Modified" : "Aldatuta",
@@ -73,6 +75,7 @@
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"_matches '{filter}'_::_match '{filter}'_" : ["",""],
"{dirs} and {files}" : "{dirs} eta {files}",
+ "Favorited" : "Gogokoa",
"Favorite" : "Gogokoa",
"%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
"%s could not be renamed" : "%s ezin da berrizendatu",
@@ -92,9 +95,15 @@
"From link" : "Estekatik",
"Upload" : "Igo",
"Cancel upload" : "Ezeztatu igoera",
+ "No files yet" : "Oraingoz fitxategirik ez",
+ "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Upload too large" : "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
- "Currently scanning" : "Eskaneatzen une honetan"
+ "Currently scanning" : "Eskaneatzen une honetan",
+ "No favorites" : "Gogokorik ez",
+ "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index 85353dc496c..2f3544f489d 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -13,11 +13,11 @@ OC.L10N.register(
"The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
"The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
"Not a valid source" : "Sumber tidak sah",
- "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+ "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server",
"The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
"Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
"Error when creating the file" : "Kesalahan saat membuat berkas",
- "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+ "Folder name cannot be empty." : "Nama folder tidak boleh kosong.",
"Error when creating the folder" : "Kesalahan saat membuat folder",
"Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
"Invalid Token" : "Token tidak sah",
@@ -53,12 +53,15 @@ OC.L10N.register(
"Disconnect storage" : "Memutuskan penyimpaan",
"Unshare" : "Batalkan berbagi",
"Download" : "Unduh",
+ "Select" : "Pilih",
"Pending" : "Menunggu",
+ "Unable to determine date" : "Tidak dapat menentukan tanggal",
"Error moving file." : "Kesalahan saat memindahkan berkas.",
"Error moving file" : "Kesalahan saat memindahkan berkas",
"Error" : "Kesalahan ",
"Could not rename file" : "Tidak dapat mengubah nama berkas",
"Error deleting file." : "Kesalahan saat menghapus berkas.",
+ "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
"Name" : "Nama",
"Size" : "Ukuran",
"Modified" : "Dimodifikasi",
@@ -72,8 +75,9 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
"{dirs} and {files}" : "{dirs} dan {files}",
+ "Favorited" : "Difavoritkan",
"Favorite" : "Favorit",
"%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
"%s could not be renamed" : "%s tidak dapat diubah nama",
@@ -93,9 +97,15 @@ OC.L10N.register(
"From link" : "Dari tautan",
"Upload" : "Unggah",
"Cancel upload" : "Batal unggah",
+ "No files yet" : "Masih tidak ada berkas",
+ "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Upload too large" : "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
- "Currently scanning" : "Pemindaian terbaru"
+ "Currently scanning" : "Pemindaian terbaru",
+ "No favorites" : "Tidak ada favorit",
+ "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini."
},
"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index e6c66b0b124..053a1cb3570 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -11,11 +11,11 @@
"The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
"The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
"Not a valid source" : "Sumber tidak sah",
- "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+ "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server",
"The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
"Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
"Error when creating the file" : "Kesalahan saat membuat berkas",
- "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+ "Folder name cannot be empty." : "Nama folder tidak boleh kosong.",
"Error when creating the folder" : "Kesalahan saat membuat folder",
"Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
"Invalid Token" : "Token tidak sah",
@@ -51,12 +51,15 @@
"Disconnect storage" : "Memutuskan penyimpaan",
"Unshare" : "Batalkan berbagi",
"Download" : "Unduh",
+ "Select" : "Pilih",
"Pending" : "Menunggu",
+ "Unable to determine date" : "Tidak dapat menentukan tanggal",
"Error moving file." : "Kesalahan saat memindahkan berkas.",
"Error moving file" : "Kesalahan saat memindahkan berkas",
"Error" : "Kesalahan ",
"Could not rename file" : "Tidak dapat mengubah nama berkas",
"Error deleting file." : "Kesalahan saat menghapus berkas.",
+ "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
"Name" : "Nama",
"Size" : "Ukuran",
"Modified" : "Dimodifikasi",
@@ -70,8 +73,9 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
"{dirs} and {files}" : "{dirs} dan {files}",
+ "Favorited" : "Difavoritkan",
"Favorite" : "Favorit",
"%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
"%s could not be renamed" : "%s tidak dapat diubah nama",
@@ -91,9 +95,15 @@
"From link" : "Dari tautan",
"Upload" : "Unggah",
"Cancel upload" : "Batal unggah",
+ "No files yet" : "Masih tidak ada berkas",
+ "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Upload too large" : "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
- "Currently scanning" : "Pemindaian terbaru"
+ "Currently scanning" : "Pemindaian terbaru",
+ "No favorites" : "Tidak ada favorit",
+ "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini."
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 051f39e2456..0cb3193c61d 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -79,7 +79,7 @@ OC.L10N.register(
"{dirs} and {files}" : "{dirs} と {files}",
"Favorited" : "お気に入り済",
"Favorite" : "お気に入り",
- "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
+ "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません",
"%s could not be renamed" : "%sの名前を変更できませんでした",
"Upload (max. %s)" : "アップロード ( 最大 %s )",
"File handling" : "ファイル操作",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 2eac70d694d..570b63ab5f7 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -77,7 +77,7 @@
"{dirs} and {files}" : "{dirs} と {files}",
"Favorited" : "お気に入り済",
"Favorite" : "お気に入り",
- "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
+ "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません",
"%s could not be renamed" : "%sの名前を変更できませんでした",
"Upload (max. %s)" : "アップロード ( 最大 %s )",
"File handling" : "ファイル操作",
diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js
index 3dc666bfbcb..5113633fd38 100644
--- a/apps/files/l10n/lv.js
+++ b/apps/files/l10n/lv.js
@@ -75,7 +75,7 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
- "_matches '{filter}'_::_match '{filter}'_" : ["","",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
"{dirs} and {files}" : "{dirs} un {files}",
"Favorited" : "Favorīti",
"Favorite" : "Iecienītais",
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
index 0a09bc6cd19..fce4afe103f 100644
--- a/apps/files/l10n/lv.json
+++ b/apps/files/l10n/lv.json
@@ -73,7 +73,7 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
- "_matches '{filter}'_::_match '{filter}'_" : ["","",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
"{dirs} and {files}" : "{dirs} un {files}",
"Favorited" : "Favorīti",
"Favorite" : "Iecienītais",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index a528ba4542b..34ff0f0c2d7 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -75,7 +75,7 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
"Favorited" : "Er favoritt",
"Favorite" : "Gjør til favoritt",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index c3957977e3b..2af4e446204 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -73,7 +73,7 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
"Favorited" : "Er favoritt",
"Favorite" : "Gjør til favoritt",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index fd920a75ffa..57c37495e4e 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -61,6 +61,7 @@ OC.L10N.register(
"Error" : "Erro",
"Could not rename file" : "Não pôde renomear o ficheiro",
"Error deleting file." : "Erro ao apagar o ficheiro.",
+ "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
"Name" : "Nome",
"Size" : "Tamanho",
"Modified" : "Modificado",
@@ -74,8 +75,9 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
+ "Favorited" : "Assinalado como Favorito",
"Favorite" : "Favorito",
"%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
"%s could not be renamed" : "%s não pode ser renomeada",
@@ -95,12 +97,15 @@ OC.L10N.register(
"From link" : "Da hiperligação",
"Upload" : "Enviar",
"Cancel upload" : "Cancelar o envio",
+ "No files yet" : "Ainda não há arquivos",
+ "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Upload too large" : "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
"Currently scanning" : "A analisar",
- "No favorites" : "Sem favoritos"
+ "No favorites" : "Sem favoritos",
+ "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index 742d5349bdb..bd168dfb4b1 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -59,6 +59,7 @@
"Error" : "Erro",
"Could not rename file" : "Não pôde renomear o ficheiro",
"Error deleting file." : "Erro ao apagar o ficheiro.",
+ "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
"Name" : "Nome",
"Size" : "Tamanho",
"Modified" : "Modificado",
@@ -72,8 +73,9 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
+ "Favorited" : "Assinalado como Favorito",
"Favorite" : "Favorito",
"%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
"%s could not be renamed" : "%s não pode ser renomeada",
@@ -93,12 +95,15 @@
"From link" : "Da hiperligação",
"Upload" : "Enviar",
"Cancel upload" : "Cancelar o envio",
+ "No files yet" : "Ainda não há arquivos",
+ "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Upload too large" : "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
"Currently scanning" : "A analisar",
- "No favorites" : "Sem favoritos"
+ "No favorites" : "Sem favoritos",
+ "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 84b1a0f1662..bcca6f0a276 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -13,21 +13,26 @@ use OCP\Files\FileInfo;
/**
* Helper class for manipulating file information
*/
-class Helper
-{
+class Helper {
+ /**
+ * @param string $dir
+ * @return array
+ * @throws \OCP\Files\NotFoundException
+ */
public static function buildFileStorageStatistics($dir) {
// information about storage capacities
$storageInfo = \OC_Helper::getStorageInfo($dir);
-
$l = new \OC_L10N('files');
$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
- return array('uploadMaxFilesize' => $maxUploadFileSize,
- 'maxHumanFilesize' => $maxHumanFileSize,
- 'freeSpace' => $storageInfo['free'],
- 'usedSpacePercent' => (int)$storageInfo['relative']);
+ return [
+ 'uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize,
+ 'freeSpace' => $storageInfo['free'],
+ 'usedSpacePercent' => (int)$storageInfo['relative']
+ ];
}
/**
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 6fcef693bed..7f7e09d6271 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -19,4 +19,7 @@
<filesystem/>
</types>
<ocsid>166047</ocsid>
+ <dependencies>
+ <lib>openssl</lib>
+ </dependencies>
</info>
diff --git a/apps/files_encryption/command/migratekeys.php b/apps/files_encryption/command/migratekeys.php
index 200d7367da6..d6db1f70892 100644
--- a/apps/files_encryption/command/migratekeys.php
+++ b/apps/files_encryption/command/migratekeys.php
@@ -62,11 +62,17 @@ class MigrateKeys extends Command {
}
$output->writeln("Migrating keys for users on backend <info>$name</info>");
- $users = $backend->getUsers();
- foreach ($users as $user) {
+
+ $limit = 500;
+ $offset = 0;
+ do {
+ $users = $backend->getUsers('', $limit, $offset);
+ foreach ($users as $user) {
$output->writeln(" <info>$user</info>");
$migration->reorganizeFolderStructureForUser($user);
- }
+ }
+ $offset += $limit;
+ } while(count($users) >= $limit);
}
}
diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js
index f0661f3b316..6f5876c0654 100644
--- a/apps/files_encryption/l10n/bg_BG.js
+++ b/apps/files_encryption/l10n/bg_BG.js
@@ -26,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+ "Server-side Encryption" : "Криптиране от страна на сървъра",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Recovery key password" : "Парола за възстановяане на ключа",
diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json
index 3108ec85b50..055c434d229 100644
--- a/apps/files_encryption/l10n/bg_BG.json
+++ b/apps/files_encryption/l10n/bg_BG.json
@@ -24,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+ "Server-side Encryption" : "Криптиране от страна на сървъра",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Recovery key password" : "Парола за възстановяане на ключа",
diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js
index 39cebae1018..42e14ca683f 100644
--- a/apps/files_encryption/l10n/cs_CZ.js
+++ b/apps/files_encryption/l10n/cs_CZ.js
@@ -6,7 +6,7 @@ OC.L10N.register(
"Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
"Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
"Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
- "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 svého záchranného klíče!",
"Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
"Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
"Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
@@ -42,8 +42,8 @@ OC.L10N.register(
"Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
"Change Password" : "Změnit heslo",
"Your private key password no longer matches 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 vaše staré heslo soukromého klíče na stejné, jako je vaše současné 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ů.",
+ "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+ " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své 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",
diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json
index 3fe4b4f57f1..6e724f8ea2e 100644
--- a/apps/files_encryption/l10n/cs_CZ.json
+++ b/apps/files_encryption/l10n/cs_CZ.json
@@ -4,7 +4,7 @@
"Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
"Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
"Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
- "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 svého záchranného klíče!",
"Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
"Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
"Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
@@ -40,8 +40,8 @@
"Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
"Change Password" : "Změnit heslo",
"Your private key password no longer matches 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 vaše staré heslo soukromého klíče na stejné, jako je vaše současné 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ů.",
+ "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+ " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své 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",
diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js
index 3ac8175773c..667b8e72c7a 100644
--- a/apps/files_encryption/l10n/da.js
+++ b/apps/files_encryption/l10n/da.js
@@ -21,7 +21,7 @@ OC.L10N.register(
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"Your private key is not valid! Likely your password was changed outside of %s (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 ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
@@ -30,7 +30,7 @@ OC.L10N.register(
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
"Server-side Encryption" : "Kryptering på serverdelen",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"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",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
@@ -39,7 +39,7 @@ OC.L10N.register(
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
- "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+ "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Change Password" : "Skift Kodeord",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord 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øglekodeord til at være dit nuværende login-kodeord. ",
diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json
index e6e8d4b0759..0561094f291 100644
--- a/apps/files_encryption/l10n/da.json
+++ b/apps/files_encryption/l10n/da.json
@@ -19,7 +19,7 @@
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"Your private key is not valid! Likely your password was changed outside of %s (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 ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
@@ -28,7 +28,7 @@
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
"Server-side Encryption" : "Kryptering på serverdelen",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"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",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
@@ -37,7 +37,7 @@
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
- "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+ "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Change Password" : "Skift Kodeord",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord 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øglekodeord til at være dit nuværende login-kodeord. ",
diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js
index 6b4b80dd0c3..9ad50104ea8 100644
--- a/apps/files_encryption/l10n/de_DE.js
+++ b/apps/files_encryption/l10n/de_DE.js
@@ -27,11 +27,11 @@ OC.L10N.register(
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure 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 OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
- "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+ "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
- "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+ "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json
index 4c2dbcb283d..135818e290c 100644
--- a/apps/files_encryption/l10n/de_DE.json
+++ b/apps/files_encryption/l10n/de_DE.json
@@ -25,11 +25,11 @@
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure 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 OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
- "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+ "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
- "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+ "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js
index 42f6b9cdd57..d1d1b55f73b 100644
--- a/apps/files_encryption/l10n/eu.js
+++ b/apps/files_encryption/l10n/eu.js
@@ -13,6 +13,9 @@ OC.L10N.register(
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
"Password successfully changed." : "Pasahitza behar bezala aldatu da.",
"Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+ "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ",
+ "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
+ "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
@@ -23,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+ "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Recovery key password" : "Berreskuratze gako pasahitza",
diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json
index 334bb077806..3bd66a039f3 100644
--- a/apps/files_encryption/l10n/eu.json
+++ b/apps/files_encryption/l10n/eu.json
@@ -11,6 +11,9 @@
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
"Password successfully changed." : "Pasahitza behar bezala aldatu da.",
"Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+ "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ",
+ "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
+ "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
@@ -21,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+ "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Recovery key password" : "Berreskuratze gako pasahitza",
diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js
index 64b9cfe5d3b..c9137a51a11 100644
--- a/apps/files_encryption/l10n/id.js
+++ b/apps/files_encryption/l10n/id.js
@@ -13,6 +13,9 @@ OC.L10N.register(
"Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
"Password successfully changed." : "Sandi berhasil diubah",
"Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+ "Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.",
+ "The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.",
+ "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
"File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
"Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
@@ -23,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
"Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
"Missing requirements." : "Persyaratan tidak terpenuhi.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mohon pastikan bahwa OpenSSL bersama ekstensi PHP diaktifkan dan terkonfigurasi dengan benar. Untuk sekarang, aplikasi enkripsi akan dinonaktifkan.",
"Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
"Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
+ "Server-side Encryption" : "Enkripsi Sisi-Server",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
"Recovery key password" : "Sandi kunci pemulihan",
@@ -35,13 +40,13 @@ OC.L10N.register(
"Old Recovery key password" : "Sandi kunci Pemulihan Lama",
"New Recovery key password" : "Sandi kunci Pemulihan Baru",
"Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
- "Change Password" : "Ubah sandi",
+ "Change Password" : "Ubah Sandi",
"Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Sandi masuk yang lama",
"Current log-in password" : "Sandi masuk saat ini",
- "Update Private Key Password" : "Perbarui Sandi Kunci Privat",
+ "Update Private Key Password" : "Perbarui Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
},
diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json
index 5ed73a38b46..5d77cef0b24 100644
--- a/apps/files_encryption/l10n/id.json
+++ b/apps/files_encryption/l10n/id.json
@@ -11,6 +11,9 @@
"Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
"Password successfully changed." : "Sandi berhasil diubah",
"Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+ "Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.",
+ "The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.",
+ "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
"File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
"Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
@@ -21,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
"Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
"Missing requirements." : "Persyaratan tidak terpenuhi.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mohon pastikan bahwa OpenSSL bersama ekstensi PHP diaktifkan dan terkonfigurasi dengan benar. Untuk sekarang, aplikasi enkripsi akan dinonaktifkan.",
"Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
"Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
+ "Server-side Encryption" : "Enkripsi Sisi-Server",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
"Recovery key password" : "Sandi kunci pemulihan",
@@ -33,13 +38,13 @@
"Old Recovery key password" : "Sandi kunci Pemulihan Lama",
"New Recovery key password" : "Sandi kunci Pemulihan Baru",
"Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
- "Change Password" : "Ubah sandi",
+ "Change Password" : "Ubah Sandi",
"Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Sandi masuk yang lama",
"Current log-in password" : "Sandi masuk saat ini",
- "Update Private Key Password" : "Perbarui Sandi Kunci Privat",
+ "Update Private Key Password" : "Perbarui Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js
index a4fde8b8614..ff52350f98a 100644
--- a/apps/files_encryption/l10n/nb_NO.js
+++ b/apps/files_encryption/l10n/nb_NO.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+ "Server-side Encryption" : "Serverkryptering",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json
index 8bd4598d007..3aa4ec9e868 100644
--- a/apps/files_encryption/l10n/nb_NO.json
+++ b/apps/files_encryption/l10n/nb_NO.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+ "Server-side Encryption" : "Serverkryptering",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js
index 574a53e8f75..3d6e8a50749 100644
--- a/apps/files_encryption/l10n/pt_PT.js
+++ b/apps/files_encryption/l10n/pt_PT.js
@@ -26,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
"Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
"Missing requirements." : "Requisitos em falta.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.",
"Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
"Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+ "Server-side Encryption" : "Encriptação do lado do Servidor",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
"Recovery key password" : "Senha da chave de recuperação",
diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json
index 98314896c5b..d2a34ec9d01 100644
--- a/apps/files_encryption/l10n/pt_PT.json
+++ b/apps/files_encryption/l10n/pt_PT.json
@@ -24,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
"Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
"Missing requirements." : "Requisitos em falta.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.",
"Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
"Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+ "Server-side Encryption" : "Encriptação do lado do Servidor",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
"Recovery key password" : "Senha da chave de recuperação",
diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php
index cf5552f84ac..7a036ade3fc 100644
--- a/apps/files_encryption/lib/migration.php
+++ b/apps/files_encryption/lib/migration.php
@@ -42,10 +42,15 @@ class Migration {
public function reorganizeFolderStructure() {
$this->reorganizeSystemFolderStructure();
- $users = \OCP\User::getUsers();
- foreach ($users as $user) {
- $this->reorganizeFolderStructureForUser($user);
- }
+ $limit = 500;
+ $offset = 0;
+ do {
+ $users = \OCP\User::getUsers('', $limit, $offset);
+ foreach ($users as $user) {
+ $this->reorganizeFolderStructureForUser($user);
+ }
+ $offset += $limit;
+ } while(count($users) >= $limit);
}
public function reorganizeSystemFolderStructure() {
@@ -256,11 +261,7 @@ class Migration {
if (substr($file, 0, strlen($filename) +1) === $filename . '.') {
$uid = $this->getUidFromShareKey($file, $filename, $trash);
- if ($uid === $this->public_share_key_id ||
- $uid === $this->recovery_key_id ||
- \OCP\User::userExists($uid)) {
- $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey');
- }
+ $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey');
}
}
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 9b5994338a1..cb882463a1a 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -26,39 +26,41 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
OCP\App::registerPersonal('files_external', 'personal');
}
-\OCA\Files\App::getNavigationManager()->add(
- array(
- "id" => 'extstoragemounts',
- "appname" => 'files_external',
- "script" => 'list.php',
- "order" => 30,
- "name" => $l->t('External storage')
- )
-);
+\OCA\Files\App::getNavigationManager()->add([
+ "id" => 'extstoragemounts',
+ "appname" => 'files_external',
+ "script" => 'list.php',
+ "order" => 30,
+ "name" => $l->t('External storage')
+]);
// connecting hooks
OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', [
'backend' => (string)$l->t('Local'),
'priority' => 150,
- 'configuration' => array(
- 'datadir' => (string)$l->t('Location'))));
+ 'configuration' => [
+ 'datadir' => (string)$l->t('Location')
+ ],
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
'backend' => (string)$l->t('Amazon S3'),
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'key' => (string)$l->t('Key'),
'secret' => '*'.$l->t('Secret'),
- 'bucket' => (string)$l->t('Bucket')),
- 'has_dependencies' => true));
+ 'bucket' => (string)$l->t('Bucket'),
+ ],
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
'backend' => (string)$l->t('Amazon S3 and compliant'),
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'key' => (string)$l->t('Access Key'),
'secret' => '*'.$l->t('Secret Key'),
'bucket' => (string)$l->t('Bucket'),
@@ -66,48 +68,56 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
'port' => '&'.$l->t('Port'),
'region' => '&'.$l->t('Region'),
'use_ssl' => '!'.$l->t('Enable SSL'),
- 'use_path_style' => '!'.$l->t('Enable Path Style')),
- 'has_dependencies' => true));
+ 'use_path_style' => '!'.$l->t('Enable Path Style')
+ ],
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [
'backend' => 'Dropbox',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'configured' => '#configured',
'app_key' => (string)$l->t('App key'),
'app_secret' => '*'.$l->t('App secret'),
'token' => '#token',
- 'token_secret' => '#token_secret'),
+ 'token_secret' => '#token_secret'
+ ],
'custom' => 'dropbox',
- 'has_dependencies' => true));
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', [
'backend' => 'FTP',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'root' => '&'.$l->t('Remote subfolder'),
- 'secure' => '!'.$l->t('Secure ftps://')),
- 'has_dependencies' => true));
+ 'secure' => '!'.$l->t('Secure ftps://')
+ ],
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', [
'backend' => 'Google Drive',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'configured' => '#configured',
'client_id' => (string)$l->t('Client ID'),
'client_secret' => '*'.$l->t('Client secret'),
- 'token' => '#token'),
+ 'token' => '#token',
+ ],
'custom' => 'google',
- 'has_dependencies' => true));
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [
'backend' => (string)$l->t('OpenStack Object Storage'),
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'user' => (string)$l->t('Username'),
'bucket' => (string)$l->t('Bucket'),
'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'),
@@ -117,63 +127,74 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'),
'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'),
'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds'),
- ),
- 'has_dependencies' => true));
+ ],
+ 'has_dependencies' => true,
+]);
if (!OC_Util::runningOnWindows()) {
- OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array(
+ OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', [
'backend' => 'SMB / CIFS',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'share' => (string)$l->t('Share'),
- 'root' => '&'.$l->t('Remote subfolder')),
- 'has_dependencies' => true));
+ 'root' => '&'.$l->t('Remote subfolder'),
+ ],
+ 'has_dependencies' => true,
+ ]);
- OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array(
+ OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [
'backend' => (string)$l->t('SMB / CIFS using OC login'),
'priority' => 90,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('Host'),
'username_as_share' => '!'.$l->t('Username as share'),
'share' => '&'.$l->t('Share'),
- 'root' => '&'.$l->t('Remote subfolder')),
- 'has_dependencies' => true));
+ 'root' => '&'.$l->t('Remote subfolder'),
+ ],
+ 'has_dependencies' => true,
+ ]);
}
-OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', [
'backend' => 'WebDAV',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('URL'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'root' => '&'.$l->t('Remote subfolder'),
- 'secure' => '!'.$l->t('Secure https://')),
- 'has_dependencies' => true));
+ 'secure' => '!'.$l->t('Secure https://'),
+ ],
+ 'has_dependencies' => true,
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', [
'backend' => 'ownCloud',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('URL'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'root' => '&'.$l->t('Remote subfolder'),
- 'secure' => '!'.$l->t('Secure https://'))));
+ 'secure' => '!'.$l->t('Secure https://'),
+ ],
+]);
-OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array(
+OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', [
'backend' => 'SFTP',
'priority' => 100,
- 'configuration' => array(
+ 'configuration' => [
'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
- 'root' => '&'.$l->t('Remote subfolder'))));
+ 'root' => '&'.$l->t('Remote subfolder'),
+ ],
+]);
$mountProvider = new \OCA\Files_External\Config\ConfigAdapter();
\OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 6baaabe11b6..2880e910f2c 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -65,7 +65,10 @@ $(document).ready(function() {
|| $(tr).find('.chzn-select').val() != null))
{
if ($(tr).find('.dropbox').length == 0) {
- $(config).append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
+ $(config).append($(document.createElement('input'))
+ .addClass('button dropbox')
+ .attr('type', 'button')
+ .attr('value', t('files_external', 'Grant access')));
} else {
$(tr).find('.dropbox').show();
}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 068c2c13c66..b9a5e66b800 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -85,8 +85,9 @@ $(document).ready(function() {
|| $(tr).find('.chzn-select').val() != null))
{
if ($(tr).find('.google').length == 0) {
- $(config).append($('<a/>').addClass('button google')
- .text(t('files_external', 'Grant access')));
+ $(config).append($(document.createElement('input')).addClass('button google')
+ .attr('type', 'button')
+ .attr('value', t('files_external', 'Grant access')));
} else {
$(tr).find('.google').show();
}
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index dabf8715e82..f1a773b21f9 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -56,6 +56,8 @@ OC.L10N.register(
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+ "No external storage configured" : "Няма настроено външно дисково пространство",
+ "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки",
"Name" : "Име",
"Storage type" : "Тип дисково пространство",
"Scope" : "Обхват",
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 5dc9e8d60a2..b404afdae5e 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -54,6 +54,8 @@
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+ "No external storage configured" : "Няма настроено външно дисково пространство",
+ "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки",
"Name" : "Име",
"Storage type" : "Тип дисково пространство",
"Scope" : "Обхват",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index a08d17f75b2..b5775a0b0ef 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -49,7 +49,7 @@ OC.L10N.register(
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index 10210851aaf..e6501b57a7d 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -47,7 +47,7 @@
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index d8ddc836ad2..9122a8caa0a 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -49,7 +49,7 @@ OC.L10N.register(
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index 7a62e5b2ab8..5c8ba8a89ee 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -47,7 +47,7 @@
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index 8da8ca68263..0127452f697 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -52,9 +52,12 @@ OC.L10N.register(
"(group)" : "(taldea)",
"Saved" : "Gordeta",
"<b>Note:</b> " : "<b>Oharra:</b>",
+ "and" : "eta",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+ "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu",
+ "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu",
"Name" : "Izena",
"Storage type" : "Biltegiratze mota",
"External Storage" : "Kanpoko biltegiratzea",
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index 7ae84c8dbd3..af7f8e4016b 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -50,9 +50,12 @@
"(group)" : "(taldea)",
"Saved" : "Gordeta",
"<b>Note:</b> " : "<b>Oharra:</b>",
+ "and" : "eta",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+ "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu",
+ "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu",
"Name" : "Izena",
"Storage type" : "Biltegiratze mota",
"External Storage" : "Kanpoko biltegiratzea",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 23c31636fce..cec7d16d752 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -58,7 +58,7 @@ OC.L10N.register(
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"No external storage configured" : "Aucun stockage externe configuré",
- "You can configure external storages in the personal settings" : "Vous pouvez configurer vos stockages externes dans les paramètres personnels.",
+ "You can configure external storages in the personal settings" : "Vous pouvez configurer des stockages externes dans vos paramètres personnels",
"Name" : "Nom",
"Storage type" : "Type de support de stockage",
"Scope" : "Portée",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index e29f032fc4e..af1e7c22cd3 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -56,7 +56,7 @@
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"No external storage configured" : "Aucun stockage externe configuré",
- "You can configure external storages in the personal settings" : "Vous pouvez configurer vos stockages externes dans les paramètres personnels.",
+ "You can configure external storages in the personal settings" : "Vous pouvez configurer des stockages externes dans vos paramètres personnels",
"Name" : "Nom",
"Storage type" : "Type de support de stockage",
"Scope" : "Portée",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 19e0051e1e3..1fa2f9a8c6e 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -57,6 +57,7 @@ OC.L10N.register(
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+ "No external storage configured" : "Eksternt lager er ikke konfigurert",
"You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger",
"Name" : "Navn",
"Storage type" : "Lagringstype",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 0b707decbea..6ff246ee2ef 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -55,6 +55,7 @@
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+ "No external storage configured" : "Eksternt lager er ikke konfigurert",
"You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger",
"Name" : "Navn",
"Storage type" : "Lagringstype",
diff --git a/apps/files_sharing/ajax/testremote.php b/apps/files_sharing/ajax/testremote.php
index 08149bf7ecc..14992787012 100644
--- a/apps/files_sharing/ajax/testremote.php
+++ b/apps/files_sharing/ajax/testremote.php
@@ -6,6 +6,7 @@
* See the COPYING-README file.
*/
+OCP\JSON::callCheck();
OCP\JSON::checkAppEnabled('files_sharing');
$remote = $_GET['remote'];
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index ee0680f3a16..7a637db3a40 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -4,21 +4,36 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
"The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
"Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+ "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна",
+ "Storage not valid" : "Невалидно дисково пространство.",
"Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
"Shared with you" : "Споделено с теб",
"Shared with others" : "Споделено с други",
"Shared by link" : "Споделено с връзка",
+ "Nothing shared with you yet" : "Все още няма нищо споделено с теб",
+ "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук",
+ "Nothing shared yet" : "Още нищо не е споделено",
+ "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.",
+ "No shared links" : "Няма споделени връзки",
+ "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
"Remote share" : "Прикачена Папка",
"Remote share password" : "Парола за прикачена папка",
"Cancel" : "Отказ",
"Add remote share" : "Добави прикачена папка",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
"Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
"Share" : "Сподели",
"Shared by" : "Споделено от",
+ "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>",
+ "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб",
+ "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена",
+ "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
"Password" : "Парола",
+ "No entries found in this folder" : "Няма намерени записи в тази директория",
"Name" : "Име",
"Share time" : "Споделено на",
"Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index 5db378e95c7..c4180087200 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -2,21 +2,36 @@
"Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
"The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
"Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+ "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна",
+ "Storage not valid" : "Невалидно дисково пространство.",
"Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
"Shared with you" : "Споделено с теб",
"Shared with others" : "Споделено с други",
"Shared by link" : "Споделено с връзка",
+ "Nothing shared with you yet" : "Все още няма нищо споделено с теб",
+ "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук",
+ "Nothing shared yet" : "Още нищо не е споделено",
+ "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.",
+ "No shared links" : "Няма споделени връзки",
+ "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
"Remote share" : "Прикачена Папка",
"Remote share password" : "Парола за прикачена папка",
"Cancel" : "Отказ",
"Add remote share" : "Добави прикачена папка",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
"Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
"Share" : "Сподели",
"Shared by" : "Споделено от",
+ "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>",
+ "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб",
+ "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена",
+ "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
"Password" : "Парола",
+ "No entries found in this folder" : "Няма намерени записи в тази директория",
"Name" : "Име",
"Share time" : "Споделено на",
"Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 06862a2ea0c..d53e43e83a4 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -26,13 +26,13 @@ OC.L10N.register(
"Share" : "Share",
"Shared by" : "Geteilt von ",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder ein öffentlich geteilter Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
"Password" : "Passwort",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 25f06c20fbd..78ccece1bf1 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -24,13 +24,13 @@
"Share" : "Share",
"Shared by" : "Geteilt von ",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder ein öffentlich geteilter Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
"Password" : "Passwort",
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index c5061da55e9..d44e97e6056 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -26,13 +26,13 @@ OC.L10N.register(
"Share" : "Teilen",
"Shared by" : "Geteilt von",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder ein öffentlich geteilter Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" : "Passwort",
@@ -50,7 +50,7 @@ OC.L10N.register(
"Download %s" : "Download %s",
"Direct link" : "Direkte Verlinkung",
"Federated Cloud Sharing" : "Federated-Cloud-Sharing",
- "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+ "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 472da287734..8571d4fdd83 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -24,13 +24,13 @@
"Share" : "Teilen",
"Shared by" : "Geteilt von",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder ein öffentlich geteilter Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" : "Passwort",
@@ -48,7 +48,7 @@
"Download %s" : "Download %s",
"Direct link" : "Direkte Verlinkung",
"Federated Cloud Sharing" : "Federated-Cloud-Sharing",
- "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+ "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index e136a736521..047a96a73f1 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -4,21 +4,34 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
"The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
"Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
+ "Storage not valid" : "Biltegi bliogabea",
"Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
"Shared with you" : "Zurekin elkarbanatuta",
"Shared with others" : "Beste batzuekin elkarbanatuta",
"Shared by link" : "Lotura bidez elkarbanatuta",
+ "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin",
+ "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira",
+ "Nothing shared yet" : "Oraindik ez da ezer partekatu",
+ "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
+ "No shared links" : "Ez dago partekatutako loturarik",
+ "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?",
"Remote share" : "Urrutiko parte hartzea",
"Remote share password" : "Urrutiko parte hartzeen pasahitza",
"Cancel" : "Ezeztatu",
"Add remote share" : "Gehitu urrutiko parte hartzea",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
"Invalid ownCloud url" : "ownCloud url baliogabea",
"Share" : "Partekatu",
"Shared by" : "Honek elkarbanatuta",
+ "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
+ "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da",
+ "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
"Password" : "Pasahitza",
+ "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu",
"Name" : "Izena",
"Share time" : "Elkarbanatze unea",
"Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
@@ -30,6 +43,9 @@ OC.L10N.register(
"Add to your ownCloud" : "Gehitu zure ownCloud-era",
"Download" : "Deskargatu",
"Download %s" : "Deskargatu %s",
- "Direct link" : "Lotura zuzena"
+ "Direct link" : "Lotura zuzena",
+ "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea",
+ "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera",
+ "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index 7355146ee9c..58e5225abf9 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -2,21 +2,34 @@
"Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
"The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
"Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
+ "Storage not valid" : "Biltegi bliogabea",
"Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
"Shared with you" : "Zurekin elkarbanatuta",
"Shared with others" : "Beste batzuekin elkarbanatuta",
"Shared by link" : "Lotura bidez elkarbanatuta",
+ "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin",
+ "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira",
+ "Nothing shared yet" : "Oraindik ez da ezer partekatu",
+ "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
+ "No shared links" : "Ez dago partekatutako loturarik",
+ "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?",
"Remote share" : "Urrutiko parte hartzea",
"Remote share password" : "Urrutiko parte hartzeen pasahitza",
"Cancel" : "Ezeztatu",
"Add remote share" : "Gehitu urrutiko parte hartzea",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
"Invalid ownCloud url" : "ownCloud url baliogabea",
"Share" : "Partekatu",
"Shared by" : "Honek elkarbanatuta",
+ "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
+ "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da",
+ "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
"Password" : "Pasahitza",
+ "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu",
"Name" : "Izena",
"Share time" : "Elkarbanatze unea",
"Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
@@ -28,6 +41,9 @@
"Add to your ownCloud" : "Gehitu zure ownCloud-era",
"Download" : "Deskargatu",
"Download %s" : "Deskargatu %s",
- "Direct link" : "Lotura zuzena"
+ "Direct link" : "Lotura zuzena",
+ "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea",
+ "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera",
+ "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 96ccb0b2c8c..b450ab08221 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -14,7 +14,7 @@ OC.L10N.register(
"Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
"Nothing shared yet" : "Rien n'est partagé pour l'instant",
"Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici",
- "No shared links" : "Aucun lien partagé",
+ "No shared links" : "Aucun partage par lien",
"Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?",
"Remote share" : "Partage distant",
@@ -49,7 +49,7 @@ OC.L10N.register(
"Download" : "Télécharger",
"Download %s" : "Télécharger %s",
"Direct link" : "Lien direct",
- "Federated Cloud Sharing" : "Partage fédéré dans le cloud",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
"Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
},
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index c148f654f63..1c8d0382f79 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -12,7 +12,7 @@
"Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
"Nothing shared yet" : "Rien n'est partagé pour l'instant",
"Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagerez apparaîtront ici",
- "No shared links" : "Aucun lien partagé",
+ "No shared links" : "Aucun partage par lien",
"Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?",
"Remote share" : "Partage distant",
@@ -47,7 +47,7 @@
"Download" : "Télécharger",
"Download %s" : "Télécharger %s",
"Direct link" : "Lien direct",
- "Federated Cloud Sharing" : "Partage fédéré dans le cloud",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
"Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 4f93701ff97..36967ee11dd 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -49,6 +49,7 @@ OC.L10N.register(
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Ligazón directa",
+ "Federated Cloud Sharing" : "Compartición de nube federada",
"Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores"
},
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index 5ef32596268..81d97bfdcec 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -47,6 +47,7 @@
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Ligazón directa",
+ "Federated Cloud Sharing" : "Compartición de nube federada",
"Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 6cb9f17628e..74c0af2695b 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -2,25 +2,43 @@ OC.L10N.register(
"files_sharing",
{
"Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
- "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+ "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
"Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+ "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+ "Storage not valid" : "Penyimpanan tidak sah",
"Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
"Shared with you" : "Dibagikan dengan Anda",
"Shared with others" : "Dibagikan dengan lainnya",
"Shared by link" : "Dibagikan dengan tautan",
+ "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda",
+ "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini",
+ "Nothing shared yet" : "Tidak ada yang dibagikan",
+ "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini",
+ "No shared links" : "Tidak ada tautan berbagi",
+ "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
"Remote share" : "Berbagi remote",
"Remote share password" : "Sandi berbagi remote",
"Cancel" : "Batal",
"Add remote share" : "Tambah berbagi remote",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
"Invalid ownCloud url" : "URL ownCloud tidak sah",
"Share" : "Bagikan",
"Shared by" : "Dibagikan oleh",
+ "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
+ "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s",
+ "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s",
+ "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s",
+ "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda",
+ "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
+ "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"This share is password-protected" : "Berbagi ini dilindungi sandi",
"The password is wrong. Try again." : "Sandi salah. Coba lagi",
"Password" : "Sandi",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
"Name" : "Nama",
- "Share time" : "Bagikan waktu",
+ "Share time" : "Waktu berbagi",
"Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
"Reasons might be:" : "Alasan yang mungkin:",
"the item was removed" : "item telah dihapus",
@@ -30,6 +48,9 @@ OC.L10N.register(
"Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
"Download" : "Unduh",
"Download %s" : "Unduh %s",
- "Direct link" : "Tautan langsung"
+ "Direct link" : "Tautan langsung",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+ "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},
"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index fee58639322..0c53df206a0 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -1,24 +1,42 @@
{ "translations": {
"Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
- "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+ "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
"Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+ "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+ "Storage not valid" : "Penyimpanan tidak sah",
"Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
"Shared with you" : "Dibagikan dengan Anda",
"Shared with others" : "Dibagikan dengan lainnya",
"Shared by link" : "Dibagikan dengan tautan",
+ "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda",
+ "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini",
+ "Nothing shared yet" : "Tidak ada yang dibagikan",
+ "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini",
+ "No shared links" : "Tidak ada tautan berbagi",
+ "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
"Remote share" : "Berbagi remote",
"Remote share password" : "Sandi berbagi remote",
"Cancel" : "Batal",
"Add remote share" : "Tambah berbagi remote",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
"Invalid ownCloud url" : "URL ownCloud tidak sah",
"Share" : "Bagikan",
"Shared by" : "Dibagikan oleh",
+ "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
+ "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s",
+ "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s",
+ "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s",
+ "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda",
+ "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
+ "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"This share is password-protected" : "Berbagi ini dilindungi sandi",
"The password is wrong. Try again." : "Sandi salah. Coba lagi",
"Password" : "Sandi",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
"Name" : "Nama",
- "Share time" : "Bagikan waktu",
+ "Share time" : "Waktu berbagi",
"Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
"Reasons might be:" : "Alasan yang mungkin:",
"the item was removed" : "item telah dihapus",
@@ -28,6 +46,9 @@
"Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
"Download" : "Unduh",
"Download %s" : "Unduh %s",
- "Direct link" : "Tautan langsung"
+ "Direct link" : "Tautan langsung",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+ "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index d68907269a0..e8c87b65d32 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -30,7 +30,7 @@ OC.L10N.register(
"You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s",
"%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s",
"%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s",
- "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te",
+ "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index d8a251ef06a..46f9f24030b 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -28,7 +28,7 @@
"You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s",
"%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s",
"%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s",
- "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te",
+ "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 8be8a7159d4..e82bfd6c612 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -25,6 +25,7 @@ OC.L10N.register(
"Share" : "共有",
"Shared by" : "共有者:",
"A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました",
+ "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーは<strong>ダウンロード済み</strong>です",
"You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
"Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
@@ -34,7 +35,7 @@ OC.L10N.register(
"No entries found in this folder" : "このフォルダーにはエントリーがありません",
"Name" : "名前",
"Share time" : "共有時間",
- "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+ "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
"Reasons might be:" : "理由は以下の通りと考えられます:",
"the item was removed" : "アイテムが削除されました",
"the link expired" : "リンクの期限が切れています",
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 18c4ea01726..375ab797b58 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -23,6 +23,7 @@
"Share" : "共有",
"Shared by" : "共有者:",
"A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました",
+ "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーは<strong>ダウンロード済み</strong>です",
"You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
"Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
@@ -32,7 +33,7 @@
"No entries found in this folder" : "このフォルダーにはエントリーがありません",
"Name" : "名前",
"Share time" : "共有時間",
- "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+ "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
"Reasons might be:" : "理由は以下の通りと考えられます:",
"the item was removed" : "アイテムが削除されました",
"the link expired" : "リンクの期限が切れています",
diff --git a/apps/files_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js
index 001afd0f11d..7861127275b 100644
--- a/apps/files_sharing/l10n/lv.js
+++ b/apps/files_sharing/l10n/lv.js
@@ -1,12 +1,56 @@
OC.L10N.register(
"files_sharing",
{
+ "Server to server sharing is not enabled on this server" : "Šajā serverī koplietošana starp serveriem nav ieslēgta",
+ "The mountpoint name contains invalid characters." : "Montēšanas punkta nosaukums satur nederīgus simbolus.",
+ "Invalid or untrusted SSL certificate" : "Nepareizs vai neuzticams SSL sertifikāts",
+ "Could not authenticate to remote share, password might be wrong" : "Nesanāca autentificēties pie attālinātās koplietotnes, parole varētu būt nepareiza",
+ "Storage not valid" : "Glabātuve nav derīga",
+ "Couldn't add remote share" : "Nevarēja pievienot attālināto koplietotni",
+ "Shared with you" : "Koplietots ar tevi",
+ "Shared with others" : "Koplietots ar citiem",
+ "Shared by link" : "Koplietots ar saiti",
+ "Nothing shared with you yet" : "Nekas vēl nav koplietots",
+ "Files and folders others share with you will show up here" : "Faili un mapes, ko citi koplietos ar tevi, tiks rādīti šeit",
+ "Nothing shared yet" : "Nekas vēl nav koplietots",
+ "Files and folders you share will show up here" : "Faili un mapes, ko koplietosi ar citiem, tiks rādīti šeit",
+ "No shared links" : "Nav koplietotu saišu",
+ "Files and folders you share by link will show up here" : "Faili un mapes, ko koplietosit ar saitēm, tiks rādīti šeit",
+ "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vai vēlaties pievienot attālināto koplietotni {name} no {owner}@{remote}?",
+ "Remote share" : "Attālinātā koplietotne",
+ "Remote share password" : "Attālinātās koplietotnes parole",
"Cancel" : "Atcelt",
+ "Add remote share" : "Pievienot attālināto koplietotni",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}",
+ "Invalid ownCloud url" : "Nederīga ownCloud saite",
"Share" : "Dalīties",
"Shared by" : "Dalījās",
+ "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>",
+ "You received a new remote share from %s" : "Saņēmāt jaunu attālinātu koplietotni no %s",
+ "%1$s accepted remote share %2$s" : "%1$s apstiprināja attālināto koplietotni %2$s",
+ "%1$s declined remote share %2$s" : "%1$s noraidīja attālināto koplietotni %2$s",
+ "%1$s unshared %2$s from you" : "%1$s atslēdza koplietošanu %2$s ar tevi",
+ "Public shared folder %1$s was downloaded" : "Publiski koplietota mape %1$s tika lejupielādēta",
+ "Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts",
+ "This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli",
+ "The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.",
"Password" : "Parole",
"No entries found in this folder" : "Šajā mapē nekas nav atrasts",
"Name" : "Nosaukums",
- "Download" : "Lejupielādēt"
+ "Share time" : "Koplietošanas laiks",
+ "Sorry, this link doesn’t seem to work anymore." : "Izskatās, ka šī saite vairs nedarbojas",
+ "Reasons might be:" : "Iespējamie iemesli:",
+ "the item was removed" : "vienums tika dzēsts",
+ "the link expired" : "saitei beidzies termiņš",
+ "sharing is disabled" : "koplietošana nav ieslēgta",
+ "For more info, please ask the person who sent this link." : "Vairāk informācijas vaicā personai, kas nosūtīja šo saiti.",
+ "Add to your ownCloud" : "Pievienot savam ownCloud",
+ "Download" : "Lejupielādēt",
+ "Download %s" : "Lejupielādēt %s",
+ "Direct link" : "Tiešā saite",
+ "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana",
+ "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem",
+ "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json
index 00b7d17ba5f..d9633ba98d6 100644
--- a/apps/files_sharing/l10n/lv.json
+++ b/apps/files_sharing/l10n/lv.json
@@ -1,10 +1,54 @@
{ "translations": {
+ "Server to server sharing is not enabled on this server" : "Šajā serverī koplietošana starp serveriem nav ieslēgta",
+ "The mountpoint name contains invalid characters." : "Montēšanas punkta nosaukums satur nederīgus simbolus.",
+ "Invalid or untrusted SSL certificate" : "Nepareizs vai neuzticams SSL sertifikāts",
+ "Could not authenticate to remote share, password might be wrong" : "Nesanāca autentificēties pie attālinātās koplietotnes, parole varētu būt nepareiza",
+ "Storage not valid" : "Glabātuve nav derīga",
+ "Couldn't add remote share" : "Nevarēja pievienot attālināto koplietotni",
+ "Shared with you" : "Koplietots ar tevi",
+ "Shared with others" : "Koplietots ar citiem",
+ "Shared by link" : "Koplietots ar saiti",
+ "Nothing shared with you yet" : "Nekas vēl nav koplietots",
+ "Files and folders others share with you will show up here" : "Faili un mapes, ko citi koplietos ar tevi, tiks rādīti šeit",
+ "Nothing shared yet" : "Nekas vēl nav koplietots",
+ "Files and folders you share will show up here" : "Faili un mapes, ko koplietosi ar citiem, tiks rādīti šeit",
+ "No shared links" : "Nav koplietotu saišu",
+ "Files and folders you share by link will show up here" : "Faili un mapes, ko koplietosit ar saitēm, tiks rādīti šeit",
+ "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vai vēlaties pievienot attālināto koplietotni {name} no {owner}@{remote}?",
+ "Remote share" : "Attālinātā koplietotne",
+ "Remote share password" : "Attālinātās koplietotnes parole",
"Cancel" : "Atcelt",
+ "Add remote share" : "Pievienot attālināto koplietotni",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}",
+ "Invalid ownCloud url" : "Nederīga ownCloud saite",
"Share" : "Dalīties",
"Shared by" : "Dalījās",
+ "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>",
+ "You received a new remote share from %s" : "Saņēmāt jaunu attālinātu koplietotni no %s",
+ "%1$s accepted remote share %2$s" : "%1$s apstiprināja attālināto koplietotni %2$s",
+ "%1$s declined remote share %2$s" : "%1$s noraidīja attālināto koplietotni %2$s",
+ "%1$s unshared %2$s from you" : "%1$s atslēdza koplietošanu %2$s ar tevi",
+ "Public shared folder %1$s was downloaded" : "Publiski koplietota mape %1$s tika lejupielādēta",
+ "Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts",
+ "This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli",
+ "The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.",
"Password" : "Parole",
"No entries found in this folder" : "Šajā mapē nekas nav atrasts",
"Name" : "Nosaukums",
- "Download" : "Lejupielādēt"
+ "Share time" : "Koplietošanas laiks",
+ "Sorry, this link doesn’t seem to work anymore." : "Izskatās, ka šī saite vairs nedarbojas",
+ "Reasons might be:" : "Iespējamie iemesli:",
+ "the item was removed" : "vienums tika dzēsts",
+ "the link expired" : "saitei beidzies termiņš",
+ "sharing is disabled" : "koplietošana nav ieslēgta",
+ "For more info, please ask the person who sent this link." : "Vairāk informācijas vaicā personai, kas nosūtīja šo saiti.",
+ "Add to your ownCloud" : "Pievienot savam ownCloud",
+ "Download" : "Lejupielādēt",
+ "Download %s" : "Lejupielādēt %s",
+ "Direct link" : "Tiešā saite",
+ "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana",
+ "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem",
+ "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index a1b5db31252..09090c60cbd 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren",
"The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
"Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Klarte ikke å autentisere mot ekstern deling. Passordet kan være feil",
+ "Storage not valid" : "Lagerplass ikke gyldig",
"Couldn't add remote share" : "Klarte ikke å legge til ekstern deling",
"Shared with you" : "Delt med deg",
"Shared with others" : "Delt med andre",
@@ -47,6 +49,7 @@ OC.L10N.register(
"Download" : "Last ned",
"Download %s" : "Last ned %s",
"Direct link" : "Direkte lenke",
+ "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
"Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere"
},
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 30db000aa00..723af5a6aec 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren",
"The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
"Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Klarte ikke å autentisere mot ekstern deling. Passordet kan være feil",
+ "Storage not valid" : "Lagerplass ikke gyldig",
"Couldn't add remote share" : "Klarte ikke å legge til ekstern deling",
"Shared with you" : "Delt med deg",
"Shared with others" : "Delt med andre",
@@ -45,6 +47,7 @@
"Download" : "Last ned",
"Download %s" : "Last ned %s",
"Direct link" : "Direkte lenke",
+ "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
"Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 1e8a97d9249..614f9b101e0 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+ "Storage not valid" : "Armazenamento inválido",
"Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
@@ -11,15 +13,26 @@ OC.L10N.register(
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
"Nothing shared yet" : "Ainda não foi nada paratilhado",
+ "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
"No shared links" : "Sem hiperligações partilhadas",
+ "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
"Remote share" : "Partilha remota",
"Remote share password" : "Senha da partilha remota",
"Cancel" : "Cancelar",
"Add remote share" : "Adicionar partilha remota",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
"Invalid ownCloud url" : "Url ownCloud inválido",
"Share" : "Compartilhar",
"Shared by" : "Partilhado por",
+ "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>",
+ "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+ "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
+ "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
+ "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
+ "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
+ "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
"This share is password-protected" : "Esta partilha está protegida por senha",
"The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
"Password" : "Senha",
@@ -36,6 +49,7 @@ OC.L10N.register(
"Download" : "Transferir",
"Download %s" : "Transferir %s",
"Direct link" : "Hiperligação direta",
+ "Federated Cloud Sharing" : "Partilha de Cloud Federada",
"Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
},
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 0200118c022..24d0ebafb39 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+ "Storage not valid" : "Armazenamento inválido",
"Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
@@ -9,15 +11,26 @@
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
"Nothing shared yet" : "Ainda não foi nada paratilhado",
+ "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
"No shared links" : "Sem hiperligações partilhadas",
+ "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
"Remote share" : "Partilha remota",
"Remote share password" : "Senha da partilha remota",
"Cancel" : "Cancelar",
"Add remote share" : "Adicionar partilha remota",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
"Invalid ownCloud url" : "Url ownCloud inválido",
"Share" : "Compartilhar",
"Shared by" : "Partilhado por",
+ "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>",
+ "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+ "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
+ "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
+ "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
+ "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
+ "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
"This share is password-protected" : "Esta partilha está protegida por senha",
"The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
"Password" : "Senha",
@@ -34,6 +47,7 @@
"Download" : "Transferir",
"Download %s" : "Transferir %s",
"Direct link" : "Hiperligação direta",
+ "Federated Cloud Sharing" : "Partilha de Cloud Federada",
"Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index 9d07dcd40c5..b34a84bc6e1 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -49,6 +49,7 @@ OC.L10N.register(
"Download" : "Sťahovanie",
"Download %s" : "Stiahnuť %s",
"Direct link" : "Priama linka",
+ "Federated Cloud Sharing" : "Združené cloudové zdieľanie",
"Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
"Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov"
},
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index c1b3f0d46f5..8044b6112ef 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -47,6 +47,7 @@
"Download" : "Sťahovanie",
"Download %s" : "Stiahnuť %s",
"Direct link" : "Priama linka",
+ "Federated Cloud Sharing" : "Združené cloudové zdieľanie",
"Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
"Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_trashbin/l10n/bg_BG.js b/apps/files_trashbin/l10n/bg_BG.js
index eae24b14a1b..9db73c98a6d 100644
--- a/apps/files_trashbin/l10n/bg_BG.js
+++ b/apps/files_trashbin/l10n/bg_BG.js
@@ -8,6 +8,10 @@ OC.L10N.register(
"Delete permanently" : "Изтрий завинаги",
"Error" : "Грешка",
"restored" : "възстановено",
+ "No deleted files" : "Няма изтрити файлове",
+ "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Name" : "Име",
"Deleted" : "Изтрито",
"Delete" : "Изтрий"
diff --git a/apps/files_trashbin/l10n/bg_BG.json b/apps/files_trashbin/l10n/bg_BG.json
index 2e83d97304c..3f3b3e8b835 100644
--- a/apps/files_trashbin/l10n/bg_BG.json
+++ b/apps/files_trashbin/l10n/bg_BG.json
@@ -6,6 +6,10 @@
"Delete permanently" : "Изтрий завинаги",
"Error" : "Грешка",
"restored" : "възстановено",
+ "No deleted files" : "Няма изтрити файлове",
+ "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Name" : "Име",
"Deleted" : "Изтрито",
"Delete" : "Изтрий"
diff --git a/apps/files_trashbin/l10n/eu.js b/apps/files_trashbin/l10n/eu.js
index 9371bddcd88..568fda14450 100644
--- a/apps/files_trashbin/l10n/eu.js
+++ b/apps/files_trashbin/l10n/eu.js
@@ -8,6 +8,10 @@ OC.L10N.register(
"Delete permanently" : "Ezabatu betirako",
"Error" : "Errorea",
"restored" : "Berrezarrita",
+ "No deleted files" : "Ez dago ezabatutako fitxategirik",
+ "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Name" : "Izena",
"Deleted" : "Ezabatuta",
"Delete" : "Ezabatu"
diff --git a/apps/files_trashbin/l10n/eu.json b/apps/files_trashbin/l10n/eu.json
index 46378327f42..890ff07a468 100644
--- a/apps/files_trashbin/l10n/eu.json
+++ b/apps/files_trashbin/l10n/eu.json
@@ -6,6 +6,10 @@
"Delete permanently" : "Ezabatu betirako",
"Error" : "Errorea",
"restored" : "Berrezarrita",
+ "No deleted files" : "Ez dago ezabatutako fitxategirik",
+ "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Name" : "Izena",
"Deleted" : "Ezabatuta",
"Delete" : "Ezabatu"
diff --git a/apps/files_trashbin/l10n/id.js b/apps/files_trashbin/l10n/id.js
index 52183a9cbef..53827980ea9 100644
--- a/apps/files_trashbin/l10n/id.js
+++ b/apps/files_trashbin/l10n/id.js
@@ -7,6 +7,11 @@ OC.L10N.register(
"Restore" : "Pulihkan",
"Delete permanently" : "Hapus secara permanen",
"Error" : "Galat",
+ "restored" : "dipulihkan",
+ "No deleted files" : "Tidak ada berkas yang dihapus",
+ "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Name" : "Nama",
"Deleted" : "Dihapus",
"Delete" : "Hapus"
diff --git a/apps/files_trashbin/l10n/id.json b/apps/files_trashbin/l10n/id.json
index 55384503601..d0d107a9571 100644
--- a/apps/files_trashbin/l10n/id.json
+++ b/apps/files_trashbin/l10n/id.json
@@ -5,6 +5,11 @@
"Restore" : "Pulihkan",
"Delete permanently" : "Hapus secara permanen",
"Error" : "Galat",
+ "restored" : "dipulihkan",
+ "No deleted files" : "Tidak ada berkas yang dihapus",
+ "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Name" : "Nama",
"Deleted" : "Dihapus",
"Delete" : "Hapus"
diff --git a/apps/files_trashbin/l10n/lv.js b/apps/files_trashbin/l10n/lv.js
index 21ac79785a6..813ddd314e1 100644
--- a/apps/files_trashbin/l10n/lv.js
+++ b/apps/files_trashbin/l10n/lv.js
@@ -8,6 +8,8 @@ OC.L10N.register(
"Delete permanently" : "Dzēst pavisam",
"Error" : "Kļūda",
"restored" : "atjaunots",
+ "No deleted files" : "Nav dzēstu failu",
+ "You will be able to recover deleted files from here" : "No šejienes būs iespējams atgūt dzēstos failus",
"No entries found in this folder" : "Šajā mapē nekas nav atrasts",
"Select all" : "Atzīmēt visu",
"Name" : "Nosaukums",
diff --git a/apps/files_trashbin/l10n/lv.json b/apps/files_trashbin/l10n/lv.json
index 683a929948b..9c0ad01ce9a 100644
--- a/apps/files_trashbin/l10n/lv.json
+++ b/apps/files_trashbin/l10n/lv.json
@@ -6,6 +6,8 @@
"Delete permanently" : "Dzēst pavisam",
"Error" : "Kļūda",
"restored" : "atjaunots",
+ "No deleted files" : "Nav dzēstu failu",
+ "You will be able to recover deleted files from here" : "No šejienes būs iespējams atgūt dzēstos failus",
"No entries found in this folder" : "Šajā mapē nekas nav atrasts",
"Select all" : "Atzīmēt visu",
"Name" : "Nosaukums",
diff --git a/apps/files_trashbin/l10n/pt_PT.js b/apps/files_trashbin/l10n/pt_PT.js
index 291d5085233..8124af21751 100644
--- a/apps/files_trashbin/l10n/pt_PT.js
+++ b/apps/files_trashbin/l10n/pt_PT.js
@@ -9,6 +9,7 @@ OC.L10N.register(
"Error" : "Erro",
"restored" : "Restaurado",
"No deleted files" : "Sem ficheiros eliminados",
+ "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Name" : "Nome",
diff --git a/apps/files_trashbin/l10n/pt_PT.json b/apps/files_trashbin/l10n/pt_PT.json
index 8fd729edc90..f1fb924af59 100644
--- a/apps/files_trashbin/l10n/pt_PT.json
+++ b/apps/files_trashbin/l10n/pt_PT.json
@@ -7,6 +7,7 @@
"Error" : "Erro",
"restored" : "Restaurado",
"No deleted files" : "Sem ficheiros eliminados",
+ "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Name" : "Nome",
diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js
index ee0199f5b11..81390bc50a9 100644
--- a/apps/files_versions/l10n/ar.js
+++ b/apps/files_versions/l10n/ar.js
@@ -1,7 +1,11 @@
OC.L10N.register(
"files_versions",
{
+ "Could not revert: %s" : "غير قادر على الاستعادة : %s",
"Versions" : "الإصدارات",
- "Restore" : "استعيد"
+ "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
+ "More versions..." : "المزيد من الإصدارات",
+ "No other versions available" : "لا توجد إصدارات أخرى متاحة",
+ "Restore" : "استعادة "
},
"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_versions/l10n/ar.json b/apps/files_versions/l10n/ar.json
index e84fbfc56c2..683df8a7c0e 100644
--- a/apps/files_versions/l10n/ar.json
+++ b/apps/files_versions/l10n/ar.json
@@ -1,5 +1,9 @@
{ "translations": {
+ "Could not revert: %s" : "غير قادر على الاستعادة : %s",
"Versions" : "الإصدارات",
- "Restore" : "استعيد"
+ "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
+ "More versions..." : "المزيد من الإصدارات",
+ "No other versions available" : "لا توجد إصدارات أخرى متاحة",
+ "Restore" : "استعادة "
},"pluralForm" :"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;"
} \ No newline at end of file
diff --git a/apps/files_versions/l10n/lv.js b/apps/files_versions/l10n/lv.js
index 5a8cbcf0ece..5ac3fa1ad87 100644
--- a/apps/files_versions/l10n/lv.js
+++ b/apps/files_versions/l10n/lv.js
@@ -3,6 +3,9 @@ OC.L10N.register(
{
"Could not revert: %s" : "Nevarēja atgriezt — %s",
"Versions" : "Versijas",
+ "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
+ "More versions..." : "Vairāk versiju...",
+ "No other versions available" : "Citas versijas nav pieejamas",
"Restore" : "Atjaunot"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_versions/l10n/lv.json b/apps/files_versions/l10n/lv.json
index 6781de4d471..f0912544887 100644
--- a/apps/files_versions/l10n/lv.json
+++ b/apps/files_versions/l10n/lv.json
@@ -1,6 +1,9 @@
{ "translations": {
"Could not revert: %s" : "Nevarēja atgriezt — %s",
"Versions" : "Versijas",
+ "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
+ "More versions..." : "Vairāk versiju...",
+ "No other versions available" : "Citas versijas nav pieejamas",
"Restore" : "Atjaunot"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 48bfb56311c..7c4ef3a9a29 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -85,7 +85,7 @@ switch($action) {
exit;
}
} catch (\Exception $e) {
- \OCP\JSON::error(array('message' => $e->getMessage()));
+ \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
exit;
}
\OCP\JSON::error();
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index a1a934f0140..88462902421 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -18,4 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
<admin>admin-ldap</admin>
</documentation>
<ocsid>166061</ocsid>
+ <dependencies>
+ <lib>ldap</lib>
+ </dependencies>
</info>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
deleted file mode 100644
index b4121b19852..00000000000
--- a/apps/user_ldap/appinfo/update.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-$configInstance = \OC::$server->getConfig();
-
-//detect if we can switch on naming guidelines. We won't do it on conflicts.
-//it's a bit spaghetti, but hey.
-$state = $configInstance->getSystemValue('ldapIgnoreNamingRules', 'unset');
-if($state === 'unset') {
- $configInstance->setSystemValue('ldapIgnoreNamingRules', false);
-}
-
-$installedVersion = $configInstance->getAppValue('user_ldap', 'installed_version');
-$enableRawMode = version_compare($installedVersion, '0.4.1', '<');
-
-$helper = new \OCA\user_ldap\lib\Helper();
-$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-$ldap = new OCA\user_ldap\lib\LDAP();
-foreach($configPrefixes as $config) {
- $connection = new OCA\user_ldap\lib\Connection($ldap, $config);
-
- $state = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing');
- if($state === 'non existing') {
- $value = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_uuid_attribute', '');
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_uuid_user_attribute', $value);
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_uuid_group_attribute', $value);
- }
-
- $state = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing');
- if($state === 'non existing') {
- $value = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_attr', '');
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_user_attr', $value);
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_group_attr', $value);
- }
-
- if($enableRawMode) {
- $configInstance->setAppValue('user_ldap', $config.'ldap_user_filter_mode', 1);
- $configInstance->setAppValue('user_ldap', $config.'ldap_login_filter_mode', 1);
- $configInstance->setAppValue('user_ldap', $config.'ldap_group_filter_mode', 1);
- }
-}
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 0bfccb08040..8f0916f768f 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.5
+0.5.0
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index b1abb0994ba..768d62a18d1 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -351,7 +351,7 @@ var LdapWizard = {
encodeURIComponent($('#ldap_serverconfig_chooser').val());
LdapWizard.showSpinner(spinnerID);
- var request = LdapWizard.ajax(param,
+ LdapWizard.ajax(param,
function(result) {
LdapWizard.applyChanges(result);
LdapWizard.hideSpinner(spinnerID);
@@ -360,7 +360,7 @@ var LdapWizard = {
}
},
function (result) {
- OC.Notification.show('Counting the entries failed with, ' + result.message);
+ OC.Notification.showTemporary('Counting the entries failed with: ' + result.message);
LdapWizard.hideSpinner(spinnerID);
if(!_.isUndefined(doneCallback)) {
doneCallback(method);
@@ -371,11 +371,17 @@ var LdapWizard = {
},
countGroups: function(doneCallback) {
- LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback);
+ var groupFilter = $('#ldap_group_filter').val();
+ if(!_.isEmpty(groupFilter)) {
+ LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback);
+ }
},
countUsers: function(doneCallback) {
- LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+ var userFilter = $('#ldap_userlist_filter').val();
+ if(!_.isEmpty(userFilter)) {
+ LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+ }
},
/**
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
index 6b5cdf33d48..ddbdc482b86 100644
--- a/apps/user_ldap/l10n/ar.js
+++ b/apps/user_ldap/l10n/ar.js
@@ -40,6 +40,7 @@ OC.L10N.register(
"Port" : "المنفذ",
"Password" : "كلمة المرور",
"Back" : "رجوع",
+ "Continue" : "المتابعة",
"Advanced" : "تعديلات متقدمه",
"Email Field" : "خانة البريد الإلكتروني"
},
diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
index 4bf07f625d5..178e8f0acd8 100644
--- a/apps/user_ldap/l10n/ar.json
+++ b/apps/user_ldap/l10n/ar.json
@@ -38,6 +38,7 @@
"Port" : "المنفذ",
"Password" : "كلمة المرور",
"Back" : "رجوع",
+ "Continue" : "المتابعة",
"Advanced" : "تعديلات متقدمه",
"Email Field" : "خانة البريد الإلكتروني"
},"pluralForm" :"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/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 545fb9c194f..ba6d9c214f3 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -111,12 +111,12 @@ OC.L10N.register(
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent Feld",
"Quota Default" : "Standard Kontingent",
"in bytes" : "in Bytes",
- "Email Field" : "E-Mail Feld",
+ "Email Field" : "E-Mail-Feld",
"User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
"Internal Username" : "Interner Benutzername",
@@ -128,7 +128,7 @@ OC.L10N.register(
"UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
"Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
- "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
- "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+ "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
+ "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index df0f777536a..df4af011afc 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -109,12 +109,12 @@
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent Feld",
"Quota Default" : "Standard Kontingent",
"in bytes" : "in Bytes",
- "Email Field" : "E-Mail Feld",
+ "Email Field" : "E-Mail-Feld",
"User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
"Internal Username" : "Interner Benutzername",
@@ -126,7 +126,7 @@
"UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
"Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
- "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
- "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+ "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
+ "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index c89d7793a4a..a007f589ef6 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -37,7 +37,7 @@ OC.L10N.register(
"Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
"Invalid Host" : "Ungültiger Host",
"Server" : "Server",
- "User Filter" : "Nutzer-Filter",
+ "User Filter" : "Benutzer-Filter",
"Login Filter" : "Anmeldefilter",
"Group Filter" : "Gruppen-Filter",
"Save" : "Speichern",
@@ -51,7 +51,7 @@ OC.L10N.register(
"The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
"Test Filter" : "Test-Filter",
"groups found" : "Gruppen gefunden",
- "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+ "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:",
"LDAP Username:" : "LDAP-Benutzername:",
"LDAP Email Address:" : "LDAP E-Mail-Adresse:",
"Other Attributes:" : "Andere Attribute:",
@@ -111,7 +111,7 @@ OC.L10N.register(
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent-Feld",
"Quota Default" : "Standard-Kontingent",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 7b047cbcd2f..5fdb285a863 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -35,7 +35,7 @@
"Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
"Invalid Host" : "Ungültiger Host",
"Server" : "Server",
- "User Filter" : "Nutzer-Filter",
+ "User Filter" : "Benutzer-Filter",
"Login Filter" : "Anmeldefilter",
"Group Filter" : "Gruppen-Filter",
"Save" : "Speichern",
@@ -49,7 +49,7 @@
"The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
"Test Filter" : "Test-Filter",
"groups found" : "Gruppen gefunden",
- "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+ "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:",
"LDAP Username:" : "LDAP-Benutzername:",
"LDAP Email Address:" : "LDAP E-Mail-Adresse:",
"Other Attributes:" : "Andere Attribute:",
@@ -109,7 +109,7 @@
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent-Feld",
"Quota Default" : "Standard-Kontingent",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 520c47a839e..3da1f9be156 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Baieztatu Ezabatzea",
"_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
"_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
"Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
@@ -47,6 +48,7 @@ OC.L10N.register(
"only from those groups:" : "bakarrik talde hauetakoak:",
"Raw LDAP filter" : "Raw LDAP iragazkia",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:",
+ "Test Filter" : "Frogatu Iragazkia",
"groups found" : "talde aurkituta",
"Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
"LDAP Username:" : "LDAP Erabiltzaile izena:",
@@ -66,12 +68,14 @@ OC.L10N.register(
"For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"One Base DN per line" : "DN Oinarri bat lerroko",
"You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+ "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
"Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
"users found" : "erabiltzaile aurkituta",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
+ "LDAP" : "LDAP",
"Expert" : "Aditua",
"Advanced" : "Aurreratua",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index 67c82070861..1c698593f56 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Baieztatu Ezabatzea",
"_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
"_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
"Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
@@ -45,6 +46,7 @@
"only from those groups:" : "bakarrik talde hauetakoak:",
"Raw LDAP filter" : "Raw LDAP iragazkia",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:",
+ "Test Filter" : "Frogatu Iragazkia",
"groups found" : "talde aurkituta",
"Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
"LDAP Username:" : "LDAP Erabiltzaile izena:",
@@ -64,12 +66,14 @@
"For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"One Base DN per line" : "DN Oinarri bat lerroko",
"You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+ "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
"Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
"users found" : "erabiltzaile aurkituta",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
+ "LDAP" : "LDAP",
"Expert" : "Aditua",
"Advanced" : "Aurreratua",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index 26ca061c71a..3319f9bea58 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -19,7 +19,7 @@ OC.L10N.register(
"Success" : "Berhasil",
"Error" : "Kesalahan",
"Please specify a Base DN" : "Sialakan menetapkan Base DN",
- "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+ "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
"Please specify the port" : "Silakan tetapkan port",
"Configuration OK" : "Konfigurasi Oke",
"Configuration incorrect" : "Konfigurasi salah",
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Konfirmasi Penghapusan",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
"Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
@@ -107,6 +108,7 @@ OC.L10N.register(
"User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Internal Username" : "Nama Pengguna Internal",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).",
"Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
"Override UUID detection" : "Timpa deteksi UUID",
"UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index ad650fc0fb9..c6a7ecd2e95 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -17,7 +17,7 @@
"Success" : "Berhasil",
"Error" : "Kesalahan",
"Please specify a Base DN" : "Sialakan menetapkan Base DN",
- "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+ "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
"Please specify the port" : "Silakan tetapkan port",
"Configuration OK" : "Konfigurasi Oke",
"Configuration incorrect" : "Konfigurasi salah",
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Konfirmasi Penghapusan",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
"Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
@@ -105,6 +106,7 @@
"User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Internal Username" : "Nama Pengguna Internal",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).",
"Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
"Override UUID detection" : "Timpa deteksi UUID",
"UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index b139c5b3fb4..0c28cf14ab6 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -39,23 +39,23 @@ OC.L10N.register(
"Server" : "サーバー",
"User Filter" : "ユーザーフィルター",
"Login Filter" : "ログインフィルター",
- "Group Filter" : "グループフィルタ",
+ "Group Filter" : "グループフィルター",
"Save" : "保存",
"Test Configuration" : "設定をテスト",
"Help" : "ヘルプ",
"Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
"only those object classes:" : "それらのオブジェクトクラスのみ:",
"only from those groups:" : "それらのグループからのみ:",
- "Edit raw filter instead" : "フィルタを編集",
- "Raw LDAP filter" : "LDAP フィルタ",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Edit raw filter instead" : "フィルターを編集",
+ "Raw LDAP filter" : "LDAPフィルター",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
"LDAP Email Address:" : "LDAPメールアドレス:",
"Other Attributes:" : "他の属性:",
- "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
+ "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
"1. Server" : "1. Server",
"%s. Server:" : "%s. サーバー:",
"Add Server Configuration" : "サーバー設定を追加",
@@ -72,7 +72,7 @@ OC.L10N.register(
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
"Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
"Saving" : "保存中",
"Back" : "戻る",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index 25ad7f73bd8..036808e1d6b 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -37,23 +37,23 @@
"Server" : "サーバー",
"User Filter" : "ユーザーフィルター",
"Login Filter" : "ログインフィルター",
- "Group Filter" : "グループフィルタ",
+ "Group Filter" : "グループフィルター",
"Save" : "保存",
"Test Configuration" : "設定をテスト",
"Help" : "ヘルプ",
"Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
"only those object classes:" : "それらのオブジェクトクラスのみ:",
"only from those groups:" : "それらのグループからのみ:",
- "Edit raw filter instead" : "フィルタを編集",
- "Raw LDAP filter" : "LDAP フィルタ",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Edit raw filter instead" : "フィルターを編集",
+ "Raw LDAP filter" : "LDAPフィルター",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
"LDAP Email Address:" : "LDAPメールアドレス:",
"Other Attributes:" : "他の属性:",
- "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
+ "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
"1. Server" : "1. Server",
"%s. Server:" : "%s. サーバー:",
"Add Server Configuration" : "サーバー設定を追加",
@@ -70,7 +70,7 @@
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
"Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
"Saving" : "保存中",
"Back" : "戻る",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 0f4b3d11bed..46b9e1e0cc5 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Confirmar a operação de apagar",
"_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
"_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
"Could not find the desired feature" : "Não se encontrou a função desejada",
"Invalid Host" : "Hospedeiro Inválido",
"Server" : "Servidor",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 9c753884160..ab690b30216 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Confirmar a operação de apagar",
"_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
"_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
"Could not find the desired feature" : "Não se encontrou a função desejada",
"Invalid Host" : "Hospedeiro Inválido",
"Server" : "Servidor",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index 016ef747a2c..1637d3a24ae 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -3,9 +3,9 @@ OC.L10N.register(
{
"Failed to clear the mappings." : "Не удалось очистить соответствия.",
"Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера",
- "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!",
- "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
- "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.",
+ "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!",
+ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
+ "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.",
"No action specified" : "Действие не указано",
"No configuration specified" : "Конфигурация не создана",
"No data specified" : "Нет данных",
@@ -13,16 +13,16 @@ OC.L10N.register(
"Deletion failed" : "Удаление не удалось",
"Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
"Keep settings?" : "Сохранить настройки?",
- "{nthServer}. Server" : "{nthServer}. Сервер",
- "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
- "mappings cleared" : "Соответствия очищены",
+ "{nthServer}. Server" : "Сервер {nthServer}.",
+ "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
+ "mappings cleared" : "соответствия очищены",
"Success" : "Успешно",
"Error" : "Ошибка",
"Please specify a Base DN" : "Необходимо указать Base DN",
"Could not determine Base DN" : "Невозможно определить Base DN",
"Please specify the port" : "Укажите порт",
"Configuration OK" : "Конфигурация в порядке",
- "Configuration incorrect" : "Конфигурация неправильна",
+ "Configuration incorrect" : "Конфигурация некорректна",
"Configuration incomplete" : "Конфигурация не завершена",
"Select groups" : "Выберите группы",
"Select object classes" : "Выберите объектные классы",
@@ -34,45 +34,45 @@ OC.L10N.register(
"_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
"_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
- "Could not find the desired feature" : "Не могу найти требуемой функциональности",
- "Invalid Host" : "Неверный сервер",
+ "Could not find the desired feature" : "Не удается найти требуемую функциональность",
+ "Invalid Host" : "Некорректный адрес сервера",
"Server" : "Сервер",
- "User Filter" : "Пользователи",
- "Login Filter" : "Логин",
+ "User Filter" : "Фильтр пользователей",
+ "Login Filter" : "Фильтр логинов",
"Group Filter" : "Фильтр группы",
"Save" : "Сохранить",
"Test Configuration" : "Проверить конфигурацию",
"Help" : "Помощь",
- "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
- "only those object classes:" : "только эти объектные классы",
- "only from those groups:" : "только из этих групп",
+ "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
+ "only those object classes:" : "только эти объектные классы:",
+ "only from those groups:" : "только из этих групп:",
"Edit raw filter instead" : "Редактировать исходный фильтр",
"Raw LDAP filter" : "Исходный LDAP фильтр",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
"Test Filter" : "Проверить фильтр",
"groups found" : "групп найдено",
- "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+ "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
"LDAP Username:" : "Имя пользователя LDAP",
- "LDAP Email Address:" : "LDAP адрес электронной почты:",
+ "LDAP Email Address:" : "Адрес email LDAP:",
"Other Attributes:" : "Другие атрибуты:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
- "1. Server" : "1. Сервер",
- "%s. Server:" : "%s. Сервер:",
+ "1. Server" : "Сервер 1.",
+ "%s. Server:" : "Сервер %s:",
"Add Server Configuration" : "Добавить конфигурацию сервера",
"Delete Configuration" : "Удалить конфигурацию",
"Host" : "Сервер",
- "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+ "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
"Port" : "Порт",
"User DN" : "DN пользователя",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
"Password" : "Пароль",
"For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
"One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
- "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
- "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+ "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
- "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+ "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
"users found" : "пользователей найдено",
"Saving" : "Сохраняется",
"Back" : "Назад",
@@ -81,7 +81,7 @@ OC.L10N.register(
"Expert" : "Эксперт",
"Advanced" : "Дополнительно",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
- "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
"Connection Settings" : "Настройки подключения",
"Configuration Active" : "Конфигурация активна",
"When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -89,38 +89,38 @@ OC.L10N.register(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
"Backup (Replica) Port" : "Порт резервного сервера",
"Disable Main Server" : "Отключить главный сервер",
- "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+ "Only connect to the replica server." : "Подключаться только к резервному серверу",
"Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
"Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
- "Cache Time-To-Live" : "Кэш времени жизни",
+ "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
"in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
"Directory Settings" : "Настройки каталога",
"User Display Name Field" : "Поле отображаемого имени пользователя",
"The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
- "Base User Tree" : "База пользовательского дерева",
+ "Base User Tree" : "База дерева пользователей",
"One User Base DN per line" : "По одной базовому DN пользователей в строке.",
"User Search Attributes" : "Атрибуты поиска пользоватетелей",
"Optional; one attribute per line" : "Опционально; один атрибут в строке",
"Group Display Name Field" : "Поле отображаемого имени группы",
"The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
- "Base Group Tree" : "База группового дерева",
+ "Base Group Tree" : "База дерева групп",
"One Group Base DN per line" : "По одной базовому DN групп в строке.",
- "Group Search Attributes" : "Атрибуты поиска для группы",
+ "Group Search Attributes" : "Атрибуты поиска групп",
"Group-Member association" : "Ассоциация Группа-Участник",
"Nested Groups" : "Вложенные группы",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
- "Paging chunksize" : "Постраничный chunksize",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+ "Paging chunksize" : "Страничный размер блоков",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
"Special Attributes" : "Специальные атрибуты",
"Quota Field" : "Поле квоты",
"Quota Default" : "Квота по умолчанию",
"in bytes" : "в байтах",
- "Email Field" : "Поле адреса электронной почты",
+ "Email Field" : "Поле адреса email",
"User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
"Internal Username" : "Внутреннее имя пользователя",
- "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
"Internal Username Attribute:" : "Атрибут для внутреннего имени:",
"Override UUID detection" : "Переопределить нахождение UUID",
"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index e20baa90401..5cfde269ec1 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -1,9 +1,9 @@
{ "translations": {
"Failed to clear the mappings." : "Не удалось очистить соответствия.",
"Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера",
- "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!",
- "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
- "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.",
+ "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!",
+ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
+ "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.",
"No action specified" : "Действие не указано",
"No configuration specified" : "Конфигурация не создана",
"No data specified" : "Нет данных",
@@ -11,16 +11,16 @@
"Deletion failed" : "Удаление не удалось",
"Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
"Keep settings?" : "Сохранить настройки?",
- "{nthServer}. Server" : "{nthServer}. Сервер",
- "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
- "mappings cleared" : "Соответствия очищены",
+ "{nthServer}. Server" : "Сервер {nthServer}.",
+ "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
+ "mappings cleared" : "соответствия очищены",
"Success" : "Успешно",
"Error" : "Ошибка",
"Please specify a Base DN" : "Необходимо указать Base DN",
"Could not determine Base DN" : "Невозможно определить Base DN",
"Please specify the port" : "Укажите порт",
"Configuration OK" : "Конфигурация в порядке",
- "Configuration incorrect" : "Конфигурация неправильна",
+ "Configuration incorrect" : "Конфигурация некорректна",
"Configuration incomplete" : "Конфигурация не завершена",
"Select groups" : "Выберите группы",
"Select object classes" : "Выберите объектные классы",
@@ -32,45 +32,45 @@
"_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
"_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
- "Could not find the desired feature" : "Не могу найти требуемой функциональности",
- "Invalid Host" : "Неверный сервер",
+ "Could not find the desired feature" : "Не удается найти требуемую функциональность",
+ "Invalid Host" : "Некорректный адрес сервера",
"Server" : "Сервер",
- "User Filter" : "Пользователи",
- "Login Filter" : "Логин",
+ "User Filter" : "Фильтр пользователей",
+ "Login Filter" : "Фильтр логинов",
"Group Filter" : "Фильтр группы",
"Save" : "Сохранить",
"Test Configuration" : "Проверить конфигурацию",
"Help" : "Помощь",
- "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
- "only those object classes:" : "только эти объектные классы",
- "only from those groups:" : "только из этих групп",
+ "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
+ "only those object classes:" : "только эти объектные классы:",
+ "only from those groups:" : "только из этих групп:",
"Edit raw filter instead" : "Редактировать исходный фильтр",
"Raw LDAP filter" : "Исходный LDAP фильтр",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
"Test Filter" : "Проверить фильтр",
"groups found" : "групп найдено",
- "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+ "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
"LDAP Username:" : "Имя пользователя LDAP",
- "LDAP Email Address:" : "LDAP адрес электронной почты:",
+ "LDAP Email Address:" : "Адрес email LDAP:",
"Other Attributes:" : "Другие атрибуты:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
- "1. Server" : "1. Сервер",
- "%s. Server:" : "%s. Сервер:",
+ "1. Server" : "Сервер 1.",
+ "%s. Server:" : "Сервер %s:",
"Add Server Configuration" : "Добавить конфигурацию сервера",
"Delete Configuration" : "Удалить конфигурацию",
"Host" : "Сервер",
- "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+ "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
"Port" : "Порт",
"User DN" : "DN пользователя",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
"Password" : "Пароль",
"For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
"One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
- "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
- "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+ "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
- "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+ "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
"users found" : "пользователей найдено",
"Saving" : "Сохраняется",
"Back" : "Назад",
@@ -79,7 +79,7 @@
"Expert" : "Эксперт",
"Advanced" : "Дополнительно",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
- "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
"Connection Settings" : "Настройки подключения",
"Configuration Active" : "Конфигурация активна",
"When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -87,38 +87,38 @@
"Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
"Backup (Replica) Port" : "Порт резервного сервера",
"Disable Main Server" : "Отключить главный сервер",
- "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+ "Only connect to the replica server." : "Подключаться только к резервному серверу",
"Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
"Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
- "Cache Time-To-Live" : "Кэш времени жизни",
+ "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
"in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
"Directory Settings" : "Настройки каталога",
"User Display Name Field" : "Поле отображаемого имени пользователя",
"The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
- "Base User Tree" : "База пользовательского дерева",
+ "Base User Tree" : "База дерева пользователей",
"One User Base DN per line" : "По одной базовому DN пользователей в строке.",
"User Search Attributes" : "Атрибуты поиска пользоватетелей",
"Optional; one attribute per line" : "Опционально; один атрибут в строке",
"Group Display Name Field" : "Поле отображаемого имени группы",
"The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
- "Base Group Tree" : "База группового дерева",
+ "Base Group Tree" : "База дерева групп",
"One Group Base DN per line" : "По одной базовому DN групп в строке.",
- "Group Search Attributes" : "Атрибуты поиска для группы",
+ "Group Search Attributes" : "Атрибуты поиска групп",
"Group-Member association" : "Ассоциация Группа-Участник",
"Nested Groups" : "Вложенные группы",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
- "Paging chunksize" : "Постраничный chunksize",
- "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+ "Paging chunksize" : "Страничный размер блоков",
+ "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
"Special Attributes" : "Специальные атрибуты",
"Quota Field" : "Поле квоты",
"Quota Default" : "Квота по умолчанию",
"in bytes" : "в байтах",
- "Email Field" : "Поле адреса электронной почты",
+ "Email Field" : "Поле адреса email",
"User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
"Internal Username" : "Внутреннее имя пользователя",
- "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
"Internal Username Attribute:" : "Атрибут для внутреннего имени:",
"Override UUID detection" : "Переопределить нахождение UUID",
"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index a9d21ffc8e7..e3b2616e2d2 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -592,7 +592,7 @@ class Connection extends LDAPUtility {
if(!$ldapLogin) {
\OCP\Util::writeLog('user_ldap',
'Bind failed: ' . $this->ldap->errno($cr) . ': ' . $this->ldap->error($cr),
- \OCP\Util::ERROR);
+ \OCP\Util::WARN);
$this->ldapConnectionRes = null;
return false;
}