summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/l10n/nb_NO.js2
-rw-r--r--apps/encryption/l10n/nb_NO.json2
-rw-r--r--apps/files/css/detailsView.css3
-rw-r--r--apps/files/l10n/hu_HU.js13
-rw-r--r--apps/files/l10n/hu_HU.json13
-rw-r--r--apps/files/l10n/mk.js20
-rw-r--r--apps/files/l10n/mk.json20
-rw-r--r--apps/files/l10n/nb_NO.js13
-rw-r--r--apps/files/l10n/nb_NO.json13
-rw-r--r--apps/files/l10n/ru.js3
-rw-r--r--apps/files/l10n/ru.json3
-rw-r--r--apps/files/l10n/sq.js4
-rw-r--r--apps/files/l10n/sq.json4
-rw-r--r--apps/files_external/l10n/hu_HU.js43
-rw-r--r--apps/files_external/l10n/hu_HU.json43
-rw-r--r--apps/files_external/l10n/nb_NO.js12
-rw-r--r--apps/files_external/l10n/nb_NO.json12
-rw-r--r--apps/files_sharing/l10n/hu_HU.js1
-rw-r--r--apps/files_sharing/l10n/hu_HU.json1
-rw-r--r--apps/files_sharing/l10n/nb_NO.js1
-rw-r--r--apps/files_sharing/l10n/nb_NO.json1
-rw-r--r--apps/files_sharing/l10n/ru.js1
-rw-r--r--apps/files_sharing/l10n/ru.json1
-rw-r--r--apps/files_sharing/l10n/sq.js6
-rw-r--r--apps/files_sharing/l10n/sq.json6
-rw-r--r--apps/files_trashbin/l10n/mk.js2
-rw-r--r--apps/files_trashbin/l10n/mk.json2
-rw-r--r--apps/provisioning_api/appinfo/routes.php3
-rw-r--r--apps/provisioning_api/lib/apps.php10
-rw-r--r--apps/provisioning_api/tests/appstest.php30
-rw-r--r--apps/user_ldap/l10n/eu.js27
-rw-r--r--apps/user_ldap/l10n/eu.json27
-rw-r--r--apps/user_ldap/l10n/mk.js1
-rw-r--r--apps/user_ldap/l10n/mk.json1
-rw-r--r--apps/user_ldap/l10n/nb_NO.js1
-rw-r--r--apps/user_ldap/l10n/nb_NO.json1
-rw-r--r--apps/user_ldap/l10n/ru.js1
-rw-r--r--apps/user_ldap/l10n/ru.json1
-rw-r--r--apps/user_ldap/l10n/sq.js12
-rw-r--r--apps/user_ldap/l10n/sq.json12
-rw-r--r--apps/user_ldap/lib/user/user.php2
-rw-r--r--apps/user_ldap/user_ldap.php1
42 files changed, 330 insertions, 45 deletions
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index d5ce6618689..f8f29883d5e 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -32,6 +32,8 @@ OC.L10N.register(
"The share will expire on %s." : "Delingen vil opphøre %s.",
"Cheers!" : "Ha det!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
+ "Encrypt the home storage" : "Krypter hjemmelageret",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivering av dette valget krypterer alle filer som er lagret på hovedlageret. Ellers vil kun filer på eksterne lagre bli kryptert.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index 8b3e8c11747..26b2daab43a 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -30,6 +30,8 @@
"The share will expire on %s." : "Delingen vil opphøre %s.",
"Cheers!" : "Ha det!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
+ "Encrypt the home storage" : "Krypter hjemmelageret",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivering av dette valget krypterer alle filer som er lagret på hovedlageret. Ellers vil kun filer på eksterne lagre bli kryptert.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 485c20e6865..c65107937da 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -83,6 +83,9 @@
}
#app-sidebar .file-details {
+ color: #999;
+}
+#app-sidebar .file-details img {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
opacity: .5;
}
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index b6ed823de68..321a02235b2 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -34,12 +34,25 @@ OC.L10N.register(
"Download" : "Letöltés",
"Rename" : "Átnevezés",
"Delete" : "Törlés",
+ "Disconnect storage" : "Tároló leválasztása",
+ "Unshare" : "A megosztás visszavonása",
"Details" : "Részletek",
"Select" : "Kiválaszt",
"Pending" : "Folyamatban",
"Unable to determine date" : "Nem lehet meghatározni a dátumot",
"This operation is forbidden" : "Tiltott művelet",
"This directory is unavailable, please check the logs or contact the administrator" : "Ez a könyvtár nem elérhető, kérem nézze meg a naplófájlokat vagy keresse az adminisztrátort",
+ "Could not move \"{file}\", target exists" : "{file} fájl nem áthelyezhető, mert a cél már létezik",
+ "Could not move \"{file}\"" : "{file} fájl nem áthelyezhető",
+ "{newName} already exists" : "{newName} már létezik",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Nem átnevezhető erre: {fileName}, mert már nem létezik",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "{targetName} már használatban van a(z) {dir} könyvtárban. Kérjük, válassz másik nevet.",
+ "Could not rename \"{fileName}\"" : "{fileName} fájl nem átnevezhető",
+ "Could not create file \"{file}\"" : "{file} fájl nem létrehozható",
+ "Could not create file \"{file}\" because it already exists" : "{file} fájl nem létrehozható, mert már létezik",
+ "Could not create folder \"{dir}\"" : "{dir} könyvtár nem létrehozható",
+ "Could not create folder \"{dir}\" because it already exists" : "{dir} könyvtár nem létrehozható, mert már létezik",
+ "Error deleting file \"{fileName}\"." : "Hiba történt {fileName} fájl törlése közben.",
"No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
"Name" : "Név",
"Size" : "Méret",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index 8b8fbbd9b57..d54eb151ae1 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -32,12 +32,25 @@
"Download" : "Letöltés",
"Rename" : "Átnevezés",
"Delete" : "Törlés",
+ "Disconnect storage" : "Tároló leválasztása",
+ "Unshare" : "A megosztás visszavonása",
"Details" : "Részletek",
"Select" : "Kiválaszt",
"Pending" : "Folyamatban",
"Unable to determine date" : "Nem lehet meghatározni a dátumot",
"This operation is forbidden" : "Tiltott művelet",
"This directory is unavailable, please check the logs or contact the administrator" : "Ez a könyvtár nem elérhető, kérem nézze meg a naplófájlokat vagy keresse az adminisztrátort",
+ "Could not move \"{file}\", target exists" : "{file} fájl nem áthelyezhető, mert a cél már létezik",
+ "Could not move \"{file}\"" : "{file} fájl nem áthelyezhető",
+ "{newName} already exists" : "{newName} már létezik",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Nem átnevezhető erre: {fileName}, mert már nem létezik",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "{targetName} már használatban van a(z) {dir} könyvtárban. Kérjük, válassz másik nevet.",
+ "Could not rename \"{fileName}\"" : "{fileName} fájl nem átnevezhető",
+ "Could not create file \"{file}\"" : "{file} fájl nem létrehozható",
+ "Could not create file \"{file}\" because it already exists" : "{file} fájl nem létrehozható, mert már létezik",
+ "Could not create folder \"{dir}\"" : "{dir} könyvtár nem létrehozható",
+ "Could not create folder \"{dir}\" because it already exists" : "{dir} könyvtár nem létrehozható, mert már létezik",
+ "Error deleting file \"{fileName}\"." : "Hiba történt {fileName} fájl törlése közben.",
"No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
"Name" : "Név",
"Size" : "Méret",
diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js
index 7a387afee66..726938c57cd 100644
--- a/apps/files/l10n/mk.js
+++ b/apps/files/l10n/mk.js
@@ -1,6 +1,8 @@
OC.L10N.register(
"files",
{
+ "Storage not available" : "Сториџот не е достапен",
+ "Storage invalid" : "Сториџот не е валиден",
"Unknown error" : "Непозната грешка",
"Unable to set upload directory." : "Не може да се постави папката за префрлање на податоци.",
"Invalid Token" : "Грешен токен",
@@ -16,6 +18,7 @@ OC.L10N.register(
"Upload failed. Could not find uploaded file" : "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
"Invalid directory." : "Погрешна папка.",
"Files" : "Датотеки",
+ "All files" : "Сите датотеки",
"Favorites" : "Омилени",
"Home" : "Дома",
"Close" : "Затвори",
@@ -26,9 +29,11 @@ OC.L10N.register(
"Download" : "Преземи",
"Rename" : "Преименувај",
"Delete" : "Избриши",
+ "Unshare" : "Не споделувај",
"Details" : "Детали:",
"Select" : "Избери",
"Pending" : "Чека",
+ "This operation is forbidden" : "Операцијата не е дозволена",
"Name" : "Име",
"Size" : "Големина",
"Modified" : "Променето",
@@ -37,27 +42,40 @@ OC.L10N.register(
"File name cannot be empty." : "Името на датотеката не може да биде празно.",
"Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
"Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+ "Path" : "Патека",
+ "Favorited" : "Омилени",
+ "Favorite" : "Омилен",
"Folder" : "Папка",
"New folder" : "Нова папка",
+ "{newname} already exists" : "{newname} веќе постои",
"Upload" : "Подигни",
+ "An error occurred while trying to update the tags" : "Се случи грешка додека се обидувавте да ги освежите таговите",
"You created %1$s" : "Вие креиравте %1$s",
"%2$s created %1$s" : "%2$s креирано %1$s",
"You changed %1$s" : "Вие изменивте %1$s",
"%2$s changed %1$s" : "%2$s променето %1$s",
"You deleted %1$s" : "Вие избришавте %1$s",
"%2$s deleted %1$s" : "%2$s избришани %1$s",
+ "Changed by %2$s" : "Променето од %2$s",
+ "Deleted by %2$s" : "Избришано од %2$s",
+ "Restored by %2$s" : "Повратено од %2$s",
"Upload (max. %s)" : "Префрлање (макс. %s)",
"File handling" : "Ракување со датотеки",
"Maximum upload size" : "Максимална големина за подигање",
"max. possible: " : "макс. можно:",
"Save" : "Сними",
+ "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука",
"Settings" : "Подесувања",
"WebDAV" : "WebDAV",
"Cancel upload" : "Откажи прикачување",
+ "No files in here" : "Тука нема датотеки",
"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." : "Се скенираат датотеки, ве молам почекајте.",
- "Text file" : "Текстуална датотека"
+ "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука",
+ "Text file" : "Текстуална датотека",
+ "New text file.txt" : "Нова текстуална датотека file.txt"
},
"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json
index acf8f546d73..2c5b3a4d23d 100644
--- a/apps/files/l10n/mk.json
+++ b/apps/files/l10n/mk.json
@@ -1,4 +1,6 @@
{ "translations": {
+ "Storage not available" : "Сториџот не е достапен",
+ "Storage invalid" : "Сториџот не е валиден",
"Unknown error" : "Непозната грешка",
"Unable to set upload directory." : "Не може да се постави папката за префрлање на податоци.",
"Invalid Token" : "Грешен токен",
@@ -14,6 +16,7 @@
"Upload failed. Could not find uploaded file" : "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
"Invalid directory." : "Погрешна папка.",
"Files" : "Датотеки",
+ "All files" : "Сите датотеки",
"Favorites" : "Омилени",
"Home" : "Дома",
"Close" : "Затвори",
@@ -24,9 +27,11 @@
"Download" : "Преземи",
"Rename" : "Преименувај",
"Delete" : "Избриши",
+ "Unshare" : "Не споделувај",
"Details" : "Детали:",
"Select" : "Избери",
"Pending" : "Чека",
+ "This operation is forbidden" : "Операцијата не е дозволена",
"Name" : "Име",
"Size" : "Големина",
"Modified" : "Променето",
@@ -35,27 +40,40 @@
"File name cannot be empty." : "Името на датотеката не може да биде празно.",
"Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
"Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+ "Path" : "Патека",
+ "Favorited" : "Омилени",
+ "Favorite" : "Омилен",
"Folder" : "Папка",
"New folder" : "Нова папка",
+ "{newname} already exists" : "{newname} веќе постои",
"Upload" : "Подигни",
+ "An error occurred while trying to update the tags" : "Се случи грешка додека се обидувавте да ги освежите таговите",
"You created %1$s" : "Вие креиравте %1$s",
"%2$s created %1$s" : "%2$s креирано %1$s",
"You changed %1$s" : "Вие изменивте %1$s",
"%2$s changed %1$s" : "%2$s променето %1$s",
"You deleted %1$s" : "Вие избришавте %1$s",
"%2$s deleted %1$s" : "%2$s избришани %1$s",
+ "Changed by %2$s" : "Променето од %2$s",
+ "Deleted by %2$s" : "Избришано од %2$s",
+ "Restored by %2$s" : "Повратено од %2$s",
"Upload (max. %s)" : "Префрлање (макс. %s)",
"File handling" : "Ракување со датотеки",
"Maximum upload size" : "Максимална големина за подигање",
"max. possible: " : "макс. можно:",
"Save" : "Сними",
+ "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука",
"Settings" : "Подесувања",
"WebDAV" : "WebDAV",
"Cancel upload" : "Откажи прикачување",
+ "No files in here" : "Тука нема датотеки",
"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." : "Се скенираат датотеки, ве молам почекајте.",
- "Text file" : "Текстуална датотека"
+ "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука",
+ "Text file" : "Текстуална датотека",
+ "New text file.txt" : "Нова текстуална датотека file.txt"
},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
} \ No newline at end of file
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 7f933c2e6a0..6152d599866 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -42,6 +42,17 @@ OC.L10N.register(
"Unable to determine date" : "Kan ikke fastslå datoen",
"This operation is forbidden" : "Operasjonen er forbudt",
"This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator",
+ "Could not move \"{file}\", target exists" : "Klarte ikke å flytte \"{file}\", målfilen finnes",
+ "Could not move \"{file}\"" : "Klarte ikke å flytte \"{file}\"",
+ "{newName} already exists" : "{newName} finnes allerede",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Klarte ikke å omdøpe \"{fileName}\", den finnes ikke lenger",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Navnet \"{targetName}\" brukes allerede i mappen \"{dir}\". Velg et annet navn.",
+ "Could not rename \"{fileName}\"" : "Klarte ikke å omdøpe \"{fileName}\"",
+ "Could not create file \"{file}\"" : "Klarte ikke å opprette fil \"{file}\"",
+ "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede",
+ "Could not create folder \"{dir}\"" : "Klarete ikke å opprette mappe \"{dir}\"",
+ "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede",
+ "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".",
"No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
"Name" : "Navn",
"Size" : "Størrelse",
@@ -90,6 +101,8 @@ OC.L10N.register(
"Maximum upload size" : "Største opplastingsstørrelse",
"max. possible: " : "max. mulige:",
"Save" : "Lagre",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det ta 5 minutter før endringene trer i kraft.",
+ "Missing permissions to edit from here." : "Manglende rettigheter til å redigere herfra.",
"Settings" : "Innstillinger",
"WebDAV" : "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index ca895007f62..9279b560f8e 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -40,6 +40,17 @@
"Unable to determine date" : "Kan ikke fastslå datoen",
"This operation is forbidden" : "Operasjonen er forbudt",
"This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator",
+ "Could not move \"{file}\", target exists" : "Klarte ikke å flytte \"{file}\", målfilen finnes",
+ "Could not move \"{file}\"" : "Klarte ikke å flytte \"{file}\"",
+ "{newName} already exists" : "{newName} finnes allerede",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Klarte ikke å omdøpe \"{fileName}\", den finnes ikke lenger",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Navnet \"{targetName}\" brukes allerede i mappen \"{dir}\". Velg et annet navn.",
+ "Could not rename \"{fileName}\"" : "Klarte ikke å omdøpe \"{fileName}\"",
+ "Could not create file \"{file}\"" : "Klarte ikke å opprette fil \"{file}\"",
+ "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede",
+ "Could not create folder \"{dir}\"" : "Klarete ikke å opprette mappe \"{dir}\"",
+ "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede",
+ "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".",
"No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
"Name" : "Navn",
"Size" : "Størrelse",
@@ -88,6 +99,8 @@
"Maximum upload size" : "Største opplastingsstørrelse",
"max. possible: " : "max. mulige:",
"Save" : "Lagre",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det ta 5 minutter før endringene trer i kraft.",
+ "Missing permissions to edit from here." : "Manglende rettigheter til å redigere herfra.",
"Settings" : "Innstillinger",
"WebDAV" : "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index a6fb70944ec..f262957fe55 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -45,6 +45,8 @@ OC.L10N.register(
"Could not move \"{file}\", target exists" : "Невозможно переместить \"{file}\", цель отсутствует",
"Could not move \"{file}\"" : "Невозможно переместить \"{file}\"",
"{newName} already exists" : "{newName} уже имеется",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Невозможно переименовать \"{fileName}\", файл больше не существует",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Имя \"{targetName}\" уже используется в каталоге \"{dir}\". Пожалуйста, выберите другое имя.",
"Could not rename \"{fileName}\"" : "Невозможно переименовать \"{fileName}\"",
"Could not create file \"{file}\"" : "Невозможно создать файл \"{file}\"",
"Could not create file \"{file}\" because it already exists" : "Невозможно создать файл \"{file}\" потому что уже имеется",
@@ -99,6 +101,7 @@ OC.L10N.register(
"Maximum upload size" : "Максимальный размер загружаемого файла",
"max. possible: " : "макс. возможно: ",
"Save" : "Сохранить",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.",
"Missing permissions to edit from here." : "Отсутствуют права на удаление.",
"Settings" : "Настройки",
"WebDAV" : "WebDAV",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 964a819535b..5c99a793ecd 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -43,6 +43,8 @@
"Could not move \"{file}\", target exists" : "Невозможно переместить \"{file}\", цель отсутствует",
"Could not move \"{file}\"" : "Невозможно переместить \"{file}\"",
"{newName} already exists" : "{newName} уже имеется",
+ "Could not rename \"{fileName}\", it does not exist any more" : "Невозможно переименовать \"{fileName}\", файл больше не существует",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Имя \"{targetName}\" уже используется в каталоге \"{dir}\". Пожалуйста, выберите другое имя.",
"Could not rename \"{fileName}\"" : "Невозможно переименовать \"{fileName}\"",
"Could not create file \"{file}\"" : "Невозможно создать файл \"{file}\"",
"Could not create file \"{file}\" because it already exists" : "Невозможно создать файл \"{file}\" потому что уже имеется",
@@ -97,6 +99,7 @@
"Maximum upload size" : "Максимальный размер загружаемого файла",
"max. possible: " : "макс. возможно: ",
"Save" : "Сохранить",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.",
"Missing permissions to edit from here." : "Отсутствуют права на удаление.",
"Settings" : "Настройки",
"WebDAV" : "WebDAV",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index 5a95ea92e3d..023c06eb24b 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -34,7 +34,7 @@ OC.L10N.register(
"Download" : "Shkarkoje",
"Rename" : "Riemërtojeni",
"Delete" : "Fshije",
- "Disconnect storage" : "Shkëput hapësirën e memorizimit",
+ "Disconnect storage" : "Shkëpute depozitën",
"Unshare" : "Hiqe ndarjen",
"Details" : "Hollësi",
"Select" : "Përzgjidhe",
@@ -102,7 +102,7 @@ OC.L10N.register(
"max. possible: " : "maks. i mundshëm: ",
"Save" : "Ruaje",
"With PHP-FPM it might take 5 minutes for changes to be applied." : "Me PHP-FPM mund të duhen 5 minuta që ndryshimet të hyjnë në fuqi.",
- "Missing permissions to edit from here." : "Mungojnë lejet për të përpunuar që këtu.",
+ "Missing permissions to edit from here." : "Mungojnë lejet për përpunim që nga këtu.",
"Settings" : "Rregullime",
"WebDAV" : "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index e70fffe8e5b..8b15b6202c0 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -32,7 +32,7 @@
"Download" : "Shkarkoje",
"Rename" : "Riemërtojeni",
"Delete" : "Fshije",
- "Disconnect storage" : "Shkëput hapësirën e memorizimit",
+ "Disconnect storage" : "Shkëpute depozitën",
"Unshare" : "Hiqe ndarjen",
"Details" : "Hollësi",
"Select" : "Përzgjidhe",
@@ -100,7 +100,7 @@
"max. possible: " : "maks. i mundshëm: ",
"Save" : "Ruaje",
"With PHP-FPM it might take 5 minutes for changes to be applied." : "Me PHP-FPM mund të duhen 5 minuta që ndryshimet të hyjnë në fuqi.",
- "Missing permissions to edit from here." : "Mungojnë lejet për të përpunuar që këtu.",
+ "Missing permissions to edit from here." : "Mungojnë lejet për përpunim që nga këtu.",
"Settings" : "Rregullime",
"WebDAV" : "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>",
diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js
index 964c28285fd..a50ca431c02 100644
--- a/apps/files_external/l10n/hu_HU.js
+++ b/apps/files_external/l10n/hu_HU.js
@@ -2,19 +2,40 @@ OC.L10N.register(
"files_external",
{
"External storage" : "Külső tárolók",
+ "%s" : "%s",
"Personal" : "Személyes",
"System" : "Rendszer",
"Grant access" : "Megadom a hozzáférést",
"Access granted" : "Érvényes hozzáférés",
+ "Generate keys" : "Kulcsok generálása",
+ "Error generating key pair" : "Hiba történt a kulcspár generálása közben",
"Enable encryption" : "Titkosítás engedélyezése",
+ "Enable previews" : "Előnézet engedélyezése",
+ "Check for changes" : "Változások keresése",
+ "Never" : "Soha",
+ "Once every direct access" : "Minden közvetlen elérésnél",
+ "Every time the filesystem is used" : "Mindig, amikor a fájlrendszer használatban van",
+ "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.",
"(group)" : "(csoport)",
+ "Admin defined" : "Adminisztrátor definiálva",
"Saved" : "Elmentve",
+ "Empty response from the server" : "Üres válasz a szervertől",
+ "Couldn't access. Please logout and login to activate this mount point" : "Nem férhető hozzá. Kérjük próbálj meg ki- és bejelentkezni a csatolási pont aktiválásához.",
+ "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}",
+ "There was an error with message: " : "Hiba történt ezzel az üzenettel:",
+ "External mount error" : "Külső csatolási hiba",
+ "Access key" : "Hozzáférési kulcs",
+ "Secret key" : "Titkos kulcs",
"None" : "Egyik sem",
"App key" : "App kulcs",
"App secret" : "App titkos kulcs",
+ "Client secret" : "Kliens titkos",
"Username" : "Felhasználónév",
"Password" : "Jelszó",
"API key" : "API kulcs",
+ "Username and password" : "Felhasználónév és jelszó",
+ "RSA public key" : "RSA publikus kulcs",
+ "Public key" : "Publikus kulcs",
"Amazon S3" : "Amazon S3",
"Bucket" : "Bucket",
"Hostname" : "Hosztnév",
@@ -25,21 +46,41 @@ OC.L10N.register(
"URL" : "URL",
"Remote subfolder" : "Távoli alkönyvtár",
"Secure https://" : "Biztonságos https://",
+ "Dropbox" : "Dropbox",
+ "FTP" : "FTP",
"Host" : "Kiszolgáló",
"Secure ftps://" : "Biztonságos ftps://",
+ "Google Drive" : "Google Drive",
"Local" : "Helyi",
"Location" : "Hely",
"ownCloud" : "ownCloud",
+ "SFTP" : "SFTP",
+ "Root" : "Gyökér",
+ "SFTP with secret key login" : "SFTP titkos kulcs belépéssel",
+ "SMB / CIFS" : "SMB / CIFS",
"Share" : "Megosztás",
+ "Domain" : "Domain",
+ "SMB / CIFS using OC login" : "SMB / CIFS OC belépéssel",
"Username as share" : "Felhasználónév és megosztás",
+ "Service name" : "Szolgáltatás neve",
+ "Request timeout (seconds)" : "Időtúllépés (másodperc)",
"<b>Note:</b> " : "<b>Megjegyzés:</b>",
+ "<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>Megjegyzés:</b> A cURL támogatás, a PHP-ban nincs engedélyezve vagy telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "<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>Megjegyzés:</b> Az FTP támogatás, a PHP-ban nincs engedélyezve vagy telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Megjegyzés:</b> %s nincs telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "No external storage configured" : "Nincs külső tároló beállítva.",
+ "You can add external storages in the personal settings" : "Hozzáadhatsz külső tárolókat a személyes beállítások közt.",
"Name" : "Név",
"Storage type" : "Tároló típusa",
"External Storage" : "Külső tárolási szolgáltatások becsatolása",
"Folder name" : "Mappanév",
+ "Authentication" : "Azonisítás",
"Configuration" : "Beállítások",
"Available for" : "Elérhető számukra",
"Add storage" : "Tároló becsatolása",
- "Delete" : "Törlés"
+ "Advanced settings" : "Haladó beállítások",
+ "Delete" : "Törlés",
+ "Allow users to mount external storage" : "Külső tárolók engedélyezése a felhasználók részére",
+ "Allow users to mount the following external storage" : "A felhasználók számára engedélyezett külső tárolók:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json
index 7942028d038..30acbfc194d 100644
--- a/apps/files_external/l10n/hu_HU.json
+++ b/apps/files_external/l10n/hu_HU.json
@@ -1,18 +1,39 @@
{ "translations": {
"External storage" : "Külső tárolók",
+ "%s" : "%s",
"Personal" : "Személyes",
"System" : "Rendszer",
"Grant access" : "Megadom a hozzáférést",
"Access granted" : "Érvényes hozzáférés",
+ "Generate keys" : "Kulcsok generálása",
+ "Error generating key pair" : "Hiba történt a kulcspár generálása közben",
"Enable encryption" : "Titkosítás engedélyezése",
+ "Enable previews" : "Előnézet engedélyezése",
+ "Check for changes" : "Változások keresése",
+ "Never" : "Soha",
+ "Once every direct access" : "Minden közvetlen elérésnél",
+ "Every time the filesystem is used" : "Mindig, amikor a fájlrendszer használatban van",
+ "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.",
"(group)" : "(csoport)",
+ "Admin defined" : "Adminisztrátor definiálva",
"Saved" : "Elmentve",
+ "Empty response from the server" : "Üres válasz a szervertől",
+ "Couldn't access. Please logout and login to activate this mount point" : "Nem férhető hozzá. Kérjük próbálj meg ki- és bejelentkezni a csatolási pont aktiválásához.",
+ "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}",
+ "There was an error with message: " : "Hiba történt ezzel az üzenettel:",
+ "External mount error" : "Külső csatolási hiba",
+ "Access key" : "Hozzáférési kulcs",
+ "Secret key" : "Titkos kulcs",
"None" : "Egyik sem",
"App key" : "App kulcs",
"App secret" : "App titkos kulcs",
+ "Client secret" : "Kliens titkos",
"Username" : "Felhasználónév",
"Password" : "Jelszó",
"API key" : "API kulcs",
+ "Username and password" : "Felhasználónév és jelszó",
+ "RSA public key" : "RSA publikus kulcs",
+ "Public key" : "Publikus kulcs",
"Amazon S3" : "Amazon S3",
"Bucket" : "Bucket",
"Hostname" : "Hosztnév",
@@ -23,21 +44,41 @@
"URL" : "URL",
"Remote subfolder" : "Távoli alkönyvtár",
"Secure https://" : "Biztonságos https://",
+ "Dropbox" : "Dropbox",
+ "FTP" : "FTP",
"Host" : "Kiszolgáló",
"Secure ftps://" : "Biztonságos ftps://",
+ "Google Drive" : "Google Drive",
"Local" : "Helyi",
"Location" : "Hely",
"ownCloud" : "ownCloud",
+ "SFTP" : "SFTP",
+ "Root" : "Gyökér",
+ "SFTP with secret key login" : "SFTP titkos kulcs belépéssel",
+ "SMB / CIFS" : "SMB / CIFS",
"Share" : "Megosztás",
+ "Domain" : "Domain",
+ "SMB / CIFS using OC login" : "SMB / CIFS OC belépéssel",
"Username as share" : "Felhasználónév és megosztás",
+ "Service name" : "Szolgáltatás neve",
+ "Request timeout (seconds)" : "Időtúllépés (másodperc)",
"<b>Note:</b> " : "<b>Megjegyzés:</b>",
+ "<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>Megjegyzés:</b> A cURL támogatás, a PHP-ban nincs engedélyezve vagy telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "<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>Megjegyzés:</b> Az FTP támogatás, a PHP-ban nincs engedélyezve vagy telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Megjegyzés:</b> %s nincs telepítve. %s csatolása lehetetlen. Kérd meg a rendszergazdádat, hogy telepítse.",
+ "No external storage configured" : "Nincs külső tároló beállítva.",
+ "You can add external storages in the personal settings" : "Hozzáadhatsz külső tárolókat a személyes beállítások közt.",
"Name" : "Név",
"Storage type" : "Tároló típusa",
"External Storage" : "Külső tárolási szolgáltatások becsatolása",
"Folder name" : "Mappanév",
+ "Authentication" : "Azonisítás",
"Configuration" : "Beállítások",
"Available for" : "Elérhető számukra",
"Add storage" : "Tároló becsatolása",
- "Delete" : "Törlés"
+ "Advanced settings" : "Haladó beállítások",
+ "Delete" : "Törlés",
+ "Allow users to mount external storage" : "Külső tárolók engedélyezése a felhasználók részére",
+ "Allow users to mount the following external storage" : "A felhasználók számára engedélyezett külső tárolók:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 0e9e2dd24ce..7df90e24eb7 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -16,6 +16,8 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Ikke tillatt å bruke autentiseringsmekanisme \"%s\"",
"Unsatisfied backend parameters" : "Noen server-parameter mangler",
"Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
+ "Insufficient data: %s" : "Utilstrekkelige data: %s",
+ "%s" : "%s",
"Personal" : "Personlig",
"System" : "System",
"Grant access" : "Gi tilgang",
@@ -32,7 +34,16 @@ OC.L10N.register(
"Every time the filesystem is used" : "Hver gang filsystemet brukes",
"All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
"(group)" : "(gruppe)",
+ "Admin defined" : "Admin-definert",
"Saved" : "Lagret",
+ "Empty response from the server" : "Tomt svar fra serveren",
+ "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.",
+ "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra ownCloud-serveren: {code} {type}",
+ "Couldn't get the list of external mount points: {type}" : "Klarte ikke å hente listen over eksterne oppkoblingspunkter: {type}",
+ "There was an error with message: " : "Det oppstod en feil med melding: ",
+ "External mount error" : "Ekstern oppkoblingsfeil",
+ "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Klarte ikke å hente listen over oppkoblingspunkter for Windows nettverk-disker: tomt svar fra serveren",
+ "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Noen av de konfigurerte eksterne oppkoblingspunktene er ikke tilkoblet. Klikk på de røde raden(e) for mer informasjon.",
"Access key" : "Tilgangsnøkkel",
"Secret key" : "Hemmelig nøkkel",
"Builtin" : "Innebygget",
@@ -101,6 +112,7 @@ OC.L10N.register(
"Add storage" : "Legg til lagringsplass",
"Advanced settings" : "Avanserte innstillinger",
"Delete" : "Slett",
+ "Allow users to mount external storage" : "Tillat at brukere kobler opp eksterne lagre",
"Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index ddf5221e955..f6ca25f83eb 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -14,6 +14,8 @@
"Not permitted to use authentication mechanism \"%s\"" : "Ikke tillatt å bruke autentiseringsmekanisme \"%s\"",
"Unsatisfied backend parameters" : "Noen server-parameter mangler",
"Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
+ "Insufficient data: %s" : "Utilstrekkelige data: %s",
+ "%s" : "%s",
"Personal" : "Personlig",
"System" : "System",
"Grant access" : "Gi tilgang",
@@ -30,7 +32,16 @@
"Every time the filesystem is used" : "Hver gang filsystemet brukes",
"All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
"(group)" : "(gruppe)",
+ "Admin defined" : "Admin-definert",
"Saved" : "Lagret",
+ "Empty response from the server" : "Tomt svar fra serveren",
+ "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.",
+ "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra ownCloud-serveren: {code} {type}",
+ "Couldn't get the list of external mount points: {type}" : "Klarte ikke å hente listen over eksterne oppkoblingspunkter: {type}",
+ "There was an error with message: " : "Det oppstod en feil med melding: ",
+ "External mount error" : "Ekstern oppkoblingsfeil",
+ "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Klarte ikke å hente listen over oppkoblingspunkter for Windows nettverk-disker: tomt svar fra serveren",
+ "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Noen av de konfigurerte eksterne oppkoblingspunktene er ikke tilkoblet. Klikk på de røde raden(e) for mer informasjon.",
"Access key" : "Tilgangsnøkkel",
"Secret key" : "Hemmelig nøkkel",
"Builtin" : "Innebygget",
@@ -99,6 +110,7 @@
"Add storage" : "Legg til lagringsplass",
"Advanced settings" : "Avanserte innstillinger",
"Delete" : "Slett",
+ "Allow users to mount external storage" : "Tillat at brukere kobler opp eksterne lagre",
"Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index c0d2d01b2c4..6471b491fac 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -3,6 +3,7 @@ OC.L10N.register(
{
"Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
"The mountpoint name contains invalid characters." : "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
+ "Not allowed to create a federated share with the same user server" : "Nem lehet létrehozni egy egyesített megosztást azonos felhasználóval és szerverrel",
"Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
"Could not authenticate to remote share, password might be wrong" : "Nem sikerült az azonosítás a távoli megosztáshoz. Lehet, hogy rossz a jelszó.",
"Storage not valid" : "Tároló nem érvényes",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index a2e15c46c52..4c5501803ea 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -1,6 +1,7 @@
{ "translations": {
"Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
"The mountpoint name contains invalid characters." : "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
+ "Not allowed to create a federated share with the same user server" : "Nem lehet létrehozni egy egyesített megosztást azonos felhasználóval és szerverrel",
"Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
"Could not authenticate to remote share, password might be wrong" : "Nem sikerült az azonosítás a távoli megosztáshoz. Lehet, hogy rossz a jelszó.",
"Storage not valid" : "Tároló nem érvényes",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index 4f7fb08ef16..bb6cd2e08c1 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -3,6 +3,7 @@ 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.",
+ "Not allowed to create a federated share with the same user server" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme bruker-serveren",
"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",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index e75f095f354..5a4852691e2 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -1,6 +1,7 @@
{ "translations": {
"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.",
+ "Not allowed to create a federated share with the same user server" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme bruker-serveren",
"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",
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 1a84d10ecea..15b26160f6e 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -3,6 +3,7 @@ OC.L10N.register(
{
"Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
"The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
+ "Not allowed to create a federated share with the same user server" : "Не допускается создание федеративного общего ресурса с тем-же сервером пользователя",
"Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
"Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль",
"Storage not valid" : "Хранилище недоступно",
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index 401896709d6..3b92d4cc4c3 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -1,6 +1,7 @@
{ "translations": {
"Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
"The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
+ "Not allowed to create a federated share with the same user server" : "Не допускается создание федеративного общего ресурса с тем-же сервером пользователя",
"Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
"Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль",
"Storage not valid" : "Хранилище недоступно",
diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js
index e25c170df9c..699578fb0fc 100644
--- a/apps/files_sharing/l10n/sq.js
+++ b/apps/files_sharing/l10n/sq.js
@@ -74,12 +74,12 @@ OC.L10N.register(
"Download" : "Shkarko",
"Download %s" : "Shkarko %s",
"Direct link" : "Lidhje e drejtpërdrejtë",
- "Federated Cloud Sharing" : "Ndarje Në Re e Federuar ",
+ "Federated Cloud Sharing" : "Ndarje e Federuar Në Re",
"Open documentation" : "Hap dokumentimin",
"Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë",
"Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë",
- "Federated Cloud" : "Ndarje e Federuar",
- "Your Federated Cloud ID:" : "ID-ja juaj Federated Cloud:",
+ "Federated Cloud" : "Re e Federuar",
+ "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:",
"Share it:" : "Ndajeni:",
"Add to your website" : "Shtojeni te sajti juaj",
"Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it",
diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json
index d16d1710a55..92c76b4c509 100644
--- a/apps/files_sharing/l10n/sq.json
+++ b/apps/files_sharing/l10n/sq.json
@@ -72,12 +72,12 @@
"Download" : "Shkarko",
"Download %s" : "Shkarko %s",
"Direct link" : "Lidhje e drejtpërdrejtë",
- "Federated Cloud Sharing" : "Ndarje Në Re e Federuar ",
+ "Federated Cloud Sharing" : "Ndarje e Federuar Në Re",
"Open documentation" : "Hap dokumentimin",
"Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë",
"Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë",
- "Federated Cloud" : "Ndarje e Federuar",
- "Your Federated Cloud ID:" : "ID-ja juaj Federated Cloud:",
+ "Federated Cloud" : "Re e Federuar",
+ "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:",
"Share it:" : "Ndajeni:",
"Add to your website" : "Shtojeni te sajti juaj",
"Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it",
diff --git a/apps/files_trashbin/l10n/mk.js b/apps/files_trashbin/l10n/mk.js
index 8a4b16c52d8..4e6e5da77df 100644
--- a/apps/files_trashbin/l10n/mk.js
+++ b/apps/files_trashbin/l10n/mk.js
@@ -8,8 +8,10 @@ OC.L10N.register(
"Delete" : "Избриши",
"Delete permanently" : "Трајно избришани",
"Error" : "Грешка",
+ "This operation is forbidden" : "Операцијата не е дозволена",
"restored" : "повратени",
"No entries found in this folder" : "Нема ништо во оваа папка",
+ "Select all" : "Избери се",
"Name" : "Име",
"Deleted" : "Избришан"
},
diff --git a/apps/files_trashbin/l10n/mk.json b/apps/files_trashbin/l10n/mk.json
index 2ec0b3c9500..1e1a8aff42a 100644
--- a/apps/files_trashbin/l10n/mk.json
+++ b/apps/files_trashbin/l10n/mk.json
@@ -6,8 +6,10 @@
"Delete" : "Избриши",
"Delete permanently" : "Трајно избришани",
"Error" : "Грешка",
+ "This operation is forbidden" : "Операцијата не е дозволена",
"restored" : "повратени",
"No entries found in this folder" : "Нема ништо во оваа папка",
+ "Select all" : "Избери се",
"Name" : "Име",
"Deleted" : "Избришан"
},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 22a923f5c20..1b9328d608a 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -62,7 +62,8 @@ API::register('get', '/cloud/groups/{groupid}/subadmins', [$groups, 'getSubAdmin
// Apps
$apps = new \OCA\Provisioning_API\Apps(
- \OC::$server->getAppManager()
+ \OC::$server->getAppManager(),
+ \OC::$server->getOcsClient()
);
API::register('get', '/cloud/apps', [$apps, 'getApps'], 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/apps/{appid}', [$apps, 'getAppInfo'], 'provisioning_api', API::ADMIN_AUTH);
diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index e0fa63cca34..2a3fd414d39 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -25,19 +25,23 @@
namespace OCA\Provisioning_API;
+use OC\OCSClient;
use \OC_OCS_Result;
use \OC_App;
class Apps {
-
/** @var \OCP\App\IAppManager */
private $appManager;
+ /** @var OCSClient */
+ private $ocsClient;
/**
* @param \OCP\App\IAppManager $appManager
*/
- public function __construct(\OCP\App\IAppManager $appManager) {
+ public function __construct(\OCP\App\IAppManager $appManager,
+ OCSClient $ocsClient) {
$this->appManager = $appManager;
+ $this->ocsClient = $ocsClient;
}
/**
@@ -45,7 +49,7 @@ class Apps {
* @return OC_OCS_Result
*/
public function getApps($parameters) {
- $apps = OC_App::listAllApps();
+ $apps = OC_App::listAllApps(false, true, $this->ocsClient);
$list = [];
foreach($apps as $app) {
$list[] = $app['id'];
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php
index 4ccba704a3a..871158c5545 100644
--- a/apps/provisioning_api/tests/appstest.php
+++ b/apps/provisioning_api/tests/appstest.php
@@ -23,6 +23,7 @@
*/
namespace OCA\Provisioning_API\Tests;
+use OC\OCSClient;
use OCA\Provisioning_API\Apps;
use OCP\API;
use OCP\App\IAppManager;
@@ -36,42 +37,43 @@ use OCP\IUserSession;
* @package OCA\Provisioning_API\Tests
*/
class AppsTest extends TestCase {
-
/** @var IAppManager */
private $appManager;
-
/** @var Apps */
private $api;
-
/** @var IUserSession */
private $userSession;
+ /** @var OCSClient */
+ private $ocsClient;
public function setup() {
parent::setup();
$this->appManager = \OC::$server->getAppManager();
$this->groupManager = \OC::$server->getGroupManager();
$this->userSession = \OC::$server->getUserSession();
- $this->api = new Apps($this->appManager);
+ $this->ocsClient = $this->getMockBuilder('\OC\OCSClient')
+ ->disableOriginalConstructor()->getMock();
+ $this->api = new Apps($this->appManager, $this->ocsClient);
}
public function testGetAppInfo() {
$result = $this->api->getAppInfo(['appid' => 'provisioning_api']);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
-
}
public function testGetAppInfoOnBadAppID() {
-
$result = $this->api->getAppInfo(['appid' => 'not_provisioning_api']);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(API::RESPOND_NOT_FOUND, $result->getStatusCode());
-
}
public function testGetApps() {
-
+ $this->ocsClient
+ ->expects($this->any())
+ ->method($this->anything())
+ ->will($this->returnValue(null));
$user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($user);
$this->userSession->setUser($user);
@@ -80,27 +82,27 @@ class AppsTest extends TestCase {
$this->assertTrue($result->succeeded());
$data = $result->getData();
- $this->assertEquals(count(\OC_App::listAllApps()), count($data['apps']));
-
+ $this->assertEquals(count(\OC_App::listAllApps(false, true, $this->ocsClient)), count($data['apps']));
}
public function testGetAppsEnabled() {
-
$_GET['filter'] = 'enabled';
$result = $this->api->getApps(['filter' => 'enabled']);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals(count(\OC_App::getEnabledApps()), count($data['apps']));
-
}
public function testGetAppsDisabled() {
-
+ $this->ocsClient
+ ->expects($this->any())
+ ->method($this->anything())
+ ->will($this->returnValue(null));
$_GET['filter'] = 'disabled';
$result = $this->api->getApps(['filter' => 'disabled']);
$this->assertTrue($result->succeeded());
$data = $result->getData();
- $apps = \OC_App::listAllApps();
+ $apps = \OC_App::listAllApps(false, true, $this->ocsClient);
$list = array();
foreach($apps as $app) {
$list[] = $app['id'];
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 44ce45a1b96..410b626745c 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -10,15 +10,22 @@ OC.L10N.register(
"No configuration specified" : "Ez da konfiguraziorik zehaztu",
"No data specified" : "Ez da daturik zehaztu",
" Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
+ "Action does not exist" : "Ekintza ez da existitzen",
+ "The Base DN appears to be wrong" : "Oinarrizko DN gaizki dagoela dirudi",
"Configuration incorrect" : "Konfigurazioa ez dago ongi",
"Configuration incomplete" : "Konfigurazioa osatu gabe dago",
"Configuration OK" : "Konfigurazioa ongi dago",
"Select groups" : "Hautatu taldeak",
"Select object classes" : "Hautatu objektu klaseak",
"{nthServer}. Server" : "{nthServer}. Zerbitzaria",
+ "More than 1,000 directory entries available." : "1.000 baino direktorio sarrera gehiago daude.",
+ " entries available within the provided Base DN" : "sarrera eskuragarri emandako Oinarrizko DNarekin",
"Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
"Confirm Deletion" : "Baieztatu Ezabatzea",
"Select attributes" : "Hautatu atributuak",
+ "User found and settings verified." : "Erabiltzailea aurkituta eta ezarpenak egiaztatutak.",
+ "Please provide a login name to test against" : "Mesedez saioa hasteko izen bat eman frogatu ahal izateko",
+ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Taldeen sarrera desgaitu da, LDAP / AD zerbitzariak ez duelako memberOf onartzen.",
"_%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.",
@@ -26,27 +33,47 @@ OC.L10N.register(
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
"Users" : "Erabiltzaileak",
+ "Login Attributes" : "Saioa hasteko atributuak",
"Groups" : "Taldeak",
"Test Configuration" : "Egiaztatu Konfigurazioa",
"Help" : "Laguntza",
"Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
+ "Only these object classes:" : "Bakarrik objektu klase hauetakoak:",
+ "Only from these groups:" : "Bakarrik talde hauetakoak:",
+ "Search groups" : "Bilatu taldeak",
+ "Available groups" : "Eskuragarri dauden taldeak",
+ "Selected groups" : "Hautatuko taldeak",
+ "Edit LDAP Query" : "Editatu LDAP kontsulta",
+ "LDAP Filter:" : "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:",
+ "Verify settings and count groups" : "Egiaztatu ezarpetak eta zenbatu taldeak",
+ "LDAP / AD Username:" : "LDAP / AD Erabiltzaile izena:",
+ "LDAP / AD Email Address:" : "LDAP / AD E-posta Helbidea:",
"Other Attributes:" : "Bestelako atributuak:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
+ "Test Loginname" : "Egiaztatu Saioa hasteko izena",
+ "Verify settings" : "Egiaztatu ezarpenak",
"1. Server" : "1. Zerbitzaria",
"%s. Server:" : "%s. Zerbitzaria:",
+ "Add a new and blank configuration" : "Gehitu konfigurazio berri eta huts bat",
+ "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian",
+ "Delete the current configuration" : "Ezabatu uneko konfigurazioa",
"Host" : "Hostalaria",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
"Port" : "Portua",
+ "Detect Port" : "Antzeman Ataka",
"User DN" : "Erabiltzaile 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." : "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"Password" : "Pasahitza",
"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",
+ "Detect Base DN" : "Anteman Oinarrizko DN",
+ "Test Base DN" : "Egiaztatu Oinarrizko DN",
"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:",
+ "Verify settings and count users" : "Egiaztatu ezarpetak eta zenbatu erabiltzaileak",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index 64539c16e11..f0599392c50 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -8,15 +8,22 @@
"No configuration specified" : "Ez da konfiguraziorik zehaztu",
"No data specified" : "Ez da daturik zehaztu",
" Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
+ "Action does not exist" : "Ekintza ez da existitzen",
+ "The Base DN appears to be wrong" : "Oinarrizko DN gaizki dagoela dirudi",
"Configuration incorrect" : "Konfigurazioa ez dago ongi",
"Configuration incomplete" : "Konfigurazioa osatu gabe dago",
"Configuration OK" : "Konfigurazioa ongi dago",
"Select groups" : "Hautatu taldeak",
"Select object classes" : "Hautatu objektu klaseak",
"{nthServer}. Server" : "{nthServer}. Zerbitzaria",
+ "More than 1,000 directory entries available." : "1.000 baino direktorio sarrera gehiago daude.",
+ " entries available within the provided Base DN" : "sarrera eskuragarri emandako Oinarrizko DNarekin",
"Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
"Confirm Deletion" : "Baieztatu Ezabatzea",
"Select attributes" : "Hautatu atributuak",
+ "User found and settings verified." : "Erabiltzailea aurkituta eta ezarpenak egiaztatutak.",
+ "Please provide a login name to test against" : "Mesedez saioa hasteko izen bat eman frogatu ahal izateko",
+ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Taldeen sarrera desgaitu da, LDAP / AD zerbitzariak ez duelako memberOf onartzen.",
"_%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.",
@@ -24,27 +31,47 @@
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
"Users" : "Erabiltzaileak",
+ "Login Attributes" : "Saioa hasteko atributuak",
"Groups" : "Taldeak",
"Test Configuration" : "Egiaztatu Konfigurazioa",
"Help" : "Laguntza",
"Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
+ "Only these object classes:" : "Bakarrik objektu klase hauetakoak:",
+ "Only from these groups:" : "Bakarrik talde hauetakoak:",
+ "Search groups" : "Bilatu taldeak",
+ "Available groups" : "Eskuragarri dauden taldeak",
+ "Selected groups" : "Hautatuko taldeak",
+ "Edit LDAP Query" : "Editatu LDAP kontsulta",
+ "LDAP Filter:" : "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:",
+ "Verify settings and count groups" : "Egiaztatu ezarpetak eta zenbatu taldeak",
+ "LDAP / AD Username:" : "LDAP / AD Erabiltzaile izena:",
+ "LDAP / AD Email Address:" : "LDAP / AD E-posta Helbidea:",
"Other Attributes:" : "Bestelako atributuak:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
+ "Test Loginname" : "Egiaztatu Saioa hasteko izena",
+ "Verify settings" : "Egiaztatu ezarpenak",
"1. Server" : "1. Zerbitzaria",
"%s. Server:" : "%s. Zerbitzaria:",
+ "Add a new and blank configuration" : "Gehitu konfigurazio berri eta huts bat",
+ "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian",
+ "Delete the current configuration" : "Ezabatu uneko konfigurazioa",
"Host" : "Hostalaria",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
"Port" : "Portua",
+ "Detect Port" : "Antzeman Ataka",
"User DN" : "Erabiltzaile 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." : "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"Password" : "Pasahitza",
"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",
+ "Detect Base DN" : "Anteman Oinarrizko DN",
+ "Test Base DN" : "Egiaztatu Oinarrizko DN",
"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:",
+ "Verify settings and count users" : "Egiaztatu ezarpetak eta zenbatu erabiltzaileak",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/mk.js b/apps/user_ldap/l10n/mk.js
index 560aa4b6b8c..1165678b925 100644
--- a/apps/user_ldap/l10n/mk.js
+++ b/apps/user_ldap/l10n/mk.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"user_ldap",
{
+ "Select groups" : "Одбери групи",
"Confirm Deletion" : "Потврдете го бришењето",
"Users" : "Корисници",
"Groups" : "Групи",
diff --git a/apps/user_ldap/l10n/mk.json b/apps/user_ldap/l10n/mk.json
index 85fab2fb2d1..3bd03720893 100644
--- a/apps/user_ldap/l10n/mk.json
+++ b/apps/user_ldap/l10n/mk.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Select groups" : "Одбери групи",
"Confirm Deletion" : "Потврдете го бришењето",
"Users" : "Корисници",
"Groups" : "Групи",
diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js
index 8770dfa0841..62fadd9365e 100644
--- a/apps/user_ldap/l10n/nb_NO.js
+++ b/apps/user_ldap/l10n/nb_NO.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Klarte ikke å påvise basis-DN. Det må skrives inn manuelt.",
"{nthServer}. Server" : "{nthServer}. server",
"No object found in the given Base DN. Please revise." : "Intet objekt funnet i angitt basis-DN. Revider oppsettet.",
+ "More than 1,000 directory entries available." : "Mer enn 1.000 katalogoppføringer tilgjengelig.",
" entries available within the provided Base DN" : "oppføringer tilgjengelig innenfor angitt basis-DN",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Det oppstod en feil. Sjekk basis-DN, tilkoblingsoppsett og påloggingsdetaljer.",
"Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json
index 9cc0e4964dd..ee049b8a50f 100644
--- a/apps/user_ldap/l10n/nb_NO.json
+++ b/apps/user_ldap/l10n/nb_NO.json
@@ -22,6 +22,7 @@
"Could not detect Base DN, please enter it manually." : "Klarte ikke å påvise basis-DN. Det må skrives inn manuelt.",
"{nthServer}. Server" : "{nthServer}. server",
"No object found in the given Base DN. Please revise." : "Intet objekt funnet i angitt basis-DN. Revider oppsettet.",
+ "More than 1,000 directory entries available." : "Mer enn 1.000 katalogoppføringer tilgjengelig.",
" entries available within the provided Base DN" : "oppføringer tilgjengelig innenfor angitt basis-DN",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Det oppstod en feil. Sjekk basis-DN, tilkoblingsoppsett og påloggingsdetaljer.",
"Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index 40705449edf..08069e28fd9 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Не возможно обнаружить Base DN, пожалуйста задайте в ручную.",
"{nthServer}. Server" : "Сервер {nthServer}.",
"No object found in the given Base DN. Please revise." : "Не найдено объектов в Base DN. Пожалуйста перепроверьте.",
+ "More than 1,000 directory entries available." : "В каталоге доступно более 1,000 записей.",
" entries available within the provided Base DN" : "элементы доступные в Базе",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Произошла ошибка. Пожалуйста проверьте базу поиска DN, а также настройки подключения и учетные данные.",
"Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index 4a6f9ea52d0..126e78593d1 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -22,6 +22,7 @@
"Could not detect Base DN, please enter it manually." : "Не возможно обнаружить Base DN, пожалуйста задайте в ручную.",
"{nthServer}. Server" : "Сервер {nthServer}.",
"No object found in the given Base DN. Please revise." : "Не найдено объектов в Base DN. Пожалуйста перепроверьте.",
+ "More than 1,000 directory entries available." : "В каталоге доступно более 1,000 записей.",
" entries available within the provided Base DN" : "элементы доступные в Базе",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Произошла ошибка. Пожалуйста проверьте базу поиска DN, а также настройки подключения и учетные данные.",
"Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js
index 4f0d1d3697c..aaebf07862d 100644
--- a/apps/user_ldap/l10n/sq.js
+++ b/apps/user_ldap/l10n/sq.js
@@ -81,7 +81,7 @@ OC.L10N.register(
"Add a new and blank configuration" : "Shtoni një formësim të ri të zbrazët",
"Copy current configuration into new directory binding" : "Kopjojeni formësimin e tanishëm te një lidhmë e re drejtorie",
"Delete the current configuration" : "Fshije formësimin e tanishëm",
- "Host" : "Pritësi",
+ "Host" : "Strehë",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokollin mund ta lini pa vënë, hiq rastin kur ju duhet SSL. Në atë rast filloni me ldaps://",
"Port" : "Portë",
"Detect Port" : "Zbulo Portë",
@@ -96,7 +96,7 @@ OC.L10N.register(
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Shmang kërkesa LDAP automatike. Më e përshtatshme për instalime më të mëdha, por lyp ca dije rreth LDAP-it.",
"Manually enter LDAP filters (recommended for large directories)" : "Jepni filtra LDAP dorazi (e këshilluar për drejtori të mëdha)",
"Limit %s access to users meeting these criteria:" : "Kufizo hyrje %s vetëm për përdorues që plotësojnë këtë kusht:",
- "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesht për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhniI, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.",
+ "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesh për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhni, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Filtri përcakton se cilët përdorues LDAP do të kenë hyrje te instanca %s.",
"Verify settings and count users" : "Verifiko rregullimet dhe numëro përdoruesit",
"Saving" : "Po ruhet",
@@ -122,16 +122,16 @@ OC.L10N.register(
"Directory Settings" : "Rregullime Drejtorie",
"User Display Name Field" : "Fushë Emri Përdoruesi Në Ekran",
"The LDAP attribute to use to generate the user's display name." : "Atribut LDAP që përdoret për të prodhuar emër ekrani për përdoruesin.",
- "Base User Tree" : "Struktura bazë e përdoruesit",
+ "Base User Tree" : "Strukturë Bazë Përdoruesi",
"One User Base DN per line" : "Një DN Bazë Përdoruesi për rresht",
- "User Search Attributes" : "Atributet e kërkimit të përdoruesëve",
+ "User Search Attributes" : "Atribute Kërkimesh Nga Përdoruesi",
"Optional; one attribute per line" : "Opsionale; një atribut për rresht",
"Group Display Name Field" : "Fushë Emri Grupi Në Ekran",
"The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP që përdoret për të prodhuar emër ekrani për grupin.",
- "Base Group Tree" : "Struktura bazë e grupit",
+ "Base Group Tree" : "Strukturë Bazë Grupi",
"One Group Base DN per line" : "Një DN Bazë Grupi për rresht",
"Group Search Attributes" : "Atribute Kërkimi Grupi",
- "Group-Member association" : "Pjestar Grup-Përdorues ",
+ "Group-Member association" : "Përshoqërim Grup-Përdorues",
"Nested Groups" : "Grupe Brenda Njëri-Tjetrit",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kur aktivizohet, grupet që përmbajnë grupe mbulohen. (Funksionon vetëm nëse atributi për anëtar grupi përmban DN-ra.)",
"Special Attributes" : "Atribute Speciale",
diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json
index 6045b61f57d..335a42630b5 100644
--- a/apps/user_ldap/l10n/sq.json
+++ b/apps/user_ldap/l10n/sq.json
@@ -79,7 +79,7 @@
"Add a new and blank configuration" : "Shtoni një formësim të ri të zbrazët",
"Copy current configuration into new directory binding" : "Kopjojeni formësimin e tanishëm te një lidhmë e re drejtorie",
"Delete the current configuration" : "Fshije formësimin e tanishëm",
- "Host" : "Pritësi",
+ "Host" : "Strehë",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokollin mund ta lini pa vënë, hiq rastin kur ju duhet SSL. Në atë rast filloni me ldaps://",
"Port" : "Portë",
"Detect Port" : "Zbulo Portë",
@@ -94,7 +94,7 @@
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Shmang kërkesa LDAP automatike. Më e përshtatshme për instalime më të mëdha, por lyp ca dije rreth LDAP-it.",
"Manually enter LDAP filters (recommended for large directories)" : "Jepni filtra LDAP dorazi (e këshilluar për drejtori të mëdha)",
"Limit %s access to users meeting these criteria:" : "Kufizo hyrje %s vetëm për përdorues që plotësojnë këtë kusht:",
- "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesht për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhniI, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.",
+ "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesh për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhni, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Filtri përcakton se cilët përdorues LDAP do të kenë hyrje te instanca %s.",
"Verify settings and count users" : "Verifiko rregullimet dhe numëro përdoruesit",
"Saving" : "Po ruhet",
@@ -120,16 +120,16 @@
"Directory Settings" : "Rregullime Drejtorie",
"User Display Name Field" : "Fushë Emri Përdoruesi Në Ekran",
"The LDAP attribute to use to generate the user's display name." : "Atribut LDAP që përdoret për të prodhuar emër ekrani për përdoruesin.",
- "Base User Tree" : "Struktura bazë e përdoruesit",
+ "Base User Tree" : "Strukturë Bazë Përdoruesi",
"One User Base DN per line" : "Një DN Bazë Përdoruesi për rresht",
- "User Search Attributes" : "Atributet e kërkimit të përdoruesëve",
+ "User Search Attributes" : "Atribute Kërkimesh Nga Përdoruesi",
"Optional; one attribute per line" : "Opsionale; një atribut për rresht",
"Group Display Name Field" : "Fushë Emri Grupi Në Ekran",
"The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP që përdoret për të prodhuar emër ekrani për grupin.",
- "Base Group Tree" : "Struktura bazë e grupit",
+ "Base Group Tree" : "Strukturë Bazë Grupi",
"One Group Base DN per line" : "Një DN Bazë Grupi për rresht",
"Group Search Attributes" : "Atribute Kërkimi Grupi",
- "Group-Member association" : "Pjestar Grup-Përdorues ",
+ "Group-Member association" : "Përshoqërim Grup-Përdorues",
"Nested Groups" : "Grupe Brenda Njëri-Tjetrit",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kur aktivizohet, grupet që përmbajnë grupe mbulohen. (Funksionon vetëm nëse atributi për anëtar grupi përmban DN-ra.)",
"Special Attributes" : "Atribute Speciale",
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index 0dc3c8c0c26..7a121920a35 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -474,8 +474,8 @@ class User {
$this->fs->setup($this->uid);
}
- $avatar = $this->avatarManager->getAvatar($this->uid);
try {
+ $avatar = $this->avatarManager->getAvatar($this->uid);
$avatar->set($this->image);
} catch (\Exception $e) {
\OC::$server->getLogger()->notice(
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index a266be7b7f7..c568905f3d9 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -118,6 +118,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
try {
$ldapRecord = $this->getLDAPUserByLoginName($uid);
} catch(\Exception $e) {
+ \OC::$server->getLogger()->logException($e, ['app' => 'user_ldap']);
return false;
}
$dn = $ldapRecord['dn'][0];