diff options
250 files changed, 1106 insertions, 351 deletions
diff --git a/.htaccess b/.htaccess index f656d6de444..740329e15a0 100644 --- a/.htaccess +++ b/.htaccess @@ -51,7 +51,7 @@ Options -MultiViews RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1] RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1] - RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff)$ + RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff|ico)$ RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$ RewriteCond %{REQUEST_FILENAME} !/remote.php RewriteCond %{REQUEST_FILENAME} !/public.php diff --git a/.mention-bot b/.mention-bot index c805917bee0..766ea2bacf2 100644 --- a/.mention-bot +++ b/.mention-bot @@ -3,13 +3,21 @@ "numFilesToCheck": 5, "alwaysNotifyForPaths": [ { - "name": "DeepDiver1975", - "files": ["apps/dav/**"] + "name": "DeepDiver1975", + "files": [ + "apps/dav/**" + ] }, { "name": "Xenopathic", - "files": ["apps/files_external/**"] + "files": [ + "apps/files_external/**" + ] } ], - "userBlacklist": ["owncloud-bot", "scrutinizer-auto-fixer"] + "userBlacklist": [ + "owncloud-bot", + "scrutinizer-auto-fixer", + "th3fallen" + ] } 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]; diff --git a/config/config.sample.php b/config/config.sample.php index 6e823e3968d..6e052d70404 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -405,7 +405,7 @@ $CONFIG = array( * delete all files in the trash bin that are older than D days * automatically, delete other files anytime if space needed * * ``D1, D2`` - * keep files and folders the in trash bin for at least D1 days and + * keep files and folders in the trash bin for at least D1 days and * delete when exceeds D2 days * * ``disabled`` * trash bin auto clean disabled, files and folders will be kept forever diff --git a/console.php b/console.php index ab845aced50..9386f544939 100644 --- a/console.php +++ b/console.php @@ -60,6 +60,7 @@ try { echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL; echo "Current user: " . $user['name'] . PHP_EOL; echo "Owner of config.php: " . $configUser['name'] . PHP_EOL; + echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL; exit(0); } } diff --git a/core/ajax/update.php b/core/ajax/update.php index a5c1f79e3ea..879f66e1024 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -104,10 +104,10 @@ if (OC::checkUpgrade(false)) { $config->setSystemValue('maintenance', false); }); $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) { - $eventSource->send('success', (string)$l->t('Set log level to debug - current level: "%s"', [ $logLevelName ])); + $eventSource->send('success', (string)$l->t('Set log level to debug')); }); $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) { - $eventSource->send('success', (string)$l->t('Reset log level to "%s"', [ $logLevelName ])); + $eventSource->send('success', (string)$l->t('Reset log level')); }); $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) { $eventSource->send('success', (string)$l->t('Starting code integrity check')); diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 9031e284f85..7675c168f35 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -199,10 +199,10 @@ class Upgrade extends Command { $output->writeln("<error>$message</error>"); }); $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) { - $output->writeln("<info>Set log level to debug - current level: '$logLevelName'</info>"); + $output->writeln("<info>Set log level to debug</info>"); }); $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) { - $output->writeln("<info>Reset log level to '$logLevelName'</info>"); + $output->writeln("<info>Reset log level</info>"); }); if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { diff --git a/core/css/styles.css b/core/css/styles.css index 7604a6ef343..04ac387974c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -381,6 +381,8 @@ body { .groupbottom input { margin-top: 0; border-top: 0; +} +#body-login .groupbottom #password { border-top-right-radius: 0; border-top-left-radius: 0; box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index dd07adceac4..4cebf7962e8 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -117,22 +117,95 @@ var $loading = this.$el.find('.shareWithLoading'); $loading.removeClass('hidden'); $loading.addClass('inlineblock'); - $.get(OC.filePath('core', 'ajax', 'share.php'), { - fetch: 'getShareWith', - search: search.term.trim(), - limit: 200, - itemShares: OC.Share.itemShares, - itemType: view.model.get('itemType') - }, function (result) { - $loading.addClass('hidden'); - $loading.removeClass('inlineblock'); - if (result.status == 'success' && result.data.length > 0) { - $('.shareWithField').autocomplete("option", "autoFocus", true); - response(result.data); - } else { - response(); + $.get( + OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees', + { + format: 'json', + search: search.term.trim(), + perPage: 200, + itemType: view.model.get('itemType') + }, + function (result) { + $loading.addClass('hidden'); + $loading.removeClass('inlineblock'); + if (result.ocs.meta.statuscode == 100) { + var users = result.ocs.data.exact.users.concat(result.ocs.data.users); + var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups); + var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes); + + var usersLength; + var groupsLength; + var remotesLength; + + var i, j; + + //Filter out the current user + usersLength = users.length; + for (i = 0 ; i < usersLength; i++) { + if (users[i].value.shareWith === OC.currentUser) { + users.splice(i, 1); + break; + } + } + + // Filter out the owner of the share + if (view.model.hasReshare()) { + usersLength = users.length; + for (i = 0 ; i < usersLength; i++) { + if (users[i].value.shareWith === view.model.getReshareOwner()) { + users.splice(i, 1); + break; + } + } + } + + var shares = view.model.get('shares'); + var sharesLength = shares.length; + + // Now filter out all sharees that are already shared with + for (i = 0; i < sharesLength; i++) { + var share = shares[i]; + + if (share.share_type === OC.Share.SHARE_TYPE_USER) { + usersLength = users.length; + for (j = 0; j < usersLength; j++) { + if (users[j].value.shareWith === share.share_with) { + users.splice(j, 1); + break; + } + } + } else if (share.share_type === OC.Share.SHARE_TYPE_GROUP) { + groupsLength = groups.length; + for (j = 0; j < groupsLength; j++) { + if (groups[j].value.shareWith === share.share_with) { + groups.splice(j, 1); + break; + } + } + } else if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) { + remotesLength = remotes.length; + for (j = 0; j < remotesLength; j++) { + if (remotes[j].value.shareWith === share.share_with) { + remotes.splice(j, 1); + break; + } + } + } + } + + var suggestions = users.concat(groups).concat(remotes); + + if (suggestions.length > 0) { + $('.shareWithField').autocomplete("option", "autoFocus", true); + response(suggestions); + } else { + response(); + } + } else { + response(); + } } - }).fail(function () { + ).fail(function() { $loading.addClass('hidden'); $loading.removeClass('inlineblock'); OC.Notification.show(t('core', 'An error occured. Please try again')); diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js index bfd3d987866..63cfe5299ae 100644 --- a/core/js/tests/specs/sharedialogviewSpec.js +++ b/core/js/tests/specs/sharedialogviewSpec.js @@ -702,6 +702,7 @@ describe('OC.Share.ShareDialogView', function() { }); }); }); + describe('remote sharing', function() { it('shows remote share info when allowed', function() { configModel.set({ @@ -724,23 +725,336 @@ describe('OC.Share.ShareDialogView', function() { var response = sinon.stub(); dialog.autocompleteHandler({term: 'bob'}, response); var jsonData = JSON.stringify({ - "data": [{"label": "bob", "value": {"shareType": 0, "shareWith": "test"}}], - "status": "success" + 'ocs' : { + 'meta' : { + 'status' : 'success', + 'statuscode' : 100, + 'message' : null + }, + 'data' : { + 'exact' : { + 'users' : [], + 'groups' : [], + 'remotes': [] + }, + 'users' : [{'label': 'bob', 'value': {'shareType': 0, 'shareWith': 'test'}}], + 'groups' : [], + 'remotes': [] + } + } }); fakeServer.requests[0].respond( 200, {'Content-Type': 'application/json'}, jsonData ); - expect(response.calledWithExactly(JSON.parse(jsonData).data)).toEqual(true); + expect(response.calledWithExactly(JSON.parse(jsonData).ocs.data.users)).toEqual(true); expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); }); + describe('filter out', function() { + it('the current user', function () { + dialog.render(); + var response = sinon.stub(); + dialog.autocompleteHandler({term: 'bob'}, response); + var jsonData = JSON.stringify({ + 'ocs': { + 'meta': { + 'status': 'success', + 'statuscode': 100, + 'message': null + }, + 'data': { + 'exact': { + 'users': [], + 'groups': [], + 'remotes': [] + }, + 'users': [ + { + 'label': 'bob', + 'value': { + 'shareType': 0, + 'shareWith': OC.currentUser + } + }, + { + 'label': 'bobby', + 'value': { + 'shareType': 0, + 'shareWith': 'imbob' + } + } + ], + 'groups': [], + 'remotes': [] + } + } + }); + fakeServer.requests[0].respond( + 200, + {'Content-Type': 'application/json'}, + jsonData + ); + expect(response.calledWithExactly([{ + 'label': 'bobby', + 'value': {'shareType': 0, 'shareWith': 'imbob'} + }])).toEqual(true); + expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); + }); + + it('the share owner', function () { + shareModel.set({ + reshare: { + uid_owner: 'user1' + }, + shares: [], + permissions: OC.PERMISSION_READ + }); + + dialog.render(); + var response = sinon.stub(); + dialog.autocompleteHandler({term: 'bob'}, response); + var jsonData = JSON.stringify({ + 'ocs': { + 'meta': { + 'status': 'success', + 'statuscode': 100, + 'message': null + }, + 'data': { + 'exact': { + 'users': [], + 'groups': [], + 'remotes': [] + }, + 'users': [ + { + 'label': 'bob', + 'value': { + 'shareType': 0, + 'shareWith': 'user1' + } + }, + { + 'label': 'bobby', + 'value': { + 'shareType': 0, + 'shareWith': 'imbob' + } + } + ], + 'groups': [], + 'remotes': [] + } + } + }); + fakeServer.requests[0].respond( + 200, + {'Content-Type': 'application/json'}, + jsonData + ); + expect(response.calledWithExactly([{ + 'label': 'bobby', + 'value': {'shareType': 0, 'shareWith': 'imbob'} + }])).toEqual(true); + expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); + }); + + describe('already shared with', function () { + beforeEach(function() { + shareModel.set({ + reshare: {}, + shares: [{ + id: 100, + item_source: 123, + permissions: 31, + share_type: OC.Share.SHARE_TYPE_USER, + share_with: 'user1', + share_with_displayname: 'User One' + },{ + id: 101, + item_source: 123, + permissions: 31, + share_type: OC.Share.SHARE_TYPE_GROUP, + share_with: 'group', + share_with_displayname: 'group' + },{ + id: 102, + item_source: 123, + permissions: 31, + share_type: OC.Share.SHARE_TYPE_REMOTE, + share_with: 'foo@bar.com/baz', + share_with_displayname: 'foo@bar.com/baz' + + }] + }); + }); + + it('users', function () { + dialog.render(); + var response = sinon.stub(); + dialog.autocompleteHandler({term: 'bob'}, response); + var jsonData = JSON.stringify({ + 'ocs': { + 'meta': { + 'status': 'success', + 'statuscode': 100, + 'message': null + }, + 'data': { + 'exact': { + 'users': [], + 'groups': [], + 'remotes': [] + }, + 'users': [ + { + 'label': 'bob', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_USER, + 'shareWith': 'user1' + } + }, + { + 'label': 'bobby', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_USER, + 'shareWith': 'imbob' + } + } + ], + 'groups': [], + 'remotes': [] + } + } + }); + fakeServer.requests[0].respond( + 200, + {'Content-Type': 'application/json'}, + jsonData + ); + expect(response.calledWithExactly([{ + 'label': 'bobby', + 'value': {'shareType': OC.Share.SHARE_TYPE_USER, 'shareWith': 'imbob'} + }])).toEqual(true); + expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); + }); + + it('groups', function () { + dialog.render(); + var response = sinon.stub(); + dialog.autocompleteHandler({term: 'group'}, response); + var jsonData = JSON.stringify({ + 'ocs': { + 'meta': { + 'status': 'success', + 'statuscode': 100, + 'message': null + }, + 'data': { + 'exact': { + 'users': [], + 'groups': [], + 'remotes': [] + }, + 'users': [], + 'groups': [ + { + 'label': 'group', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_GROUP, + 'shareWith': 'group' + } + }, + { + 'label': 'group2', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_GROUP, + 'shareWith': 'group2' + } + } + ], + 'remotes': [] + } + } + }); + fakeServer.requests[0].respond( + 200, + {'Content-Type': 'application/json'}, + jsonData + ); + expect(response.calledWithExactly([{ + 'label': 'group2', + 'value': {'shareType': OC.Share.SHARE_TYPE_GROUP, 'shareWith': 'group2'} + }])).toEqual(true); + expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); + }); + + it('remotes', function () { + dialog.render(); + var response = sinon.stub(); + dialog.autocompleteHandler({term: 'bob'}, response); + var jsonData = JSON.stringify({ + 'ocs': { + 'meta': { + 'status': 'success', + 'statuscode': 100, + 'message': null + }, + 'data': { + 'exact': { + 'users': [], + 'groups': [], + 'remotes': [] + }, + 'users': [], + 'groups': [], + 'remotes': [ + { + 'label': 'foo@bar.com/baz', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_REMOTE, + 'shareWith': 'foo@bar.com/baz' + } + }, + { + 'label': 'foo2@bar.com/baz', + 'value': { + 'shareType': OC.Share.SHARE_TYPE_REMOTE, + 'shareWith': 'foo2@bar.com/baz' + } + } + ] + } + } + }); + fakeServer.requests[0].respond( + 200, + {'Content-Type': 'application/json'}, + jsonData + ); + expect(response.calledWithExactly([{ + 'label': 'foo2@bar.com/baz', + 'value': {'shareType': OC.Share.SHARE_TYPE_REMOTE, 'shareWith': 'foo2@bar.com/baz'} + }])).toEqual(true); + expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true); + }); + }); + }); + it('gracefully handles successful ajax call with failure content', function () { dialog.render(); var response = sinon.stub(); dialog.autocompleteHandler({term: 'bob'}, response); - var jsonData = JSON.stringify({"status": "failure"}); + var jsonData = JSON.stringify({ + 'ocs' : { + 'meta' : { + 'status': 'failure', + 'statuscode': 400 + } + } + }); fakeServer.requests[0].respond( 200, {'Content-Type': 'application/json'}, diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index b8998470e8b..2ed187b088e 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s", "Repair warning: " : "Upozornění opravy:", "Repair error: " : "Chyba opravy:", - "Set log level to debug - current level: \"%s\"" : "Nastavit úroveň logování na debug - aktuální úroveň: \"%s\"", - "Reset log level to \"%s\"" : "Vrátit úroveň logování na \"%s\"", "Starting code integrity check" : "Spouští se kontrola integrity kódu", "Finished code integrity check" : "Kontrola integrity kódu dokončena", "%s (3rdparty)" : "%s (3. strana)", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 112eee4e841..a4071452dd4 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s", "Repair warning: " : "Upozornění opravy:", "Repair error: " : "Chyba opravy:", - "Set log level to debug - current level: \"%s\"" : "Nastavit úroveň logování na debug - aktuální úroveň: \"%s\"", - "Reset log level to \"%s\"" : "Vrátit úroveň logování na \"%s\"", "Starting code integrity check" : "Spouští se kontrola integrity kódu", "Finished code integrity check" : "Kontrola integrity kódu dokončena", "%s (3rdparty)" : "%s (3. strana)", diff --git a/core/l10n/da.js b/core/l10n/da.js index 870a287db4c..0049723161e 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s", "Repair warning: " : "Reparationsadvarsel:", "Repair error: " : "Reparationsfejl:", - "Set log level to debug - current level: \"%s\"" : "Sæt log niveau til fejlfinding - nuværende niveau: \"%s\"", - "Reset log level to \"%s\"" : "Nulstil log niveau til \"%s\"", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (inkombatible)", "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s", diff --git a/core/l10n/da.json b/core/l10n/da.json index 2da2042bacd..cabee9f2cc1 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s", "Repair warning: " : "Reparationsadvarsel:", "Repair error: " : "Reparationsfejl:", - "Set log level to debug - current level: \"%s\"" : "Sæt log niveau til fejlfinding - nuværende niveau: \"%s\"", - "Reset log level to \"%s\"" : "Nulstil log niveau til \"%s\"", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (inkombatible)", "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s", diff --git a/core/l10n/de.js b/core/l10n/de.js index d0dfc56bb2f..7ae1895a4d1 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -14,8 +14,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert", "Repair warning: " : "Reperaturwarnung:", "Repair error: " : "Reperaturfehler:", - "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"", - "Reset log level to \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (nicht kompatibel)", "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", diff --git a/core/l10n/de.json b/core/l10n/de.json index 4be7fe80cc2..2a9d1b74f38 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -12,8 +12,6 @@ "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert", "Repair warning: " : "Reperaturwarnung:", "Repair error: " : "Reperaturfehler:", - "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"", - "Reset log level to \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (nicht kompatibel)", "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index fac380bf61d..1489f1584e1 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -14,8 +14,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert", "Repair warning: " : "Reperaturwarnung:", "Repair error: " : "Reperaturfehler:", - "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"", - "Reset log level to \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt", "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", "Already up to date" : "Bereits aktuell", "File is too big" : "Datei ist zu groß", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index c9024cc3bc2..93519571f71 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -12,8 +12,6 @@ "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert", "Repair warning: " : "Reperaturwarnung:", "Repair error: " : "Reperaturfehler:", - "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"", - "Reset log level to \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt", "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", "Already up to date" : "Bereits aktuell", "File is too big" : "Datei ist zu groß", diff --git a/core/l10n/el.js b/core/l10n/el.js index 20008993e5f..07877d1c44a 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s", "Repair warning: " : "Προειδοποίηση διόρθωσης:", "Repair error: " : "Σφάλμα διόρθωσης:", - "Set log level to debug - current level: \"%s\"" : "Καθορισμός του επιπέδου καταγραφής σε αποσφαλμάτωση - τρέχον επίπεδο: \"%s\"", - "Reset log level to \"%s\"" : "Επαναφορά επιπέδου καταγραφής σε \"%s\"", "%s (3rdparty)" : "%s (3ου μέρους)", "%s (incompatible)" : "%s (ασύμβατη)", "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s", diff --git a/core/l10n/el.json b/core/l10n/el.json index 2ab6bc6eab8..a61b7040233 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s", "Repair warning: " : "Προειδοποίηση διόρθωσης:", "Repair error: " : "Σφάλμα διόρθωσης:", - "Set log level to debug - current level: \"%s\"" : "Καθορισμός του επιπέδου καταγραφής σε αποσφαλμάτωση - τρέχον επίπεδο: \"%s\"", - "Reset log level to \"%s\"" : "Επαναφορά επιπέδου καταγραφής σε \"%s\"", "%s (3rdparty)" : "%s (3ου μέρους)", "%s (incompatible)" : "%s (ασύμβατη)", "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s", diff --git a/core/l10n/es.js b/core/l10n/es.js index 8f5d4657938..070369bfb41 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s", "Repair warning: " : "Advertencia de reparación:", "Repair error: " : "Error que reparar:", - "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"", - "Reset log level to \"%s\"" : "Restablecer nivel de registro a \"%s\"", "Starting code integrity check" : "Comenzando comprobación de integridad de código", "Finished code integrity check" : "Terminando comprobación de integridad de código", "%s (3rdparty)" : "%s (tercer parte)", diff --git a/core/l10n/es.json b/core/l10n/es.json index fc88108dc30..12e45a828dd 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s", "Repair warning: " : "Advertencia de reparación:", "Repair error: " : "Error que reparar:", - "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"", - "Reset log level to \"%s\"" : "Restablecer nivel de registro a \"%s\"", "Starting code integrity check" : "Comenzando comprobación de integridad de código", "Finished code integrity check" : "Terminando comprobación de integridad de código", "%s (3rdparty)" : "%s (tercer parte)", diff --git a/core/l10n/eu.js b/core/l10n/eu.js index dd247c80e30..2283c5969de 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -27,6 +27,8 @@ OC.L10N.register( "Thu." : "og.", "Fri." : "ol.", "Sat." : "lr.", + "Su" : "Ig", + "Sa" : "La", "January" : "Urtarrila", "February" : "Otsaila", "March" : "Martxoa", @@ -134,6 +136,7 @@ OC.L10N.register( "Hello {name}" : "Kaixo {name}", "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"], "Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.", + "An error occurred." : "Errore bat gertatu da.", "Please reload the page." : "Mesedez birkargatu orria.", "The update was unsuccessful. " : "Eguneraketa ongi burutu da.", "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", @@ -145,6 +148,7 @@ OC.L10N.register( "New Password" : "Pasahitz Berria", "Reset password" : "Berrezarri pasahitza", "Searching other places" : "Beste lekuak bilatzen", + "No search results in other folders" : "Ez da bilaketaren emaitzik lortu beste karpetatan", "Personal" : "Pertsonala", "Users" : "Erabiltzaileak", "Apps" : "Aplikazioak", @@ -176,6 +180,7 @@ OC.L10N.register( "File: %s" : "Fitxategia: %s", "Line: %s" : "Lerroa: %s", "Trace" : "Arrastoa", + "Security warning" : "Segurtasun abisua", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.", "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat", @@ -191,6 +196,7 @@ OC.L10N.register( "Database host" : "Datubasearen hostalaria", "Finish setup" : "Bukatu konfigurazioa", "Finishing …" : "Bukatzen...", + "Need help?" : "Laguntza behar al duzu?", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s", "Log out" : "Saioa bukatu", "Search" : "Bilatu", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index 9a81a86df26..d422e1276b9 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -25,6 +25,8 @@ "Thu." : "og.", "Fri." : "ol.", "Sat." : "lr.", + "Su" : "Ig", + "Sa" : "La", "January" : "Urtarrila", "February" : "Otsaila", "March" : "Martxoa", @@ -132,6 +134,7 @@ "Hello {name}" : "Kaixo {name}", "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"], "Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.", + "An error occurred." : "Errore bat gertatu da.", "Please reload the page." : "Mesedez birkargatu orria.", "The update was unsuccessful. " : "Eguneraketa ongi burutu da.", "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", @@ -143,6 +146,7 @@ "New Password" : "Pasahitz Berria", "Reset password" : "Berrezarri pasahitza", "Searching other places" : "Beste lekuak bilatzen", + "No search results in other folders" : "Ez da bilaketaren emaitzik lortu beste karpetatan", "Personal" : "Pertsonala", "Users" : "Erabiltzaileak", "Apps" : "Aplikazioak", @@ -174,6 +178,7 @@ "File: %s" : "Fitxategia: %s", "Line: %s" : "Lerroa: %s", "Trace" : "Arrastoa", + "Security warning" : "Segurtasun abisua", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.", "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat", @@ -189,6 +194,7 @@ "Database host" : "Datubasearen hostalaria", "Finish setup" : "Bukatu konfigurazioa", "Finishing …" : "Bukatzen...", + "Need help?" : "Laguntza behar al duzu?", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s", "Log out" : "Saioa bukatu", "Search" : "Bilatu", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 078682a7b75..6c5aa67f2f3 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s", "Repair warning: " : "Korjausvaroitus:", "Repair error: " : "Korjausvirhe:", - "Set log level to debug - current level: \"%s\"" : "Aseta lokitasoksi vianjäljitys - nykyinen taso: \"%s\"", - "Reset log level to \"%s\"" : "Palauta lokitasoksi \"%s\"", + "Set log level to debug" : "Aseta lokitustasoksi vianetsintä", + "Reset log level" : "Nollaa lokitustaso", "Starting code integrity check" : "Aloitetaan koodin eheystarkistus", "Finished code integrity check" : "Koodin eheystarkistus suoritettu", "%s (3rdparty)" : "%s (kolmannen osapuolen)", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index b890a36d8e7..f66767023da 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s", "Repair warning: " : "Korjausvaroitus:", "Repair error: " : "Korjausvirhe:", - "Set log level to debug - current level: \"%s\"" : "Aseta lokitasoksi vianjäljitys - nykyinen taso: \"%s\"", - "Reset log level to \"%s\"" : "Palauta lokitasoksi \"%s\"", + "Set log level to debug" : "Aseta lokitustasoksi vianetsintä", + "Reset log level" : "Nollaa lokitustaso", "Starting code integrity check" : "Aloitetaan koodin eheystarkistus", "Finished code integrity check" : "Koodin eheystarkistus suoritettu", "%s (3rdparty)" : "%s (kolmannen osapuolen)", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index d6663c09aa9..a9b3a5ceb7d 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s", "Repair warning: " : "Avertissement de réparation :", "Repair error: " : "Erreur de réparation :", - "Set log level to debug - current level: \"%s\"" : "Réglage du niveau de log à \"debug\" - niveau actuel: \"%s\"", - "Reset log level to \"%s\"" : "Réglage du niveau de log à \"%s\"", "Starting code integrity check" : "Lancement de la vérification d'integrite du code", "Finished code integrity check" : "Fin de la vérification d’intégrité du code", "%s (3rdparty)" : "%s (origine tierce)", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 841d99bea1a..d93eda26e25 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s", "Repair warning: " : "Avertissement de réparation :", "Repair error: " : "Erreur de réparation :", - "Set log level to debug - current level: \"%s\"" : "Réglage du niveau de log à \"debug\" - niveau actuel: \"%s\"", - "Reset log level to \"%s\"" : "Réglage du niveau de log à \"%s\"", "Starting code integrity check" : "Lancement de la vérification d'integrite du code", "Finished code integrity check" : "Fin de la vérification d’intégrité du code", "%s (3rdparty)" : "%s (origine tierce)", diff --git a/core/l10n/he.js b/core/l10n/he.js index d66e67605f0..fae4bd85396 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -54,27 +54,39 @@ OC.L10N.register( "Error while unsharing" : "שגיאה במהלך ביטול השיתוף", "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות", "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה", + "The public link will expire no later than {days} days after it is created" : "הקישור הציבורי יפוג עד {days} ימים לאחר שנוצר", "Set expiration date" : "הגדרת תאריך תפוגה", + "Expiration" : "תפוגה", "Expiration date" : "תאריך התפוגה", + "Choose a password for the public link" : "בחירת סיסמא לקישור ציבורי", "Sending ..." : "מתבצעת שליחה ...", "Email sent" : "הודעת הדוא״ל נשלחה", "Resharing is not allowed" : "אסור לעשות שיתוף מחדש", "Share link" : "קישור לשיתוף", + "Link" : "קישור", "Password protect" : "הגנה בססמה", "Password" : "סיסמא", + "Allow editing" : "אישור עריכה", "Email link to person" : "שליחת קישור בדוא״ל למשתמש", "Send" : "שליחה", "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}", "Shared with you by {owner}" : "שותף אתך על ידי {owner}", "Shared in {item} with {user}" : "שותף תחת {item} עם {user}", "group" : "קבוצה", + "remote" : "נשלט מרחוק", + "notify by email" : "קבלת הודעה בדואר אלקטרוני", "Unshare" : "הסר שיתוף", "can share" : "ניתן לשתף", "can edit" : "ניתן לערוך", "create" : "יצירה", + "change" : "שינוי", "delete" : "מחיקה", "access control" : "בקרת גישה", + "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "Share" : "שתף", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "ניתן לשתף עם אנשים אחרים המשתמשים ב- ownClouds בעזרת הפורמט הבא username@example.com/owncloud", + "Share with users or groups …" : "שיתוף עם משתמשים או קבוצות...", + "Share with users, groups or remote users …" : "שיתוף עם משתמשים, קבוצות או משתמשים חצוניים...", "Warning" : "אזהרה", "The object type is not specified." : "סוג הפריט לא צוין.", "Delete" : "מחיקה", diff --git a/core/l10n/he.json b/core/l10n/he.json index 02c333c21d1..ac88abbfaa6 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -52,27 +52,39 @@ "Error while unsharing" : "שגיאה במהלך ביטול השיתוף", "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות", "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה", + "The public link will expire no later than {days} days after it is created" : "הקישור הציבורי יפוג עד {days} ימים לאחר שנוצר", "Set expiration date" : "הגדרת תאריך תפוגה", + "Expiration" : "תפוגה", "Expiration date" : "תאריך התפוגה", + "Choose a password for the public link" : "בחירת סיסמא לקישור ציבורי", "Sending ..." : "מתבצעת שליחה ...", "Email sent" : "הודעת הדוא״ל נשלחה", "Resharing is not allowed" : "אסור לעשות שיתוף מחדש", "Share link" : "קישור לשיתוף", + "Link" : "קישור", "Password protect" : "הגנה בססמה", "Password" : "סיסמא", + "Allow editing" : "אישור עריכה", "Email link to person" : "שליחת קישור בדוא״ל למשתמש", "Send" : "שליחה", "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}", "Shared with you by {owner}" : "שותף אתך על ידי {owner}", "Shared in {item} with {user}" : "שותף תחת {item} עם {user}", "group" : "קבוצה", + "remote" : "נשלט מרחוק", + "notify by email" : "קבלת הודעה בדואר אלקטרוני", "Unshare" : "הסר שיתוף", "can share" : "ניתן לשתף", "can edit" : "ניתן לערוך", "create" : "יצירה", + "change" : "שינוי", "delete" : "מחיקה", "access control" : "בקרת גישה", + "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "Share" : "שתף", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "ניתן לשתף עם אנשים אחרים המשתמשים ב- ownClouds בעזרת הפורמט הבא username@example.com/owncloud", + "Share with users or groups …" : "שיתוף עם משתמשים או קבוצות...", + "Share with users, groups or remote users …" : "שיתוף עם משתמשים, קבוצות או משתמשים חצוניים...", "Warning" : "אזהרה", "The object type is not specified." : "סוג הפריט לא צוין.", "Delete" : "מחיקה", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index d3a577e60ab..c69087ed82b 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Frissítettük \"%s\"-t erre: %s", "Repair warning: " : "Javítás figyelmeztetés:", "Repair error: " : "Javítás hiba:", - "Set log level to debug - current level: \"%s\"" : "Hibakeresési naplózási szint beállítása - jelenlegi szint: \"%s\"", - "Reset log level to \"%s\"" : "Naplózási szint visszaállítása \"%s\"-re", "%s (3rdparty)" : "%s (harmadik fél által)", "%s (incompatible)" : "%s (nem kompatibilis)", "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s", @@ -111,6 +109,8 @@ OC.L10N.register( "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "A webszerver nincs megfelelően beállítva a fájl szinkronizációhoz, mert a WebDAV interfész nem működik.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ennek a szervernek nincs működő internet kapcsolata. Ez azt jelenti, hogy néhány tulajdonság, mint pl. külső tárolók felcsatolása, frissítési értesítések, vagy egyéb applikációk nem működnek. A fájlok távoli elérése és az email értesítések is lehet, hogy nem működnek. Ajánlott az internet kapcsolat engedélyezése a szerveren, ha minden tulajdonságot használni akar.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Az adat könyvtára és a fáljai valószínűleg elérhetőek az internetről. A .htaccess fájl nem működik. Erősen ajánlott, hogy úgy állítsa be a webszerverét, hogy az adatkönyvtár ne legyen elérhető az internetről, vagy mogassa ki az adatokat a webszerver gyökérkönyvtárából.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nem olvasható a PHP számára, mely nagy biztonsági probléma. Bővebb információt találhatsz a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) többé nem támogatott a <a target=\"_blank\" href=\"{phpLink}\">PHP által</a>. Azt javasoljuk, hogy frissítsd a PHP verziód, hogy kitud használni a teljesítménybeli és biztonsági javításokat.", "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.", @@ -182,6 +182,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.", "Couldn't reset password because the token is expired" : "Nem lehet a jelszót törölni, mert a token lejárt.", "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nem tudtunk visszaállítási e-mailt küldeni, mert ehhez a felhasználóhoz nem tartozik e-mail cím. Kérjük, vedd fel a kapcsolatot a rendszergazdáddal!", "%s password reset" : "%s jelszó visszaállítás", "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}", "New password" : "Az új jelszó", @@ -256,6 +257,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", + "Wrong password." : "Rossz jelszó.", "Stay logged in" : "Maradjon bejelentkezve", "Alternative Logins" : "Alternatív bejelentkezés", "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index 1729c081244..f3468817d44 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Frissítettük \"%s\"-t erre: %s", "Repair warning: " : "Javítás figyelmeztetés:", "Repair error: " : "Javítás hiba:", - "Set log level to debug - current level: \"%s\"" : "Hibakeresési naplózási szint beállítása - jelenlegi szint: \"%s\"", - "Reset log level to \"%s\"" : "Naplózási szint visszaállítása \"%s\"-re", "%s (3rdparty)" : "%s (harmadik fél által)", "%s (incompatible)" : "%s (nem kompatibilis)", "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s", @@ -109,6 +107,8 @@ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "A webszerver nincs megfelelően beállítva a fájl szinkronizációhoz, mert a WebDAV interfész nem működik.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ennek a szervernek nincs működő internet kapcsolata. Ez azt jelenti, hogy néhány tulajdonság, mint pl. külső tárolók felcsatolása, frissítési értesítések, vagy egyéb applikációk nem működnek. A fájlok távoli elérése és az email értesítések is lehet, hogy nem működnek. Ajánlott az internet kapcsolat engedélyezése a szerveren, ha minden tulajdonságot használni akar.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Az adat könyvtára és a fáljai valószínűleg elérhetőek az internetről. A .htaccess fájl nem működik. Erősen ajánlott, hogy úgy állítsa be a webszerverét, hogy az adatkönyvtár ne legyen elérhető az internetről, vagy mogassa ki az adatokat a webszerver gyökérkönyvtárából.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nem olvasható a PHP számára, mely nagy biztonsági probléma. Bővebb információt találhatsz a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) többé nem támogatott a <a target=\"_blank\" href=\"{phpLink}\">PHP által</a>. Azt javasoljuk, hogy frissítsd a PHP verziód, hogy kitud használni a teljesítménybeli és biztonsági javításokat.", "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.", @@ -180,6 +180,7 @@ "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.", "Couldn't reset password because the token is expired" : "Nem lehet a jelszót törölni, mert a token lejárt.", "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nem tudtunk visszaállítási e-mailt küldeni, mert ehhez a felhasználóhoz nem tartozik e-mail cím. Kérjük, vedd fel a kapcsolatot a rendszergazdáddal!", "%s password reset" : "%s jelszó visszaállítás", "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}", "New password" : "Az új jelszó", @@ -254,6 +255,7 @@ "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", + "Wrong password." : "Rossz jelszó.", "Stay logged in" : "Maradjon bejelentkezve", "Alternative Logins" : "Alternatív bejelentkezés", "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.", diff --git a/core/l10n/id.js b/core/l10n/id.js index 1c7325e1206..b0efff2b1ef 100644 --- a/core/l10n/id.js +++ b/core/l10n/id.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s", "Repair warning: " : "Peringatan perbaikan:", "Repair error: " : "Kesalahan perbaikan:", - "Set log level to debug - current level: \"%s\"" : "Atur level log untuk debug - level saat ini: \"%s\"", - "Reset log level to \"%s\"" : "Atur ulang level log menjadi \"%s\"", "%s (3rdparty)" : "%s (pihak ke-3)", "%s (incompatible)" : "%s (tidak kompatibel)", "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s", diff --git a/core/l10n/id.json b/core/l10n/id.json index 16b0e0e0df8..0ee6a256d42 100644 --- a/core/l10n/id.json +++ b/core/l10n/id.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s", "Repair warning: " : "Peringatan perbaikan:", "Repair error: " : "Kesalahan perbaikan:", - "Set log level to debug - current level: \"%s\"" : "Atur level log untuk debug - level saat ini: \"%s\"", - "Reset log level to \"%s\"" : "Atur ulang level log menjadi \"%s\"", "%s (3rdparty)" : "%s (pihak ke-3)", "%s (incompatible)" : "%s (tidak kompatibel)", "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s", diff --git a/core/l10n/it.js b/core/l10n/it.js index 29189b403a0..77d49e09d37 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s", "Repair warning: " : "Avviso di riparazione", "Repair error: " : "Errore di riparazione:", - "Set log level to debug - current level: \"%s\"" : "Imposta il livello del log a debug - livello attuale: \"%s\"", - "Reset log level to \"%s\"" : "Ripristina il livello del log a \"%s\"", + "Set log level to debug" : "Imposta il livello del log a debug", + "Reset log level" : "Ripristina il livello del log", "Starting code integrity check" : "Avvio del controllo di integrità del codice", "Finished code integrity check" : "Controllo di integrità del codice terminato", "%s (3rdparty)" : "%s (Terze parti)", diff --git a/core/l10n/it.json b/core/l10n/it.json index c5c068e4dac..62347952936 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s", "Repair warning: " : "Avviso di riparazione", "Repair error: " : "Errore di riparazione:", - "Set log level to debug - current level: \"%s\"" : "Imposta il livello del log a debug - livello attuale: \"%s\"", - "Reset log level to \"%s\"" : "Ripristina il livello del log a \"%s\"", + "Set log level to debug" : "Imposta il livello del log a debug", + "Reset log level" : "Ripristina il livello del log", "Starting code integrity check" : "Avvio del controllo di integrità del codice", "Finished code integrity check" : "Controllo di integrità del codice terminato", "%s (3rdparty)" : "%s (Terze parti)", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 57bb7c9ee83..ca722e9d22c 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。", "Repair warning: " : "修復警告:", "Repair error: " : "修復エラー:", - "Set log level to debug - current level: \"%s\"" : "ログレベルをデバッグにセットします - 現在のレベル: \"%s\"", - "Reset log level to \"%s\"" : "ログレベルを \"%s\" にリセットします。", "Starting code integrity check" : "コード整合性の確認を開始", "Finished code integrity check" : "コード整合性の確認が終了", "%s (3rdparty)" : "%s (サードパーティー)", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index b5cb09d44af..8d621d4cfe2 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。", "Repair warning: " : "修復警告:", "Repair error: " : "修復エラー:", - "Set log level to debug - current level: \"%s\"" : "ログレベルをデバッグにセットします - 現在のレベル: \"%s\"", - "Reset log level to \"%s\"" : "ログレベルを \"%s\" にリセットします。", "Starting code integrity check" : "コード整合性の確認を開始", "Finished code integrity check" : "コード整合性の確認が終了", "%s (3rdparty)" : "%s (サードパーティー)", diff --git a/core/l10n/ko.js b/core/l10n/ko.js index 54dc3cc77a0..09864201ef5 100644 --- a/core/l10n/ko.js +++ b/core/l10n/ko.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함", "Repair warning: " : "수리 경고:", "Repair error: " : "수리 오류:", - "Set log level to debug - current level: \"%s\"" : "로그 단계를 디버그로 설정함 - 현재 단계: \"%s\"", - "Reset log level to \"%s\"" : "로그 단계를 \"%s\"(으)로 초기화", "%s (3rdparty)" : "%s(제 3사)", "%s (incompatible)" : "%s(호환 불가)", "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s", diff --git a/core/l10n/ko.json b/core/l10n/ko.json index 075a7eb64a1..ca246da388f 100644 --- a/core/l10n/ko.json +++ b/core/l10n/ko.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함", "Repair warning: " : "수리 경고:", "Repair error: " : "수리 오류:", - "Set log level to debug - current level: \"%s\"" : "로그 단계를 디버그로 설정함 - 현재 단계: \"%s\"", - "Reset log level to \"%s\"" : "로그 단계를 \"%s\"(으)로 초기화", "%s (3rdparty)" : "%s(제 3사)", "%s (incompatible)" : "%s(호환 불가)", "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s", diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js index 829e6f9e957..1a0d8816e84 100644 --- a/core/l10n/lt_LT.js +++ b/core/l10n/lt_LT.js @@ -13,8 +13,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Atnaujinta \"%s\" į %s", "Repair warning: " : "Taisymo perspėjimas:", "Repair error: " : "Taisymo klaida:", - "Set log level to debug - current level: \"%s\"" : "Nustatykite žurnalų lygį į derinimas - dabar \"%s\"", - "Reset log level to \"%s\"" : "Atkurkite žurnalų lygį į \"%s\"", "Following apps have been disabled: %s" : "Išjungti įskiepiai: %s", "Already up to date" : "Jau naujausia", "File is too big" : "Per didelis failas", diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json index f67b9d6cc00..908ace76c55 100644 --- a/core/l10n/lt_LT.json +++ b/core/l10n/lt_LT.json @@ -11,8 +11,6 @@ "Updated \"%s\" to %s" : "Atnaujinta \"%s\" į %s", "Repair warning: " : "Taisymo perspėjimas:", "Repair error: " : "Taisymo klaida:", - "Set log level to debug - current level: \"%s\"" : "Nustatykite žurnalų lygį į derinimas - dabar \"%s\"", - "Reset log level to \"%s\"" : "Atkurkite žurnalų lygį į \"%s\"", "Following apps have been disabled: %s" : "Išjungti įskiepiai: %s", "Already up to date" : "Jau naujausia", "File is too big" : "Per didelis failas", diff --git a/core/l10n/mk.js b/core/l10n/mk.js index 0fd2666320c..20985fac584 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -2,14 +2,21 @@ OC.L10N.register( "core", { "Couldn't send mail to following users: %s " : "Не можев да пратам порака на следниве корисници: %s", + "Preparing update" : "Ја подготвувам надградбата", "Turned on maintenance mode" : "Вклучен е модот за одржување", "Turned off maintenance mode" : "Ислкучен е модот за одржување", + "Maintenance mode is kept active" : "Модот за одржување е уште активен", + "Updating database schema" : "Ја надградувам шемата на базата на податоци", "Updated database" : "Базата е надградена", "Checked database schema update" : "Проверена е шемата за ажурурање на базата на податоци", "Checked database schema update for apps" : "Проверена е шемата за ажурурање на базата на податоци за апликации", "Updated \"%s\" to %s" : "Ажурирано е \"%s\" во %s", "Repair warning: " : "Предупредувања при поправка:", "Repair error: " : "Грешка при поправка:", + "%s (3rdparty)" : "%s (3-та страна)", + "%s (incompatible)" : "%s (некомпатибилен)", + "Already up to date" : "Веќе ажурирано", + "File is too big" : "Датотеката е пре голема", "Invalid file provided" : "Дадена е невалидна датотека", "No image or file provided" : "Не е доставена фотографија или датотека", "Unknown filetype" : "Непознат тип на датотека", @@ -32,6 +39,13 @@ OC.L10N.register( "Thu." : "Чет.", "Fri." : "Пет.", "Sat." : "Саб.", + "Su" : "Не", + "Mo" : "По", + "Tu" : "Вт", + "We" : "Ср", + "Th" : "Че", + "Fr" : "Пе", + "Sa" : "Са", "January" : "Јануари", "February" : "Февруари", "March" : "Март", @@ -101,25 +115,31 @@ OC.L10N.register( "Set expiration date" : "Постави рок на траење", "Expiration" : "Истекување", "Expiration date" : "Рок на траење", + "Choose a password for the public link" : "Одбери лозинка за јавниот линк", "Sending ..." : "Праќање...", "Email sent" : "Е-порака пратена", "Resharing is not allowed" : "Повторно споделување не е дозволено", "Share link" : "Сподели ја врската", + "Link" : "Линк", "Password protect" : "Заштити со лозинка", "Password" : "Лозинка", + "Allow editing" : "Овозможи уредување", "Email link to person" : "Прати врска по е-пошта на личност", "Send" : "Прати", "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}", "Shared with you by {owner}" : "Споделено со Вас од {owner}", "Shared in {item} with {user}" : "Споделено во {item} со {user}", "group" : "група", + "remote" : "далечински", "notify by email" : "извести преку електронска пошта", "Unshare" : "Не споделувај", "can share" : "може да споделува", "can edit" : "може да се измени", "create" : "креирај", + "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", + "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Share with users or groups …" : "Сподели со корисници или групи ...", "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...", @@ -130,10 +150,16 @@ OC.L10N.register( "Add" : "Додади", "Edit tags" : "Уреди ги таговите", "No tags selected for deletion." : "Не се селектирани тагови за бришење.", + "unknown text" : "непознат текст", + "Hello world!" : "Здраво свету!", + "sunny" : "сончево", + "Hello {name}" : "Здраво {name}", + "An error occurred." : "Се случи грешка", "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "%s password reset" : "%s ресетирање на лозинката", "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", "New password" : "Нова лозинка", + "New Password" : "Нова лозинка", "Reset password" : "Ресетирај лозинка", "Personal" : "Лично", "Users" : "Корисници", @@ -147,8 +173,11 @@ OC.L10N.register( "Error untagging" : "Грешка при отстранување на таговите", "Error favoriting" : "Грешка при ", "Access forbidden" : "Забранет пристап", + "File not found" : "Датотеката не е пронајдена", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека %s shared %s with you.\nView it: %s\n\n", "Cheers!" : "Поздрав!", + "Internal Server Error" : "Интерна серверска грешка", + "Technical details" : "Технички детали", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", "Username" : "Корисничко име", @@ -159,15 +188,24 @@ OC.L10N.register( "Database name" : "Име на база", "Database tablespace" : "Табела во базата на податоци", "Database host" : "Сервер со база", + "Performance warning" : "Предупредување за перформансите", + "SQLite will be used as database." : "SQLite ќе се користи како база на податоци.", "Finish setup" : "Заврши го подесувањето", "Finishing …" : "Завршувам ...", + "Need help?" : "Ви треба помош?", + "See the documentation" : "Види ја документацијата", "Log out" : "Одјава", "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", + "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", + "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", + "Wrong password." : "Погрешна лозинка.", + "Stay logged in" : "Остани најаваен", "Alternative Logins" : "Алтернативни најавувања", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", - "Thank you for your patience." : "Благодариме на вашето трпение." + "Thank you for your patience." : "Благодариме на вашето трпение.", + "These apps will be updated:" : "Следните апликации чќе бидат надградени:" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 24c43253248..cf5eaf9a9cc 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -1,13 +1,20 @@ { "translations": { "Couldn't send mail to following users: %s " : "Не можев да пратам порака на следниве корисници: %s", + "Preparing update" : "Ја подготвувам надградбата", "Turned on maintenance mode" : "Вклучен е модот за одржување", "Turned off maintenance mode" : "Ислкучен е модот за одржување", + "Maintenance mode is kept active" : "Модот за одржување е уште активен", + "Updating database schema" : "Ја надградувам шемата на базата на податоци", "Updated database" : "Базата е надградена", "Checked database schema update" : "Проверена е шемата за ажурурање на базата на податоци", "Checked database schema update for apps" : "Проверена е шемата за ажурурање на базата на податоци за апликации", "Updated \"%s\" to %s" : "Ажурирано е \"%s\" во %s", "Repair warning: " : "Предупредувања при поправка:", "Repair error: " : "Грешка при поправка:", + "%s (3rdparty)" : "%s (3-та страна)", + "%s (incompatible)" : "%s (некомпатибилен)", + "Already up to date" : "Веќе ажурирано", + "File is too big" : "Датотеката е пре голема", "Invalid file provided" : "Дадена е невалидна датотека", "No image or file provided" : "Не е доставена фотографија или датотека", "Unknown filetype" : "Непознат тип на датотека", @@ -30,6 +37,13 @@ "Thu." : "Чет.", "Fri." : "Пет.", "Sat." : "Саб.", + "Su" : "Не", + "Mo" : "По", + "Tu" : "Вт", + "We" : "Ср", + "Th" : "Че", + "Fr" : "Пе", + "Sa" : "Са", "January" : "Јануари", "February" : "Февруари", "March" : "Март", @@ -99,25 +113,31 @@ "Set expiration date" : "Постави рок на траење", "Expiration" : "Истекување", "Expiration date" : "Рок на траење", + "Choose a password for the public link" : "Одбери лозинка за јавниот линк", "Sending ..." : "Праќање...", "Email sent" : "Е-порака пратена", "Resharing is not allowed" : "Повторно споделување не е дозволено", "Share link" : "Сподели ја врската", + "Link" : "Линк", "Password protect" : "Заштити со лозинка", "Password" : "Лозинка", + "Allow editing" : "Овозможи уредување", "Email link to person" : "Прати врска по е-пошта на личност", "Send" : "Прати", "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}", "Shared with you by {owner}" : "Споделено со Вас од {owner}", "Shared in {item} with {user}" : "Споделено во {item} со {user}", "group" : "група", + "remote" : "далечински", "notify by email" : "извести преку електронска пошта", "Unshare" : "Не споделувај", "can share" : "може да споделува", "can edit" : "може да се измени", "create" : "креирај", + "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", + "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Share with users or groups …" : "Сподели со корисници или групи ...", "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...", @@ -128,10 +148,16 @@ "Add" : "Додади", "Edit tags" : "Уреди ги таговите", "No tags selected for deletion." : "Не се селектирани тагови за бришење.", + "unknown text" : "непознат текст", + "Hello world!" : "Здраво свету!", + "sunny" : "сончево", + "Hello {name}" : "Здраво {name}", + "An error occurred." : "Се случи грешка", "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "%s password reset" : "%s ресетирање на лозинката", "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", "New password" : "Нова лозинка", + "New Password" : "Нова лозинка", "Reset password" : "Ресетирај лозинка", "Personal" : "Лично", "Users" : "Корисници", @@ -145,8 +171,11 @@ "Error untagging" : "Грешка при отстранување на таговите", "Error favoriting" : "Грешка при ", "Access forbidden" : "Забранет пристап", + "File not found" : "Датотеката не е пронајдена", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека %s shared %s with you.\nView it: %s\n\n", "Cheers!" : "Поздрав!", + "Internal Server Error" : "Интерна серверска грешка", + "Technical details" : "Технички детали", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", "Username" : "Корисничко име", @@ -157,15 +186,24 @@ "Database name" : "Име на база", "Database tablespace" : "Табела во базата на податоци", "Database host" : "Сервер со база", + "Performance warning" : "Предупредување за перформансите", + "SQLite will be used as database." : "SQLite ќе се користи како база на податоци.", "Finish setup" : "Заврши го подесувањето", "Finishing …" : "Завршувам ...", + "Need help?" : "Ви треба помош?", + "See the documentation" : "Види ја документацијата", "Log out" : "Одјава", "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", + "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", + "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", + "Wrong password." : "Погрешна лозинка.", + "Stay logged in" : "Остани најаваен", "Alternative Logins" : "Алтернативни најавувања", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", - "Thank you for your patience." : "Благодариме на вашето трпение." + "Thank you for your patience." : "Благодариме на вашето трпение.", + "These apps will be updated:" : "Следните апликации чќе бидат надградени:" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index d01f93dd57d..4694f01e1f9 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s", "Repair warning: " : "Advarsel fra reparering: ", "Repair error: " : "Feil ved reparering: ", - "Set log level to debug - current level: \"%s\"" : "Sett loggnivå til feilsøking - nåværende nivå: \"%s\"", - "Reset log level to \"%s\"" : "Tilbakestilt logg-nivå til \"%s\"", + "Starting code integrity check" : "Starter sjekk av kode-integritet", + "Finished code integrity check" : "Ferdig med sjekk av kode-integritet", "%s (3rdparty)" : "%s (3dje-part)", "%s (incompatible)" : "%s (ikke kompatibel)", "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s", @@ -77,6 +77,7 @@ OC.L10N.register( "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Des.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det var problemer med sjekk av kode-integritet. Mer informasjon…</a>", "Settings" : "Innstillinger", "Saving..." : "Lagrer...", "seconds ago" : "for få sekunder siden", @@ -111,6 +112,12 @@ OC.L10N.register( "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a target=\"_blank\" href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er konfigurert som distribuert cache, men feil PHP-module \"memcache\" er installert. \\OC\\Memcache\\Memcached støtter bare \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki om begge modulene</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Noen filer feilet integritets-sjekken. Informasjon for å løse situasjonen finnes i <a target=\"_blank\" href=\"{docLink}\">documentasjonen</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste med ugyldige filer…</a> / <a href=\"{rescanEndpoint}\">Skann på nytt…</a>)", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", @@ -182,6 +189,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.", "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.", "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.", "%s password reset" : "%s tilbakestilling av passord", "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", "New password" : "Nytt passord", @@ -256,6 +264,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", + "Wrong password." : "Feil passord.", "Stay logged in" : "Forbli innlogget", "Alternative Logins" : "Alternative innlogginger", "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.", @@ -263,6 +272,7 @@ OC.L10N.register( "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.", "Thank you for your patience." : "Takk for din tålmodighet.", "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domains\" i config/config.php. Et eksempel på konfigurasjon er gitt i config/config.sample.php.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.", "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene", "App update required" : "App-oppdatering kreves", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index 77f2fa0acfc..e58aed66b3d 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s", "Repair warning: " : "Advarsel fra reparering: ", "Repair error: " : "Feil ved reparering: ", - "Set log level to debug - current level: \"%s\"" : "Sett loggnivå til feilsøking - nåværende nivå: \"%s\"", - "Reset log level to \"%s\"" : "Tilbakestilt logg-nivå til \"%s\"", + "Starting code integrity check" : "Starter sjekk av kode-integritet", + "Finished code integrity check" : "Ferdig med sjekk av kode-integritet", "%s (3rdparty)" : "%s (3dje-part)", "%s (incompatible)" : "%s (ikke kompatibel)", "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s", @@ -75,6 +75,7 @@ "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Des.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det var problemer med sjekk av kode-integritet. Mer informasjon…</a>", "Settings" : "Innstillinger", "Saving..." : "Lagrer...", "seconds ago" : "for få sekunder siden", @@ -109,6 +110,12 @@ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a target=\"_blank\" href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a target=\"_blank\" href=\"{docLink}\">dokumentasjonen</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er konfigurert som distribuert cache, men feil PHP-module \"memcache\" er installert. \\OC\\Memcache\\Memcached støtter bare \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki om begge modulene</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Noen filer feilet integritets-sjekken. Informasjon for å løse situasjonen finnes i <a target=\"_blank\" href=\"{docLink}\">documentasjonen</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste med ugyldige filer…</a> / <a href=\"{rescanEndpoint}\">Skann på nytt…</a>)", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", @@ -180,6 +187,7 @@ "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.", "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.", "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.", "%s password reset" : "%s tilbakestilling av passord", "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", "New password" : "Nytt passord", @@ -254,6 +262,7 @@ "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", + "Wrong password." : "Feil passord.", "Stay logged in" : "Forbli innlogget", "Alternative Logins" : "Alternative innlogginger", "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.", @@ -261,6 +270,7 @@ "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.", "Thank you for your patience." : "Takk for din tålmodighet.", "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domains\" i config/config.php. Et eksempel på konfigurasjon er gitt i config/config.sample.php.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.", "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene", "App update required" : "App-oppdatering kreves", diff --git a/core/l10n/nds.js b/core/l10n/nds.js index 2051b30361a..5e91fe3e687 100644 --- a/core/l10n/nds.js +++ b/core/l10n/nds.js @@ -12,8 +12,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "\"%s\" auf %s aktualisiert", "Repair warning: " : "Reparaturwarnung", "Repair error: " : "Reparaturfehler", - "Set log level to debug - current level: \"%s\"" : "Protokollierungsstufe auf Debug gesetzt - Aktuelle Stufe: \"%s\"", - "Reset log level to \"%s\"" : "Protokollierungsstufe auf \"%s\" zurückgesetzt", "Following apps have been disabled: %s" : "Folgende Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "File is too big" : "Datei ist zu groß", diff --git a/core/l10n/nds.json b/core/l10n/nds.json index cb2f908da76..914dd26b977 100644 --- a/core/l10n/nds.json +++ b/core/l10n/nds.json @@ -10,8 +10,6 @@ "Updated \"%s\" to %s" : "\"%s\" auf %s aktualisiert", "Repair warning: " : "Reparaturwarnung", "Repair error: " : "Reparaturfehler", - "Set log level to debug - current level: \"%s\"" : "Protokollierungsstufe auf Debug gesetzt - Aktuelle Stufe: \"%s\"", - "Reset log level to \"%s\"" : "Protokollierungsstufe auf \"%s\" zurückgesetzt", "Following apps have been disabled: %s" : "Folgende Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "File is too big" : "Datei ist zu groß", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 30fd49ad567..6548a0326fd 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s", "Repair warning: " : "Reparatiewaarschuwing:", "Repair error: " : "Reparatiefout:", - "Set log level to debug - current level: \"%s\"" : "Instellen logniveau op debug - huidige niveau: \"%s\"", - "Reset log level to \"%s\"" : "Terugzetten logniveau op \"#%s\"", "Starting code integrity check" : "Starten code betrouwbaarheidscontrole", "Finished code integrity check" : "Gereed met code betrouwbaarheidscontrole", "%s (3rdparty)" : "%s (3rdparty)", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index c919cc43255..6c240045b35 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s", "Repair warning: " : "Reparatiewaarschuwing:", "Repair error: " : "Reparatiefout:", - "Set log level to debug - current level: \"%s\"" : "Instellen logniveau op debug - huidige niveau: \"%s\"", - "Reset log level to \"%s\"" : "Terugzetten logniveau op \"#%s\"", "Starting code integrity check" : "Starten code betrouwbaarheidscontrole", "Finished code integrity check" : "Gereed met code betrouwbaarheidscontrole", "%s (3rdparty)" : "%s (3rdparty)", diff --git a/core/l10n/oc.js b/core/l10n/oc.js index 8f25978f9c9..1f8330501fb 100644 --- a/core/l10n/oc.js +++ b/core/l10n/oc.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Mesa a jorn de « %s » cap a %s", "Repair warning: " : "Avertiment de reparacion :", "Repair error: " : "Error de reparacion :", - "Set log level to debug - current level: \"%s\"" : "Reglatge del nivèl de log de \"desbug\" - nivèl actual : \"%s\"", - "Reset log level to \"%s\"" : "Reglatge del nivèl de log de \"desbug\" - nivèl actual : \"%s\"", "%s (3rdparty)" : "%s (origina tèrça)", "%s (incompatible)" : "%s (incompatible)", "Following apps have been disabled: %s" : "Las aplicacions seguentas son estadas desactivadas : %s", diff --git a/core/l10n/oc.json b/core/l10n/oc.json index e19930b78db..c6f8536aa06 100644 --- a/core/l10n/oc.json +++ b/core/l10n/oc.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Mesa a jorn de « %s » cap a %s", "Repair warning: " : "Avertiment de reparacion :", "Repair error: " : "Error de reparacion :", - "Set log level to debug - current level: \"%s\"" : "Reglatge del nivèl de log de \"desbug\" - nivèl actual : \"%s\"", - "Reset log level to \"%s\"" : "Reglatge del nivèl de log de \"desbug\" - nivèl actual : \"%s\"", "%s (3rdparty)" : "%s (origina tèrça)", "%s (incompatible)" : "%s (incompatible)", "Following apps have been disabled: %s" : "Las aplicacions seguentas son estadas desactivadas : %s", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 8d774176b1a..f896d164102 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s", "Repair warning: " : "Aviso de reparação:", "Repair error: " : "Reparação de erro:", - "Set log level to debug - current level: \"%s\"" : "Configure o nível de log para debug - nível corrente: \"%s\"", - "Reset log level to \"%s\"" : "Reconfigurar o nível de log para \"%s\"", + "Set log level to debug" : "Definir o nível de log para debug", + "Reset log level" : "Redefinição do nível do log", "Starting code integrity check" : "Inicializando verificação da integridade do código", "Finished code integrity check" : "Finalizada a verificação de integridade do código", "%s (3rdparty)" : "%s (3ºterceiros)", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index e458367e890..9bec04076ae 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s", "Repair warning: " : "Aviso de reparação:", "Repair error: " : "Reparação de erro:", - "Set log level to debug - current level: \"%s\"" : "Configure o nível de log para debug - nível corrente: \"%s\"", - "Reset log level to \"%s\"" : "Reconfigurar o nível de log para \"%s\"", + "Set log level to debug" : "Definir o nível de log para debug", + "Reset log level" : "Redefinição do nível do log", "Starting code integrity check" : "Inicializando verificação da integridade do código", "Finished code integrity check" : "Finalizada a verificação de integridade do código", "%s (3rdparty)" : "%s (3ºterceiros)", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index d3b7e55ca0e..aa369a1cc50 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -13,7 +13,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s", "Repair warning: " : "Aviso de reparação:", "Repair error: " : "Corrija o erro:", - "Reset log level to \"%s\"" : "Reiniciar o nível de registo para \"%s\"", "%s (3rdparty)" : "%s (terceiros)", "%s (incompatible)" : "%s (incompatível)", "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index fe8c66967fa..0299dd05f06 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -11,7 +11,6 @@ "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s", "Repair warning: " : "Aviso de reparação:", "Repair error: " : "Corrija o erro:", - "Reset log level to \"%s\"" : "Reiniciar o nível de registo para \"%s\"", "%s (3rdparty)" : "%s (terceiros)", "%s (incompatible)" : "%s (incompatível)", "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index a9f3994eb2d..c3ca5a8a5aa 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s", "Repair warning: " : "Предупреждение восстановления:", "Repair error: " : "Ошибка восстановления:", - "Set log level to debug - current level: \"%s\"" : "Установить отладочное журналирование - текущий уровень: \"%s\"", - "Reset log level to \"%s\"" : "Сбросить уровень журналирования в \"%s\"", + "Set log level to debug" : "Установить уровень журнала отладки", + "Reset log level" : "Сбросить уровень журнала", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (несовместим)", "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s", @@ -256,6 +256,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", + "Wrong password." : "Неправильный пароль.", "Stay logged in" : "Оставаться в системе", "Alternative Logins" : "Альтернативные имена пользователя", "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index 4589f151c5f..0af31084a04 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s", "Repair warning: " : "Предупреждение восстановления:", "Repair error: " : "Ошибка восстановления:", - "Set log level to debug - current level: \"%s\"" : "Установить отладочное журналирование - текущий уровень: \"%s\"", - "Reset log level to \"%s\"" : "Сбросить уровень журналирования в \"%s\"", + "Set log level to debug" : "Установить уровень журнала отладки", + "Reset log level" : "Сбросить уровень журнала", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (несовместим)", "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s", @@ -254,6 +254,7 @@ "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", + "Wrong password." : "Неправильный пароль.", "Stay logged in" : "Оставаться в системе", "Alternative Logins" : "Альтернативные имена пользователя", "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.", diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js index e170b1adb8e..c8256bf1869 100644 --- a/core/l10n/sk_SK.js +++ b/core/l10n/sk_SK.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s", "Repair warning: " : "Oznámenie opravy:", "Repair error: " : "Chyba opravy:", - "Set log level to debug - current level: \"%s\"" : "Nastaviť úroveň záznamu na debug - aktuálna úroveň: \"%s\"", - "Reset log level to \"%s\"" : "Vrátiť úroveň záznamu na „%s“", "%s (3rdparty)" : "%s (od tretej strany)", "%s (incompatible)" : "%s (nekompatibilná)", "Following apps have been disabled: %s" : "Nasledovné aplikácie boli zakázané: %s", diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json index 2309fd4dc47..3379984db23 100644 --- a/core/l10n/sk_SK.json +++ b/core/l10n/sk_SK.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s", "Repair warning: " : "Oznámenie opravy:", "Repair error: " : "Chyba opravy:", - "Set log level to debug - current level: \"%s\"" : "Nastaviť úroveň záznamu na debug - aktuálna úroveň: \"%s\"", - "Reset log level to \"%s\"" : "Vrátiť úroveň záznamu na „%s“", "%s (3rdparty)" : "%s (od tretej strany)", "%s (incompatible)" : "%s (nekompatibilná)", "Following apps have been disabled: %s" : "Nasledovné aplikácie boli zakázané: %s", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index 46580d8c4ed..c22f5a9a414 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s", "Repair warning: " : "Opozorilo popravila:", "Repair error: " : "Napaka popravila:", - "Set log level to debug - current level: \"%s\"" : "Stopnja dnevnika nastavljena na razhroščevanje - trenutna stopnja: \"%s\"", - "Reset log level to \"%s\"" : "Stopnja dnevnika ponastavljena na \"%s\"", "%s (3rdparty)" : "%s (zunanje)", "%s (incompatible)" : "%s (neskladno)", "Following apps have been disabled: %s" : "Sledeče aplikacije so blie izključene: %s", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index ae52da630ae..a5b1633783e 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s", "Repair warning: " : "Opozorilo popravila:", "Repair error: " : "Napaka popravila:", - "Set log level to debug - current level: \"%s\"" : "Stopnja dnevnika nastavljena na razhroščevanje - trenutna stopnja: \"%s\"", - "Reset log level to \"%s\"" : "Stopnja dnevnika ponastavljena na \"%s\"", "%s (3rdparty)" : "%s (zunanje)", "%s (incompatible)" : "%s (neskladno)", "Following apps have been disabled: %s" : "Sledeče aplikacije so blie izključene: %s", diff --git a/core/l10n/sq.js b/core/l10n/sq.js index d9c07f39da3..6baa6019ad3 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -16,8 +16,8 @@ OC.L10N.register( "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s", "Repair warning: " : "Sinjalizim ndreqjeje: ", "Repair error: " : "Gabim ndreqjeje: ", - "Set log level to debug - current level: \"%s\"" : "Caktoni debug si nivel regjistri - niveli i tanishëm: \"%s\"", - "Reset log level to \"%s\"" : "Riktheni nivel regjistri në \"%s\"", + "Set log level to debug" : "Caktoni shkallë regjistrimi për diagnostikimin", + "Reset log level" : "Rikthe te parazgjedhja shkallën e regjistrimit", "Starting code integrity check" : "Po fillohet kontroll integriteti për kodin", "Finished code integrity check" : "Përfundoi kontrolli i integritetit për kodin", "%s (3rdparty)" : "%s (prej palësh të treta)", @@ -249,7 +249,7 @@ OC.L10N.register( "Database tablespace" : "Tablespace-i i database-it", "Database host" : "Strehë baze të dhënash", "Performance warning" : "Sinjalizim funksionimi", - "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQL-ja.", + "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQLite.", "For larger installations we recommend to choose a different database backend." : "Për instalime më të mëdha këshillojmë të zgjidhni një tjetër program shërbyesi baze të dhënash.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Përdorimi i SQLite-it shkëshillohet veçanërisht, kur për njëkohësim kartelash përdoret klienti desktop.", "Finish setup" : "Përfundoje rregullimin", diff --git a/core/l10n/sq.json b/core/l10n/sq.json index 4653279c624..d8232ffeb74 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -14,8 +14,8 @@ "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s", "Repair warning: " : "Sinjalizim ndreqjeje: ", "Repair error: " : "Gabim ndreqjeje: ", - "Set log level to debug - current level: \"%s\"" : "Caktoni debug si nivel regjistri - niveli i tanishëm: \"%s\"", - "Reset log level to \"%s\"" : "Riktheni nivel regjistri në \"%s\"", + "Set log level to debug" : "Caktoni shkallë regjistrimi për diagnostikimin", + "Reset log level" : "Rikthe te parazgjedhja shkallën e regjistrimit", "Starting code integrity check" : "Po fillohet kontroll integriteti për kodin", "Finished code integrity check" : "Përfundoi kontrolli i integritetit për kodin", "%s (3rdparty)" : "%s (prej palësh të treta)", @@ -247,7 +247,7 @@ "Database tablespace" : "Tablespace-i i database-it", "Database host" : "Strehë baze të dhënash", "Performance warning" : "Sinjalizim funksionimi", - "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQL-ja.", + "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQLite.", "For larger installations we recommend to choose a different database backend." : "Për instalime më të mëdha këshillojmë të zgjidhni një tjetër program shërbyesi baze të dhënash.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Përdorimi i SQLite-it shkëshillohet veçanërisht, kur për njëkohësim kartelash përdoret klienti desktop.", "Finish setup" : "Përfundoje rregullimin", diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 3daabec936b..c08a74cd8d5 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s", "Repair warning: " : "เตือนการซ่อมแซม:", "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:", - "Set log level to debug - current level: \"%s\"" : "การตั้งค่าระดับของการบันทึกเพื่อแก้ปัญหา - ระดับปัจจุบันคือ: \"%s\"", - "Reset log level to \"%s\"" : "รีเซ็ทระดับการบันทึกเป็น \"%s\"", "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์", "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น", "%s (3rdparty)" : "%s (บุคคลที่ 3)", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 885cf348fdd..fd2205fac5c 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s", "Repair warning: " : "เตือนการซ่อมแซม:", "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:", - "Set log level to debug - current level: \"%s\"" : "การตั้งค่าระดับของการบันทึกเพื่อแก้ปัญหา - ระดับปัจจุบันคือ: \"%s\"", - "Reset log level to \"%s\"" : "รีเซ็ทระดับการบันทึกเป็น \"%s\"", "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์", "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น", "%s (3rdparty)" : "%s (บุคคลที่ 3)", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index b71cf996a9e..52729dd19a8 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi", "Repair warning: " : "Onarım uyarısı:", "Repair error: " : "Onarım hatası:", - "Set log level to debug - current level: \"%s\"" : "Günlük seviyesini hata ayıklamaya ayarla - geçerli seviye: \"%s\"", - "Reset log level to \"%s\"" : "Günlük seviyesini \"%s\" olarak sıfırla", "%s (3rdparty)" : "%s (3.parti)", "%s (incompatible)" : "%s (uyumsuz)", "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index 48acac9350c..6b4b26c6a5d 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi", "Repair warning: " : "Onarım uyarısı:", "Repair error: " : "Onarım hatası:", - "Set log level to debug - current level: \"%s\"" : "Günlük seviyesini hata ayıklamaya ayarla - geçerli seviye: \"%s\"", - "Reset log level to \"%s\"" : "Günlük seviyesini \"%s\" olarak sıfırla", "%s (3rdparty)" : "%s (3.parti)", "%s (incompatible)" : "%s (uyumsuz)", "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 763501f066a..255628f351e 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", - "Set log level to debug - current level: \"%s\"" : "设置日志级别为 调试 - 目前级别：%s", - "Reset log level to \"%s\"" : "重设日志级别为 \"%s\"", "%s (3rdparty)" : "%s (第三方)", "%s (incompatible)" : "%s (不兼容)", "Following apps have been disabled: %s" : "下列应用已经被禁用：%s", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index aa24a672d77..bf9f6b2ad60 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", - "Set log level to debug - current level: \"%s\"" : "设置日志级别为 调试 - 目前级别：%s", - "Reset log level to \"%s\"" : "重设日志级别为 \"%s\"", "%s (3rdparty)" : "%s (第三方)", "%s (incompatible)" : "%s (不兼容)", "Following apps have been disabled: %s" : "下列应用已经被禁用：%s", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 69a62cf8eb3..6f7bfb8a0fd 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -16,8 +16,6 @@ OC.L10N.register( "Updated \"%s\" to %s" : "已更新 %s 到 %s", "Repair warning: " : "修復警告：", "Repair error: " : "修復錯誤", - "Set log level to debug - current level: \"%s\"" : "設定除錯記錄層級 - 目前層級: \"%s\"", - "Reset log level to \"%s\"" : "重設記錄層級為 \"%s\"", "%s (3rdparty)" : "%s (第3方)", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 66750009ba6..f4c495a6d11 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -14,8 +14,6 @@ "Updated \"%s\" to %s" : "已更新 %s 到 %s", "Repair warning: " : "修復警告：", "Repair error: " : "修復錯誤", - "Set log level to debug - current level: \"%s\"" : "設定除錯記錄層級 - 目前層級: \"%s\"", - "Reset log level to \"%s\"" : "重設記錄層級為 \"%s\"", "%s (3rdparty)" : "%s (第3方)", "%s (incompatible)" : "%s (不相容的)", "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s", diff --git a/lib/base.php b/lib/base.php index 34cbfe3066c..2cace2a0a06 100644 --- a/lib/base.php +++ b/lib/base.php @@ -442,7 +442,7 @@ class OC { if (!$session->exists('SID_CREATED')) { $session->set('SID_CREATED', time()); } else if (time() - $session->get('SID_CREATED') > $sessionLifeTime / 2) { - session_regenerate_id(true); + $session->regenerateId(); $session->set('SID_CREATED', time()); } diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js index 881388b4eac..0129d33517f 100644 --- a/lib/l10n/mk.js +++ b/lib/l10n/mk.js @@ -32,6 +32,7 @@ OC.L10N.register( "Apps" : "Аппликации", "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ", "A valid password must be provided" : "Мора да се обезбеди валидна лозинка", - "The username is already being used" : "Корисничкото име е веќе во употреба" + "The username is already being used" : "Корисничкото име е веќе во употреба", + "Storage not available" : "Сториџот не е достапен" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json index 7dbfab7f01f..3a05e15b74b 100644 --- a/lib/l10n/mk.json +++ b/lib/l10n/mk.json @@ -30,6 +30,7 @@ "Apps" : "Аппликации", "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ", "A valid password must be provided" : "Мора да се обезбеди валидна лозинка", - "The username is already being used" : "Корисничкото име е веќе во употреба" + "The username is already being used" : "Корисничкото име е веќе во употреба", + "Storage not available" : "Сториџот не е достапен" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js index a8ea9cca6ab..b7fa5a63510 100644 --- a/lib/l10n/nb_NO.js +++ b/lib/l10n/nb_NO.js @@ -96,6 +96,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt", "Sharing %s failed, because sharing with links is not allowed" : "Deling av %s feilet, fordi deling med lenker ikke er tillatt", + "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket.", "Share type %s is not valid for %s" : "Delingstype %s er ikke gyldig for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s", @@ -147,6 +148,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Data-mappe (%s) er ugyldig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.", "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\".", - "Storage not available" : "Lagringsplass ikke tilgjengelig" + "Storage unauthorized. %s" : "Lager uautorisert: %s", + "Storage incomplete configuration. %s" : "Ikke komplett oppsett for lager. %s", + "Storage connection error. %s" : "Tilkoblingsfeil for lager. %s", + "Storage not available" : "Lagringsplass ikke tilgjengelig", + "Storage connection timeout. %s" : "Tidsavbrudd ved tilkobling av lager: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json index 22a3154f8f3..a2a2a9c1b7f 100644 --- a/lib/l10n/nb_NO.json +++ b/lib/l10n/nb_NO.json @@ -94,6 +94,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt", "Sharing %s failed, because sharing with links is not allowed" : "Deling av %s feilet, fordi deling med lenker ikke er tillatt", + "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket.", "Share type %s is not valid for %s" : "Delingstype %s er ikke gyldig for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s", @@ -145,6 +146,10 @@ "Data directory (%s) is invalid" : "Data-mappe (%s) er ugyldig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.", "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\".", - "Storage not available" : "Lagringsplass ikke tilgjengelig" + "Storage unauthorized. %s" : "Lager uautorisert: %s", + "Storage incomplete configuration. %s" : "Ikke komplett oppsett for lager. %s", + "Storage connection error. %s" : "Tilkoblingsfeil for lager. %s", + "Storage not available" : "Lagringsplass ikke tilgjengelig", + "Storage connection timeout. %s" : "Tidsavbrudd ved tilkobling av lager: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index 6b5932c0b55..3a33d471e50 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -96,6 +96,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Не удалось поделиться %s, пользователь %s не является членом группы %s", "You need to provide a password to create a public link, only protected links are allowed" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки", "Sharing %s failed, because sharing with links is not allowed" : "Не удалось поделиться %s, открытие доступа по ссылке запрещено", + "Not allowed to create a federated share with the same user" : "Не допускается создание федеративного общего ресурса с тем-же пользователем", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %s, возможно, сервер не доступен.", "Share type %s is not valid for %s" : "Тип общего доступа %s недопустим для %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Не удалось настроить права доступа для %s, указанные права доступа превышают предоставленные для %s", @@ -147,6 +148,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Каталог данных (%s) не верен", "Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.", "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\"", - "Storage not available" : "Хранилище недоступно" + "Storage unauthorized. %s" : "Хранилище неавторизовано. %s", + "Storage incomplete configuration. %s" : "Неполная конфигурация хранилища. %s", + "Storage connection error. %s" : "Ошибка подключения к хранилищу. %s", + "Storage not available" : "Хранилище недоступно", + "Storage connection timeout. %s" : "Истекло время ожидания подключения к хранилищу. %s" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 62567fd749a..8851ea0ac0a 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -94,6 +94,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Не удалось поделиться %s, пользователь %s не является членом группы %s", "You need to provide a password to create a public link, only protected links are allowed" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки", "Sharing %s failed, because sharing with links is not allowed" : "Не удалось поделиться %s, открытие доступа по ссылке запрещено", + "Not allowed to create a federated share with the same user" : "Не допускается создание федеративного общего ресурса с тем-же пользователем", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %s, возможно, сервер не доступен.", "Share type %s is not valid for %s" : "Тип общего доступа %s недопустим для %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Не удалось настроить права доступа для %s, указанные права доступа превышают предоставленные для %s", @@ -145,6 +146,10 @@ "Data directory (%s) is invalid" : "Каталог данных (%s) не верен", "Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.", "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\"", - "Storage not available" : "Хранилище недоступно" + "Storage unauthorized. %s" : "Хранилище неавторизовано. %s", + "Storage incomplete configuration. %s" : "Неполная конфигурация хранилища. %s", + "Storage connection error. %s" : "Ошибка подключения к хранилищу. %s", + "Storage not available" : "Хранилище недоступно", + "Storage connection timeout. %s" : "Истекло время ожидания подключения к хранилищу. %s" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/lib/private/app.php b/lib/private/app.php index 5f6ca9596c8..500a60060e6 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -760,9 +760,12 @@ class OC_App { * @param bool $onlyLocal * @param bool $includeUpdateInfo Should we check whether there is an update * in the app store? + * @param OCSClient $ocsClient * @return array */ - public static function listAllApps($onlyLocal = false, $includeUpdateInfo = true) { + public static function listAllApps($onlyLocal = false, + $includeUpdateInfo = true, + OCSClient $ocsClient) { $installedApps = OC_App::getAllApps(); //TODO which apps do we want to blacklist and how do we integrate @@ -825,7 +828,7 @@ class OC_App { if ($onlyLocal) { $remoteApps = []; } else { - $remoteApps = OC_App::getAppstoreApps(); + $remoteApps = OC_App::getAppstoreApps('approved', null, $ocsClient); } if ($remoteApps) { // Remove duplicates @@ -865,20 +868,16 @@ class OC_App { /** * Get a list of all apps on the appstore * @param string $filter - * @param string $category + * @param string|null $category + * @param OCSClient $ocsClient * @return array|bool multi-dimensional array of apps. * Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description */ - public static function getAppstoreApps($filter = 'approved', $category = null) { + public static function getAppstoreApps($filter = 'approved', + $category = null, + OCSClient $ocsClient) { $categories = [$category]; - $ocsClient = new OCSClient( - \OC::$server->getHTTPClientService(), - \OC::$server->getConfig(), - \OC::$server->getLogger() - ); - - if (is_null($category)) { $categoryNames = $ocsClient->getCategories(\OCP\Util::getVersion()); if (is_array($categoryNames)) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index fcea4828c49..357f854e5e2 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -86,6 +86,8 @@ class View { private $updaterEnabled = true; + private $userManager; + /** * @param string $root * @throws \Exception If $root contains an invalid path @@ -101,6 +103,7 @@ class View { $this->fakeRoot = $root; $this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider); + $this->userManager = \OC::$server->getUserManager(); } public function getAbsolutePath($path = '/') { @@ -1196,7 +1199,7 @@ class View { * @return \OC\User\User */ private function getUserObjectForOwner($ownerId) { - $owner = \OC::$server->getUserManager()->get($ownerId); + $owner = $this->userManager->get($ownerId); if ($owner instanceof IUser) { return $owner; } else { @@ -1339,11 +1342,12 @@ class View { $folderId = $data['fileid']; $contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter + $sharingDisabled = \OCP\Util::isSharingDisabledForUser(); /** * @var \OC\Files\FileInfo[] $files */ - $files = array_map(function (array $content) use ($path, $storage, $mount) { - if (\OCP\Util::isSharingDisabledForUser()) { + $files = array_map(function (array $content) use ($path, $storage, $mount, $sharingDisabled) { + if ($sharingDisabled) { $content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE; } $owner = $this->getUserObjectForOwner($storage->getOwner($content['path'])); diff --git a/lib/private/image.php b/lib/private/image.php index 4ca9b811100..a5de7e86b94 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -39,17 +39,19 @@ * Class for basic image manipulation */ class OC_Image implements \OCP\IImage { + /** @var false|resource */ protected $resource = false; // tmp resource. + /** @var int */ protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident. - protected $mimeType = "image/png"; // Default to png + /** @var string */ + protected $mimeType = 'image/png'; // Default to png + /** @var int */ protected $bitDepth = 24; + /** @var null|string */ protected $filePath = null; - + /** @var finfo */ private $fileInfo; - - /** - * @var \OCP\ILogger - */ + /** @var \OCP\ILogger */ private $logger; /** diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php index be69150d877..e455824a8dd 100644 --- a/lib/private/log/owncloud.php +++ b/lib/private/log/owncloud.php @@ -73,7 +73,7 @@ class OC_Log_Owncloud { } catch (Exception $e) { $timezone = new DateTimeZone('UTC'); } - $time = DateTime::createFromFormat("U.u", microtime(true), $timezone); + $time = DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""), $timezone); if ($time === false) { $time = new DateTime(null, $timezone); } diff --git a/lib/private/route/router.php b/lib/private/route/router.php index f144c543989..8d31d448855 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -328,7 +328,11 @@ class Router implements IRouter { public function generate($name, $parameters = array(), $absolute = false) { $this->loadRoutes(); try { - return $this->getGenerator()->generate($name, $parameters, $absolute); + $referenceType = UrlGenerator::ABSOLUTE_URL; + if ($absolute === false) { + $referenceType = UrlGenerator::ABSOLUTE_PATH; + } + return $this->getGenerator()->generate($name, $parameters, $referenceType); } catch (RouteNotFoundException $e) { $this->logger->logException($e); return ''; diff --git a/lib/private/servercontainer.php b/lib/private/servercontainer.php index 856e3f9b495..385700957a1 100644 --- a/lib/private/servercontainer.php +++ b/lib/private/servercontainer.php @@ -75,7 +75,7 @@ class ServerContainer extends SimpleContainer { // the apps container first. if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) { $segments = explode('\\', $name); - $appContainer = $this->getAppContainer(strtolower($segments[0])); + $appContainer = $this->getAppContainer(strtolower($segments[1])); try { return $appContainer->query($name); } catch (QueryException $e) { diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php index dcae1648fe1..b600874412b 100644 --- a/lib/private/session/cryptosessiondata.php +++ b/lib/private/session/cryptosessiondata.php @@ -132,6 +132,16 @@ class CryptoSessionData implements \ArrayAccess, ISession { } /** + * Wrapper around session_regenerate_id + * + * @param bool $deleteOldSession Whether to delete the old associated session file or not. + * @return void + */ + public function regenerateId($deleteOldSession = true) { + $this->session->regenerateId($deleteOldSession); + } + + /** * Close the session and release the lock, also writes all changed data in batch */ public function close() { diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php index 0b6152acf12..8be3356c6db 100644 --- a/lib/private/session/internal.php +++ b/lib/private/session/internal.php @@ -89,10 +89,9 @@ class Internal extends Session { } } - public function clear() { session_unset(); - @session_regenerate_id(true); + $this->regenerateId(); @session_start(); $_SESSION = array(); } @@ -102,14 +101,35 @@ class Internal extends Session { parent::close(); } - public function reopen() { - throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.'); - } + /** + * Wrapper around session_regenerate_id + * + * @param bool $deleteOldSession Whether to delete the old associated session file or not. + * @return void + */ + public function regenerateId($deleteOldSession = true) { + @session_regenerate_id($deleteOldSession); + } + + /** + * @throws \Exception + */ + public function reopen() { + throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.'); + } + /** + * @param int $errorNumber + * @param string $errorString + * @throws \ErrorException + */ public function trapError($errorNumber, $errorString) { throw new \ErrorException($errorString); } + /** + * @throws \Exception + */ private function validateSession() { if ($this->sessionClosed) { throw new \Exception('Session has been closed - no further changes to the session are allowed'); diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php index ff95efc5345..c6090087457 100644 --- a/lib/private/session/memory.php +++ b/lib/private/session/memory.php @@ -81,6 +81,13 @@ class Memory extends Session { } /** + * Stub since the session ID does not need to get regenerated for the cache + * + * @param bool $deleteOldSession + */ + public function regenerateId($deleteOldSession = true) {} + + /** * Helper function for PHPUnit execution - don't use in non-test code */ public function reopen() { diff --git a/lib/private/user.php b/lib/private/user.php index cfa60d675fe..fa1cea9072f 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -162,7 +162,6 @@ class OC_User { * Log in a user and regenerate a new session - if the password is ok */ public static function login($loginname, $password) { - session_regenerate_id(true); $result = self::getUserSession()->login($loginname, $password); if ($result) { //we need to pass the user name, which may differ from login name diff --git a/lib/private/user/session.php b/lib/private/user/session.php index ba702c9f365..be38b1b1d8e 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -213,6 +213,7 @@ class Session implements IUserSession, Emitter { * @throws LoginException */ public function login($uid, $password) { + $this->session->regenerateId(); $this->manager->emit('\OC\User', 'preLogin', array($uid, $password)); $user = $this->manager->checkPassword($uid, $password); if ($user !== false) { @@ -243,6 +244,7 @@ class Session implements IUserSession, Emitter { * @return bool */ public function loginWithCookie($uid, $currentToken) { + $this->session->regenerateId(); $this->manager->emit('\OC\User', 'preRememberedLogin', array($uid)); $user = $this->manager->get($uid); if (is_null($user)) { diff --git a/lib/public/isession.php b/lib/public/isession.php index aee635d7a9d..89a181ad0fd 100644 --- a/lib/public/isession.php +++ b/lib/public/isession.php @@ -86,4 +86,12 @@ interface ISession { */ public function close(); + /** + * Wrapper around session_regenerate_id + * + * @param bool $deleteOldSession Whether to delete the old associated session file or not. + * @return void + * @since 9.0.0 + */ + public function regenerateId($deleteOldSession = true); } diff --git a/lib/repair/dropoldtables.php b/lib/repair/dropoldtables.php index e8b0eba61d4..2d7fc8376b3 100644 --- a/lib/repair/dropoldtables.php +++ b/lib/repair/dropoldtables.php @@ -77,6 +77,7 @@ class DropOldTables extends BasicEmitter implements RepairStep { 'file_map', 'foldersize', 'fscache', + 'gallery_sharing', 'locks', 'log', 'media_albums', diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index d2430f9b559..765fe2d2850 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -218,7 +218,7 @@ class AppSettingsController extends Controller { break; // not-installed apps case 1: - $apps = \OC_App::listAllApps(true, $includeUpdateInfo); + $apps = \OC_App::listAllApps(true, $includeUpdateInfo, $this->ocsClient); $apps = array_filter($apps, function ($app) { return !$app['active']; }); @@ -244,7 +244,7 @@ class AppSettingsController extends Controller { default: $filter = $this->config->getSystemValue('appstore.experimental.enabled', false) ? 'all' : 'approved'; - $apps = \OC_App::getAppstoreApps($filter, $category); + $apps = \OC_App::getAppstoreApps($filter, $category, $this->ocsClient); if (!$apps) { $apps = array(); } else { @@ -310,7 +310,7 @@ class AppSettingsController extends Controller { * @return array */ private function getInstalledApps($includeUpdateInfo = true) { - $apps = \OC_App::listAllApps(true, $includeUpdateInfo); + $apps = \OC_App::listAllApps(true, $includeUpdateInfo, $this->ocsClient); $apps = array_filter($apps, function ($app) { return $app['active']; }); diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js index c4b24e2e4ad..b6b17974408 100644 --- a/settings/l10n/ar.js +++ b/settings/l10n/ar.js @@ -82,7 +82,6 @@ OC.L10N.register( "Forum" : "منتدى", "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك", "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>", "Password" : "كلمة المرور", "Unable to change your password" : "لم يتم تعديل كلمة السر بنجاح", "Current password" : "كلمات السر الحالية", diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json index 18e50c1c0e3..770e2856261 100644 --- a/settings/l10n/ar.json +++ b/settings/l10n/ar.json @@ -80,7 +80,6 @@ "Forum" : "منتدى", "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك", "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>", "Password" : "كلمة المرور", "Unable to change your password" : "لم يتم تعديل كلمة السر بنجاح", "Current password" : "كلمات السر الحالية", diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js index 9a5b7a4e882..8bca7c8c0d2 100644 --- a/settings/l10n/ast.js +++ b/settings/l10n/ast.js @@ -127,7 +127,6 @@ OC.L10N.register( "Android app" : "Aplicación d'Android", "iOS app" : "Aplicación d'iOS", "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "Nun pudo camudase la contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json index 13dd87a9434..e824763c7aa 100644 --- a/settings/l10n/ast.json +++ b/settings/l10n/ast.json @@ -125,7 +125,6 @@ "Android app" : "Aplicación d'Android", "iOS app" : "Aplicación d'iOS", "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "Nun pudo camudase la contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/az.js b/settings/l10n/az.js index 6a354b0c9a1..01a15f5fb7d 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -173,7 +173,6 @@ OC.L10N.register( "iOS app" : "iOS proqramı", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Əgər siz proektə dəstək vermək istəyirsinizsə\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">Təkmilləşdirməyə üzv</a>\n\t\tyada\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">söz yaymaq</a>!", "Show First Run Wizard again" : "İlk işəsalma sehirbazını yenidən göstər", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Siz istifadə etdiniz <strong>%s</strong> mövcud olan <strong>%s</strong>", "Password" : "Şifrə", "Unable to change your password" : "Sizin şifrəni dəyişmək mümkün olmadı", "Current password" : "Hazırkı şifrə", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 1093ff98cf1..8e09dc87fc2 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -171,7 +171,6 @@ "iOS app" : "iOS proqramı", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Əgər siz proektə dəstək vermək istəyirsinizsə\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">Təkmilləşdirməyə üzv</a>\n\t\tyada\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">söz yaymaq</a>!", "Show First Run Wizard again" : "İlk işəsalma sehirbazını yenidən göstər", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Siz istifadə etdiniz <strong>%s</strong> mövcud olan <strong>%s</strong>", "Password" : "Şifrə", "Unable to change your password" : "Sizin şifrəni dəyişmək mümkün olmadı", "Current password" : "Hazırkı şifrə", diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js index c1d50044b3c..81b20601291 100644 --- a/settings/l10n/bg_BG.js +++ b/settings/l10n/bg_BG.js @@ -173,7 +173,6 @@ OC.L10N.register( "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разпространи мълвата</a>!", "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.", "Password" : "Парола", "Unable to change your password" : "Неуспешна промяна на паролата.", "Current password" : "Текуща парола", diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json index 154d832d781..0bcb30520e3 100644 --- a/settings/l10n/bg_BG.json +++ b/settings/l10n/bg_BG.json @@ -171,7 +171,6 @@ "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разпространи мълвата</a>!", "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.", "Password" : "Парола", "Unable to change your password" : "Неуспешна промяна на паролата.", "Current password" : "Текуща парола", diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js index aecaf471c85..3e9e28da9a5 100644 --- a/settings/l10n/bn_BD.js +++ b/settings/l10n/bn_BD.js @@ -55,7 +55,6 @@ OC.L10N.register( "Forum" : "ফোরাম", "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন", "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন <strong>%s</strong>, সুলভ <strong>%s</strong> এর মধ্যে।", "Password" : "কূটশব্দ", "Unable to change your password" : "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়", "Current password" : "বর্তমান কূটশব্দ", diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json index bb06c3f2fac..ec57244bb72 100644 --- a/settings/l10n/bn_BD.json +++ b/settings/l10n/bn_BD.json @@ -53,7 +53,6 @@ "Forum" : "ফোরাম", "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন", "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন <strong>%s</strong>, সুলভ <strong>%s</strong> এর মধ্যে।", "Password" : "কূটশব্দ", "Unable to change your password" : "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়", "Current password" : "বর্তমান কূটশব্দ", diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js index 7dad6db6875..b209de0e714 100644 --- a/settings/l10n/bs.js +++ b/settings/l10n/bs.js @@ -145,7 +145,6 @@ OC.L10N.register( "Android app" : "Android aplikacija", "iOS app" : "iOS aplikacija", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>", "Password" : "Lozinka", "Unable to change your password" : "Vašu lozinku nije moguće promijeniti", "Current password" : "Trenutna lozinka", diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json index 5cae7661981..f85499598da 100644 --- a/settings/l10n/bs.json +++ b/settings/l10n/bs.json @@ -143,7 +143,6 @@ "Android app" : "Android aplikacija", "iOS app" : "iOS aplikacija", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>", "Password" : "Lozinka", "Unable to change your password" : "Vašu lozinku nije moguće promijeniti", "Current password" : "Trenutna lozinka", diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js index b3ea1aa7cf2..798f6c39595 100644 --- a/settings/l10n/ca.js +++ b/settings/l10n/ca.js @@ -199,7 +199,6 @@ OC.L10N.register( "iOS app" : "aplicació para iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!", "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>", "Password" : "Contrasenya", "Unable to change your password" : "No s'ha pogut canviar la contrasenya", "Current password" : "Contrasenya actual", diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json index 3cb8c962c30..00f13762a83 100644 --- a/settings/l10n/ca.json +++ b/settings/l10n/ca.json @@ -197,7 +197,6 @@ "iOS app" : "aplicació para iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vol recolzar el projecte\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> unir-se al desenvolupament</a>\n⇥⇥o\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> difondre'l !</a>!", "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>", "Password" : "Contrasenya", "Unable to change your password" : "No s'ha pogut canviar la contrasenya", "Current password" : "Contrasenya actual", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 84939c5ca5d..c9fcc22e379 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -230,7 +230,6 @@ OC.L10N.register( "iOS app" : "iOS aplikace", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných", "Password" : "Heslo", "Unable to change your password" : "Změna vašeho hesla se nezdařila", "Current password" : "Současné heslo", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index c5c95cfc119..43b692760f0 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -228,7 +228,6 @@ "iOS app" : "iOS aplikace", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">přidejte se k jeho vývoji</a>\n\t\tnebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">šiřte osvětu</a>!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných", "Password" : "Heslo", "Unable to change your password" : "Změna vašeho hesla se nezdařila", "Current password" : "Současné heslo", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index 4fef120f1bc..e5f7a694375 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -222,7 +222,6 @@ OC.L10N.register( "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!", "Show First Run Wizard again" : "Vis guiden for første kørsel igen.", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>", "Password" : "Kodeord", "Unable to change your password" : "Ude af stand til at ændre dit kodeord", "Current password" : "Nuværende adgangskode", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index d535bdb38af..8313714699f 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -220,7 +220,6 @@ "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte projektet, så\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spred budskabet</a>!", "Show First Run Wizard again" : "Vis guiden for første kørsel igen.", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>", "Password" : "Kodeord", "Unable to change your password" : "Ude af stand til at ændre dit kodeord", "Current password" : "Nuværende adgangskode", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 2034a6650e7..2c4d7f146b8 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -225,7 +225,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>", "Password" : "Passwort", "Unable to change your password" : "Passwort konnte nicht geändert werden", "Current password" : "Aktuelles Passwort", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 31f677bd66b..9fb9bdf5394 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -223,7 +223,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>", "Password" : "Passwort", "Unable to change your password" : "Passwort konnte nicht geändert werden", "Current password" : "Aktuelles Passwort", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index bb25af16451..dba37d5a873 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -219,7 +219,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>", "Password" : "Passwort", "Unable to change your password" : "Das Passwort konnte nicht geändert werden", "Current password" : "Aktuelles Passwort", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 503b76e4839..ae3a477c8d2 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -217,7 +217,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>", "Password" : "Passwort", "Unable to change your password" : "Das Passwort konnte nicht geändert werden", "Current password" : "Aktuelles Passwort", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 1c7212d2ecd..77fd2c3a824 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -229,7 +229,6 @@ OC.L10N.register( "iOS app" : "Εφαρμογή iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!", "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα", "Password" : "Συνθηματικό", "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης", "Current password" : "Τρέχων συνθηματικό", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index e4d0876661a..0c343a29e77 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -227,7 +227,6 @@ "iOS app" : "Εφαρμογή iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Εάν θέλετε να υποστηρίξετε το έργο\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">συμμετέχετε στην ανάπτυξη</a>\n\t\tή\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">διαδόστε το μήνυμα</a>!", "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα", "Password" : "Συνθηματικό", "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης", "Current password" : "Τρέχων συνθηματικό", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index d79cc98dc07..e8d0cc3e5ee 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -208,7 +208,6 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!", "Show First Run Wizard again" : "Show First Run Wizard again", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>", "Password" : "Password", "Unable to change your password" : "Unable to change your password", "Current password" : "Current password", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index dcfbf01467f..37d3f31b453 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -206,7 +206,6 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!", "Show First Run Wizard again" : "Show First Run Wizard again", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>", "Password" : "Password", "Unable to change your password" : "Unable to change your password", "Current password" : "Current password", diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js index 1f937b22aa3..215fec4d705 100644 --- a/settings/l10n/eo.js +++ b/settings/l10n/eo.js @@ -88,7 +88,6 @@ OC.L10N.register( "Uninstall App" : "Malinstali aplikaĵon", "Forum" : "Forumo", "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>", "Password" : "Pasvorto", "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton", "Current password" : "Nuna pasvorto", diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json index dad80fad168..1e2441717fb 100644 --- a/settings/l10n/eo.json +++ b/settings/l10n/eo.json @@ -86,7 +86,6 @@ "Uninstall App" : "Malinstali aplikaĵon", "Forum" : "Forumo", "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>", "Password" : "Pasvorto", "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton", "Current password" : "Nuna pasvorto", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 27a87685f2e..c0ddd8320f0 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -226,7 +226,6 @@ OC.L10N.register( "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No se ha podido cambiar su contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 1213c099622..43bfa420e22 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -224,7 +224,6 @@ "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si quiere colaborar con el proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">participe en el desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">difúndalo</a>!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No se ha podido cambiar su contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js index ed34e871e83..860933eea26 100644 --- a/settings/l10n/es_AR.js +++ b/settings/l10n/es_AR.js @@ -98,7 +98,6 @@ OC.L10N.register( "Android app" : "App para Android", "iOS app" : "App para iOS", "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No fue posible cambiar tu contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json index f337de3b801..c4c088c5f5f 100644 --- a/settings/l10n/es_AR.json +++ b/settings/l10n/es_AR.json @@ -96,7 +96,6 @@ "Android app" : "App para Android", "iOS app" : "App para iOS", "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No fue posible cambiar tu contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js index 1b3a2ffff59..05f73194b8a 100644 --- a/settings/l10n/es_MX.js +++ b/settings/l10n/es_MX.js @@ -70,7 +70,6 @@ OC.L10N.register( "Forum" : "Foro", "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No se ha podido cambiar su contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json index d7a6527f4f7..beaa6fc1d99 100644 --- a/settings/l10n/es_MX.json +++ b/settings/l10n/es_MX.json @@ -68,7 +68,6 @@ "Forum" : "Foro", "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles", "Password" : "Contraseña", "Unable to change your password" : "No se ha podido cambiar su contraseña", "Current password" : "Contraseña actual", diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js index e3dfdda45ac..73111e8f0e9 100644 --- a/settings/l10n/et_EE.js +++ b/settings/l10n/et_EE.js @@ -185,7 +185,6 @@ OC.L10N.register( "Android app" : "Androidi rakendus", "iOS app" : "iOS-i rakendus", "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>", "Password" : "Parool", "Unable to change your password" : "Sa ei saa oma parooli muuta", "Current password" : "Praegune parool", diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json index c8e3626965e..b6172f92370 100644 --- a/settings/l10n/et_EE.json +++ b/settings/l10n/et_EE.json @@ -183,7 +183,6 @@ "Android app" : "Androidi rakendus", "iOS app" : "iOS-i rakendus", "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>", "Password" : "Parool", "Unable to change your password" : "Sa ei saa oma parooli muuta", "Current password" : "Praegune parool", diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js index f22c7d6e654..36f245a8c43 100644 --- a/settings/l10n/eu.js +++ b/settings/l10n/eu.js @@ -153,7 +153,6 @@ OC.L10N.register( "Android app" : "Android aplikazioa", "iOS app" : "iOS aplikazioa", "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik", "Password" : "Pasahitza", "Unable to change your password" : "Ezin izan da zure pasahitza aldatu", "Current password" : "Uneko pasahitza", diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json index f3387446a85..5f8c814ccf0 100644 --- a/settings/l10n/eu.json +++ b/settings/l10n/eu.json @@ -151,7 +151,6 @@ "Android app" : "Android aplikazioa", "iOS app" : "iOS aplikazioa", "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik", "Password" : "Pasahitza", "Unable to change your password" : "Ezin izan da zure pasahitza aldatu", "Current password" : "Uneko pasahitza", diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js index 4ab82f8551c..8ee843c7488 100644 --- a/settings/l10n/fa.js +++ b/settings/l10n/fa.js @@ -175,7 +175,6 @@ OC.L10N.register( "Android app" : "اپ اندروید", "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>", "Password" : "گذرواژه", "Unable to change your password" : "ناتوان در تغییر گذرواژه", "Current password" : "گذرواژه کنونی", diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json index 208bff21057..c934d032629 100644 --- a/settings/l10n/fa.json +++ b/settings/l10n/fa.json @@ -173,7 +173,6 @@ "Android app" : "اپ اندروید", "iOS app" : "اپ iOS", "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>", "Password" : "گذرواژه", "Unable to change your password" : "ناتوان در تغییر گذرواژه", "Current password" : "گذرواژه کنونی", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 7f4889bb487..a3962d21c2e 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -221,7 +221,7 @@ OC.L10N.register( "iOS app" : "iOS-sovellus", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!", "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>", "Password" : "Salasana", "Unable to change your password" : "Salasanaasi ei voitu vaihtaa", "Current password" : "Nykyinen salasana", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index e64246df9f8..1bd4c95645d 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -219,7 +219,7 @@ "iOS app" : "iOS-sovellus", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jos haluat tukea projektia, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">auta sovelluskehityksessä</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">levitä sanaa</a>!", "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>", "Password" : "Salasana", "Unable to change your password" : "Salasanaasi ei voitu vaihtaa", "Current password" : "Nykyinen salasana", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index f3ccc491cd6..6a9a5036713 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -230,7 +230,6 @@ OC.L10N.register( "iOS app" : "Application iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n ou\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous utilisez <strong>%s</strong> des <strong>%s<strong> disponibles", "Password" : "Mot de passe", "Unable to change your password" : "Impossible de changer votre mot de passe", "Current password" : "Mot de passe actuel", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index fa859c6e438..abab989d3f9 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -228,7 +228,6 @@ "iOS app" : "Application iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Si vous souhaitez apporter votre support au projet\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejoignez le développement</a>\n ou\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">faites passer le mot</a> !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous utilisez <strong>%s</strong> des <strong>%s<strong> disponibles", "Password" : "Mot de passe", "Unable to change your password" : "Impossible de changer votre mot de passe", "Current password" : "Mot de passe actuel", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index ecb31a6a7a7..525b14cd6cd 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -216,7 +216,6 @@ OC.L10N.register( "iOS app" : "Aplicación iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!", "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>", "Password" : "Contrasinal", "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal", "Current password" : "Contrasinal actual", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 06b0277fda7..7447e933e4c 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -214,7 +214,6 @@ "iOS app" : "Aplicación iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quere axudar ao proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">únase ao desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalle a nova</a>!", "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>", "Password" : "Contrasinal", "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal", "Current password" : "Contrasinal actual", diff --git a/settings/l10n/he.js b/settings/l10n/he.js index 9fd78e6b02d..11bba18a12f 100644 --- a/settings/l10n/he.js +++ b/settings/l10n/he.js @@ -5,6 +5,7 @@ OC.L10N.register( "External Storage" : "אחסון חיצוני", "Cron" : "Cron", "Log" : "יומן", + "Updates" : "עדכונים", "Language changed" : "שפה השתנתה", "Invalid request" : "בקשה לא חוקית", "Authentication error" : "שגיאת הזדהות", @@ -48,7 +49,6 @@ OC.L10N.register( "Forum" : "פורום", "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך", "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך", "Password" : "סיסמא", "Unable to change your password" : "לא ניתן לשנות את הססמה שלך", "Current password" : "ססמה נוכחית", diff --git a/settings/l10n/he.json b/settings/l10n/he.json index 03711901376..e8d6379d999 100644 --- a/settings/l10n/he.json +++ b/settings/l10n/he.json @@ -3,6 +3,7 @@ "External Storage" : "אחסון חיצוני", "Cron" : "Cron", "Log" : "יומן", + "Updates" : "עדכונים", "Language changed" : "שפה השתנתה", "Invalid request" : "בקשה לא חוקית", "Authentication error" : "שגיאת הזדהות", @@ -46,7 +47,6 @@ "Forum" : "פורום", "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך", "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך", "Password" : "סיסמא", "Unable to change your password" : "לא ניתן לשנות את הססמה שלך", "Current password" : "ססמה נוכחית", diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js index 3bfb3ef79a7..c841816616d 100644 --- a/settings/l10n/hr.js +++ b/settings/l10n/hr.js @@ -122,7 +122,6 @@ OC.L10N.register( "Forum" : "Forum", "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>", "Password" : "Lozinka", "Unable to change your password" : "Vašu lozinku nije moguće promijeniti", "Current password" : "Trenutna lozinka", diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json index 8a7f427ad95..4497d7acd64 100644 --- a/settings/l10n/hr.json +++ b/settings/l10n/hr.json @@ -120,7 +120,6 @@ "Forum" : "Forum", "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka", "Show First Run Wizard again" : "Opet pokažite First Run Wizard", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>", "Password" : "Lozinka", "Unable to change your password" : "Vašu lozinku nije moguće promijeniti", "Current password" : "Trenutna lozinka", diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js index 6f5900ed911..388eb0d7e09 100644 --- a/settings/l10n/hu_HU.js +++ b/settings/l10n/hu_HU.js @@ -75,6 +75,7 @@ OC.L10N.register( "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben", "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", + "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", "An error occurred: {message}" : "Hiba történt: {message}", "Select a profile picture" : "Válasszon profilképet!", "Very weak password" : "Nagyon gyenge jelszó", @@ -212,7 +213,7 @@ OC.L10N.register( "iOS app" : "IOS applikáció", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Jelenleg használt: <strong>%s</strong>, maximálisan elérhető: <strong>%s</strong>", "Password" : "Jelszó", "Unable to change your password" : "A jelszó nem változtatható meg", "Current password" : "A jelenlegi jelszó", diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json index 7c6a79c3dae..467585c2703 100644 --- a/settings/l10n/hu_HU.json +++ b/settings/l10n/hu_HU.json @@ -73,6 +73,7 @@ "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben", "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", + "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", "An error occurred: {message}" : "Hiba történt: {message}", "Select a profile picture" : "Válasszon profilképet!", "Very weak password" : "Nagyon gyenge jelszó", @@ -210,7 +211,7 @@ "iOS app" : "IOS applikáció", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Jelenleg használt: <strong>%s</strong>, maximálisan elérhető: <strong>%s</strong>", "Password" : "Jelszó", "Unable to change your password" : "A jelszó nem változtatható meg", "Current password" : "A jelenlegi jelszó", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 5b4f9f5c6b5..b3ba2dd91fb 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -229,7 +229,6 @@ OC.L10N.register( "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>", "Password" : "Sandi", "Unable to change your password" : "Gagal mengubah sandi Anda", "Current password" : "Sandi saat ini", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index b6d1f9f7501..8004eea747f 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -227,7 +227,6 @@ "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>", "Password" : "Sandi", "Unable to change your password" : "Gagal mengubah sandi Anda", "Current password" : "Sandi saat ini", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index ffde7f98b5f..8dad6854cde 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -37,7 +37,6 @@ OC.L10N.register( "by" : "af", "Cheers!" : "Skál!", "Forum" : "Vefspjall", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>", "Password" : "Lykilorð", "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu", "Current password" : "Núverandi lykilorð", diff --git a/settings/l10n/is.json b/settings/l10n/is.json index 15d7cbb4a93..17b9b2b19a9 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -35,7 +35,6 @@ "by" : "af", "Cheers!" : "Skál!", "Forum" : "Vefspjall", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>", "Password" : "Lykilorð", "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu", "Current password" : "Núverandi lykilorð", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index b2881fea3a4..bbb58dcae90 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -230,7 +230,7 @@ OC.L10N.register( "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Stai utilizzando <strong>%s</strong> di <strong>%s</strong>", "Password" : "Password", "Unable to change your password" : "Modifica password non riuscita", "Current password" : "Password attuale", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 72ac8fa95e1..99520e1350c 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -228,7 +228,7 @@ "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">diffondi il verbo</a>!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Stai utilizzando <strong>%s</strong> di <strong>%s</strong>", "Password" : "Password", "Unable to change your password" : "Modifica password non riuscita", "Current password" : "Password attuale", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 5b3643eea80..5af40a49b8e 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -230,7 +230,7 @@ OC.L10N.register( "iOS app" : "iOSアプリ", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を使用しています", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", "Password" : "パスワード", "Unable to change your password" : "パスワードを変更することができません", "Current password" : "現在のパスワード", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index f8daf2d7987..19333ad4ac1 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -228,7 +228,7 @@ "iOS app" : "iOSアプリ", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を使用しています", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "<strong>%s</strong> / <strong>%s</strong> が現在使用中です", "Password" : "パスワード", "Unable to change your password" : "パスワードを変更することができません", "Current password" : "現在のパスワード", diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js index 636954b6d7d..72e6d9ab65d 100644 --- a/settings/l10n/ka_GE.js +++ b/settings/l10n/ka_GE.js @@ -48,7 +48,6 @@ OC.L10N.register( "Forum" : "ფორუმი", "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის", "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან", "Password" : "პაროლი", "Unable to change your password" : "თქვენი პაროლი არ შეიცვალა", "Current password" : "მიმდინარე პაროლი", diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json index a1a3bb241e9..63771d97d56 100644 --- a/settings/l10n/ka_GE.json +++ b/settings/l10n/ka_GE.json @@ -46,7 +46,6 @@ "Forum" : "ფორუმი", "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის", "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან", "Password" : "პაროლი", "Unable to change your password" : "თქვენი პაროლი არ შეიცვალა", "Current password" : "მიმდინარე პაროლი", diff --git a/settings/l10n/km.js b/settings/l10n/km.js index c816d5bed33..321787ef394 100644 --- a/settings/l10n/km.js +++ b/settings/l10n/km.js @@ -63,7 +63,6 @@ OC.L10N.register( "Forum" : "វេទិកាពិភាក្សា", "Get the apps to sync your files" : "ដាក់អោយកម្មវិធីផ្សេងៗ ធ្វើសមកាលកម្មឯកសារអ្នក", "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តងទៀត", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នកបានប្រើ <strong>%s</strong> ក្នុងចំណោមចំនួនមាន <strong>%s</strong>", "Password" : "ពាក្យសម្ងាត់", "Unable to change your password" : "មិនអាចប្ដូរពាក្យសម្ងាត់របស់អ្នកបានទេ", "Current password" : "ពាក្យសម្ងាត់បច្ចុប្បន្ន", diff --git a/settings/l10n/km.json b/settings/l10n/km.json index b57c054faa0..ac409f3393f 100644 --- a/settings/l10n/km.json +++ b/settings/l10n/km.json @@ -61,7 +61,6 @@ "Forum" : "វេទិកាពិភាក្សា", "Get the apps to sync your files" : "ដាក់អោយកម្មវិធីផ្សេងៗ ធ្វើសមកាលកម្មឯកសារអ្នក", "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តងទៀត", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នកបានប្រើ <strong>%s</strong> ក្នុងចំណោមចំនួនមាន <strong>%s</strong>", "Password" : "ពាក្យសម្ងាត់", "Unable to change your password" : "មិនអាចប្ដូរពាក្យសម្ងាត់របស់អ្នកបានទេ", "Current password" : "ពាក្យសម្ងាត់បច្ចុប្បន្ន", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index 56d7b315fbd..f0f39be5f76 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -191,6 +191,7 @@ OC.L10N.register( "More" : "더 중요함", "Less" : "덜 중요함", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!", + "What to log" : "남길 로그", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.", @@ -229,7 +230,7 @@ OC.L10N.register( "iOS app" : "iOS 앱", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!", "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "현재 <strong>%s</strong> / <strong>%s</strong>을(를) 사용중입니다.", "Password" : "암호", "Unable to change your password" : "암호를 변경할 수 없음", "Current password" : "현재 암호", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index 07e8b253e73..fc602daf3a3 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -189,6 +189,7 @@ "More" : "더 중요함", "Less" : "덜 중요함", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!", + "What to log" : "남길 로그", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.", @@ -227,7 +228,7 @@ "iOS app" : "iOS 앱", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "프로젝트를 지원하려면\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">개발에 참여하거나</a>\n\t\t\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">널리 알려 주십시오</a>!", "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "현재 <strong>%s</strong> / <strong>%s</strong>을(를) 사용중입니다.", "Password" : "암호", "Unable to change your password" : "암호를 변경할 수 없음", "Current password" : "현재 암호", diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js index 41fa2256deb..839707cd21a 100644 --- a/settings/l10n/lt_LT.js +++ b/settings/l10n/lt_LT.js @@ -88,7 +88,6 @@ OC.L10N.register( "Android app" : "Android programa", "iOS app" : "iOS programa", "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>", "Password" : "Slaptažodis", "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio", "Current password" : "Dabartinis slaptažodis", diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json index dab231151a3..4e6a45524aa 100644 --- a/settings/l10n/lt_LT.json +++ b/settings/l10n/lt_LT.json @@ -86,7 +86,6 @@ "Android app" : "Android programa", "iOS app" : "iOS programa", "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>", "Password" : "Slaptažodis", "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio", "Current password" : "Dabartinis slaptažodis", diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js index f5c3214b573..52b7929f495 100644 --- a/settings/l10n/lv.js +++ b/settings/l10n/lv.js @@ -128,7 +128,6 @@ OC.L10N.register( "Android app" : "Android lietotne", "iOS app" : "iOS lietotne", "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>", "Password" : "Parole", "Unable to change your password" : "Nevar nomainīt jūsu paroli", "Current password" : "Pašreizējā parole", diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json index db564c9ae11..4313703833b 100644 --- a/settings/l10n/lv.json +++ b/settings/l10n/lv.json @@ -126,7 +126,6 @@ "Android app" : "Android lietotne", "iOS app" : "iOS lietotne", "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>", "Password" : "Parole", "Unable to change your password" : "Nevar nomainīt jūsu paroli", "Current password" : "Pašreizējā parole", diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js index 29d21c8f40e..d3deefde6b3 100644 --- a/settings/l10n/mk.js +++ b/settings/l10n/mk.js @@ -139,7 +139,6 @@ OC.L10N.register( "Forum" : "Форум", "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки", "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>", "Password" : "Лозинка", "Unable to change your password" : "Вашата лозинка неможе да се смени", "Current password" : "Моментална лозинка", diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json index b3dc7a8ceef..24adf3431e2 100644 --- a/settings/l10n/mk.json +++ b/settings/l10n/mk.json @@ -137,7 +137,6 @@ "Forum" : "Форум", "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки", "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>", "Password" : "Лозинка", "Unable to change your password" : "Вашата лозинка неможе да се смени", "Current password" : "Моментална лозинка", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index 9d02c085f05..14d823d0080 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -80,6 +80,7 @@ OC.L10N.register( "Uninstall" : "Avinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", + "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", "An error occurred: {message}" : "Det oppstod en feil: {message}", "Select a profile picture" : "Velg et profilbilde", "Very weak password" : "Veldig svakt passord", @@ -190,6 +191,7 @@ OC.L10N.register( "More" : "Mer", "Less" : "Mindre", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!", + "What to log" : "Hva som skal logges", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.", @@ -228,7 +230,7 @@ OC.L10N.register( "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!", "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av de tilgjengelige <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du bruker<strong>%s</strong> av <strong>%s</strong>", "Password" : "Passord", "Unable to change your password" : "Kunne ikke endre passordet ditt", "Current password" : "Nåværende passord", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 7a6e0c6867d..5b0dfc2adcc 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -78,6 +78,7 @@ "Uninstall" : "Avinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", + "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", "An error occurred: {message}" : "Det oppstod en feil: {message}", "Select a profile picture" : "Velg et profilbilde", "Very weak password" : "Veldig svakt passord", @@ -188,6 +189,7 @@ "More" : "Mer", "Less" : "Mindre", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!", + "What to log" : "Hva som skal logges", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.", @@ -226,7 +228,7 @@ "iOS app" : "iOS-app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spre budskapet</a>!", "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av de tilgjengelige <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du bruker<strong>%s</strong> av <strong>%s</strong>", "Password" : "Passord", "Unable to change your password" : "Kunne ikke endre passordet ditt", "Current password" : "Nåværende passord", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 3162fc61305..9d424310443 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -230,7 +230,7 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "U gebruikt <strong>%s</strong> van <strong>%s</strong>", "Password" : "Wachtwoord", "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen", "Current password" : "Huidig wachtwoord", @@ -258,7 +258,7 @@ OC.L10N.register( "Issued By" : "Uitgegeven door", "Valid until %s" : "Geldig tot %s", "Import root certificate" : "Importeren root certificaat", - "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschaplinkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", + "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", "Show user backend" : "Toon backend gebruiker", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index d629588a401..f7a6653906c 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -228,7 +228,7 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">verkondig het nieuws</a>!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "U gebruikt <strong>%s</strong> van <strong>%s</strong>", "Password" : "Wachtwoord", "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen", "Current password" : "Huidig wachtwoord", @@ -256,7 +256,7 @@ "Issued By" : "Uitgegeven door", "Valid until %s" : "Geldig tot %s", "Import root certificate" : "Importeren root certificaat", - "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschaplinkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", + "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschap{linkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", "Show user backend" : "Toon backend gebruiker", diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js index 62871d4ac2d..3e36ed58b44 100644 --- a/settings/l10n/nn_NO.js +++ b/settings/l10n/nn_NO.js @@ -54,7 +54,6 @@ OC.L10N.register( "Forum" : "Forum", "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine", "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>", "Password" : "Passord", "Unable to change your password" : "Klarte ikkje endra passordet", "Current password" : "Passord", diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json index 02497c840a9..647b691335d 100644 --- a/settings/l10n/nn_NO.json +++ b/settings/l10n/nn_NO.json @@ -52,7 +52,6 @@ "Forum" : "Forum", "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine", "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>", "Password" : "Passord", "Unable to change your password" : "Klarte ikkje endra passordet", "Current password" : "Passord", diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js index dc6acaf5dee..ef5e0fa6b8e 100644 --- a/settings/l10n/oc.js +++ b/settings/l10n/oc.js @@ -229,7 +229,6 @@ OC.L10N.register( "iOS app" : "Aplicacion iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se volètz aportar vòstre supòrt al projècte\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejonhètz lo desvolopament</a>\n o\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">fasètz passar l'informacion</a> !", "Show First Run Wizard again" : "Reveire la fenèstra d'acuèlh afichada al moment de vòstra primièra connexion", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Utilizatz <strong>%s</strong> dels <strong>%s<strong> disponibles", "Password" : "Senhal", "Unable to change your password" : "Impossible de cambiar vòstre senhal", "Current password" : "Senhal actual", diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json index 30fa894cae1..c8107aaa04a 100644 --- a/settings/l10n/oc.json +++ b/settings/l10n/oc.json @@ -227,7 +227,6 @@ "iOS app" : "Aplicacion iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se volètz aportar vòstre supòrt al projècte\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\" rel=\"noreferrer\">rejonhètz lo desvolopament</a>\n o\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\" rel=\"noreferrer\">fasètz passar l'informacion</a> !", "Show First Run Wizard again" : "Reveire la fenèstra d'acuèlh afichada al moment de vòstra primièra connexion", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Utilizatz <strong>%s</strong> dels <strong>%s<strong> disponibles", "Password" : "Senhal", "Unable to change your password" : "Impossible de cambiar vòstre senhal", "Current password" : "Senhal actual", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index a7535c540a9..1412cd01088 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -162,7 +162,6 @@ OC.L10N.register( "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>", "Password" : "Hasło", "Unable to change your password" : "Nie można zmienić hasła", "Current password" : "Bieżące hasło", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index f14377903d2..a4c6a7cfd35 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -160,7 +160,6 @@ "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>", "Password" : "Hasło", "Unable to change your password" : "Nie można zmienić hasła", "Current password" : "Bieżące hasło", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 9abef09085e..37a4006571e 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -230,7 +230,7 @@ OC.L10N.register( "iOS app" : "App iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Você está usando <strong>%s</strong> de <strong>%s</strong>", "Password" : "Senha", "Unable to change your password" : "Não é possivel alterar a sua senha", "Current password" : "Senha atual", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index f885dd22136..8017a46e09c 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -228,7 +228,7 @@ "iOS app" : "App iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se você quiser suportar o projeto, \n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude com o desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">ajude a divulgá-lo</a>!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Você está usando <strong>%s</strong> de <strong>%s</strong>", "Password" : "Senha", "Unable to change your password" : "Não é possivel alterar a sua senha", "Current password" : "Senha atual", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index 37126e2e779..630b0a3b30b 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -207,7 +207,6 @@ OC.L10N.register( "iOS app" : "Aplicação iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>", "Password" : "Palavra-passe", "Unable to change your password" : "Não foi possível alterar a sua palavra-passe", "Current password" : "Palavra-passe atual", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 89357332ce5..65c0e3f6647 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -205,7 +205,6 @@ "iOS app" : "Aplicação iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Se quer apoiar o projecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">junte-se ao desenvolvimento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>", "Password" : "Palavra-passe", "Unable to change your password" : "Não foi possível alterar a sua palavra-passe", "Current password" : "Palavra-passe atual", diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js index 54666e90862..fde0c1df6aa 100644 --- a/settings/l10n/ro.js +++ b/settings/l10n/ro.js @@ -91,7 +91,6 @@ OC.L10N.register( "Desktop client" : "Client Desktop", "Android app" : "Aplicatie Android", "iOS app" : "Aplicație iOS", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile", "Password" : "Parolă", "Unable to change your password" : "Imposibil de-ați schimbat parola", "Current password" : "Parola curentă", diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json index 2f1edea71c0..c1010025fd9 100644 --- a/settings/l10n/ro.json +++ b/settings/l10n/ro.json @@ -89,7 +89,6 @@ "Desktop client" : "Client Desktop", "Android app" : "Aplicatie Android", "iOS app" : "Aplicație iOS", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile", "Password" : "Parolă", "Unable to change your password" : "Imposibil de-ați schimbat parola", "Current password" : "Parola curentă", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 78a5525eb0a..5d6376c2f1d 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -191,6 +191,7 @@ OC.L10N.register( "More" : "Больше", "Less" : "Меньше", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!", + "What to log" : "Что записывать в журнал", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.", @@ -229,7 +230,7 @@ OC.L10N.register( "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">совместная разработка</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">сообщить</a>!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Вы используете <strong>%s</strong> из <strong>%s</strong>", "Password" : "Пароль", "Unable to change your password" : "Невозможно сменить пароль", "Current password" : "Текущий пароль", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index fd9af89039d..cff06bfea17 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -189,6 +189,7 @@ "More" : "Больше", "Less" : "Меньше", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!", + "What to log" : "Что записывать в журнал", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.", @@ -227,7 +228,7 @@ "iOS app" : "iOS приложение", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Если Вы хотите поддержать проект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">совместная разработка</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">сообщить</a>!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Вы используете <strong>%s</strong> из <strong>%s</strong>", "Password" : "Пароль", "Unable to change your password" : "Невозможно сменить пароль", "Current password" : "Текущий пароль", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index ea1887a92dd..67930aebb16 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -201,7 +201,6 @@ OC.L10N.register( "iOS app" : "iOS aplikácia", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!", "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ", "Password" : "Heslo", "Unable to change your password" : "Nie je možné zmeniť vaše heslo", "Current password" : "Aktuálne heslo", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index 784a46fe080..61627bef95e 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -199,7 +199,6 @@ "iOS app" : "iOS aplikácia", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ak chcete projekt podporiť,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">zapojte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ho propagujte</a>!", "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ", "Password" : "Heslo", "Unable to change your password" : "Nie je možné zmeniť vaše heslo", "Current password" : "Aktuálne heslo", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index 2f6534eeee6..d793dc39240 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -194,7 +194,6 @@ OC.L10N.register( "iOS app" : "Program za iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!", "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.", "Password" : "Geslo", "Unable to change your password" : "Gesla ni mogoče spremeniti.", "Current password" : "Trenutno geslo", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index afb978916f2..9170aaa9d46 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -192,7 +192,6 @@ "iOS app" : "Program za iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!", "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.", "Password" : "Geslo", "Unable to change your password" : "Gesla ni mogoče spremeniti.", "Current password" : "Trenutno geslo", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index 6f816c350d4..f107fc48e7c 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -29,7 +29,7 @@ OC.L10N.register( "Enabled" : "E aktivizuar", "Not enabled" : "E paaktivizuar", "installing and updating apps via the app store or Federated Cloud Sharing" : "instalim dhe përditësim aplikacionesh përmes shitores së aplikacioneve ose Federated Cloud Sharing", - "Federated Cloud Sharing" : "Ndarje Në Re e Federuar ", + "Federated Cloud Sharing" : "Ndarje Në Re të Federuar ", "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL-ja po përdor një version %s të vjetruar (%s). Ju lutemi, përditësoni sistemin tuaj operativ ose përndryshe veçori të tilla si %s nuk do të punojnë në mënyrë të qëndrueshme.", "A problem occurred, please check your log files (Error: %s)" : "Ndodhi një gabim, ju lutemi, kontrolloni kartelat tuaja regjistër (Error: %s)", "Migration Completed" : "Migrimi u Plotësua", @@ -118,6 +118,7 @@ OC.L10N.register( "None" : "Asnjë", "Login" : "Hyrje", "Plain" : "E thjeshtë", + "NT LAN Manager" : "Përgjegjës Rrjeti NT", "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP-ja nuk duket të jetë rregulluar si duhet për të kërkuar ndryshore mjedisi sistemi. Testi me getenv(\"PATH\") kthen vetëm një përgjigje të zbrazët.", @@ -147,7 +148,7 @@ OC.L10N.register( "days" : "ditësh", "Enforce expiration date" : "Detyro datë skadimi", "Allow resharing" : "Lejo rindarje", - "Restrict users to only share with users in their groups" : "Përdoruesit kufizoji të ndajnë gjëra vetëm me përdorues në grupin e tyre", + "Restrict users to only share with users in their groups" : "Përdoruesve kufizoju të ndajnë gjëra vetëm me përdorues në grupin e tyre", "Allow users to send mail notification for shared files to other users" : "Lejoju përdoruesve t’u dërgojnë përdoruesve të tjerë njoftime me email për kartela të ndara me të tjerët", "Exclude groups from sharing" : "Përjashtoni grupe nga ndarjet", "These groups will still be able to receive shares, but not to initiate them." : "Këto grupe prapë do të jenë në gjendje të marrin ndarje nga të tjerët, por jo të fillojnë të tilla.", @@ -229,7 +230,7 @@ OC.L10N.register( "iOS app" : "Aplikacion për iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!", "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Keni përdorur <strong>%s</strong> nga <strong>%s</strong> tuajat", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Po përdorni <strong>%s</strong> nga <strong>%s</strong>", "Password" : "Fjalëkalim", "Unable to change your password" : "S’arrin të ndryshojë fjalëkalimin tuaj", "Current password" : "Fjalëkalimi i tanishëm", @@ -266,7 +267,7 @@ OC.L10N.register( "Username" : "Emër përdoruesi", "E-Mail" : "Email", "Create" : "Krijoje", - "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin", + "Admin Recovery Password" : "Fjalëkalim Rikthimesh Nga Përgjegjësi", "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalim rimarrje që të mund të rimerrni kartela përdoruesi gjatë ndryshimit të fjalëkalimit", "Add Group" : "Shtoni Grup", "Group" : "Grup", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index 5192207a879..047beaed279 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -27,7 +27,7 @@ "Enabled" : "E aktivizuar", "Not enabled" : "E paaktivizuar", "installing and updating apps via the app store or Federated Cloud Sharing" : "instalim dhe përditësim aplikacionesh përmes shitores së aplikacioneve ose Federated Cloud Sharing", - "Federated Cloud Sharing" : "Ndarje Në Re e Federuar ", + "Federated Cloud Sharing" : "Ndarje Në Re të Federuar ", "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL-ja po përdor një version %s të vjetruar (%s). Ju lutemi, përditësoni sistemin tuaj operativ ose përndryshe veçori të tilla si %s nuk do të punojnë në mënyrë të qëndrueshme.", "A problem occurred, please check your log files (Error: %s)" : "Ndodhi një gabim, ju lutemi, kontrolloni kartelat tuaja regjistër (Error: %s)", "Migration Completed" : "Migrimi u Plotësua", @@ -116,6 +116,7 @@ "None" : "Asnjë", "Login" : "Hyrje", "Plain" : "E thjeshtë", + "NT LAN Manager" : "Përgjegjës Rrjeti NT", "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP-ja nuk duket të jetë rregulluar si duhet për të kërkuar ndryshore mjedisi sistemi. Testi me getenv(\"PATH\") kthen vetëm një përgjigje të zbrazët.", @@ -145,7 +146,7 @@ "days" : "ditësh", "Enforce expiration date" : "Detyro datë skadimi", "Allow resharing" : "Lejo rindarje", - "Restrict users to only share with users in their groups" : "Përdoruesit kufizoji të ndajnë gjëra vetëm me përdorues në grupin e tyre", + "Restrict users to only share with users in their groups" : "Përdoruesve kufizoju të ndajnë gjëra vetëm me përdorues në grupin e tyre", "Allow users to send mail notification for shared files to other users" : "Lejoju përdoruesve t’u dërgojnë përdoruesve të tjerë njoftime me email për kartela të ndara me të tjerët", "Exclude groups from sharing" : "Përjashtoni grupe nga ndarjet", "These groups will still be able to receive shares, but not to initiate them." : "Këto grupe prapë do të jenë në gjendje të marrin ndarje nga të tjerët, por jo të fillojnë të tilla.", @@ -227,7 +228,7 @@ "iOS app" : "Aplikacion për iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Nëse doni ta përkrahni projektin\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">merrni pjesë te zhvillimi i tij</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">përhapni fjalën për të</a>!", "Show First Run Wizard again" : "Shfaqe sërish Ndihmësin e Herës së Parë", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Keni përdorur <strong>%s</strong> nga <strong>%s</strong> tuajat", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Po përdorni <strong>%s</strong> nga <strong>%s</strong>", "Password" : "Fjalëkalim", "Unable to change your password" : "S’arrin të ndryshojë fjalëkalimin tuaj", "Current password" : "Fjalëkalimi i tanishëm", @@ -264,7 +265,7 @@ "Username" : "Emër përdoruesi", "E-Mail" : "Email", "Create" : "Krijoje", - "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin", + "Admin Recovery Password" : "Fjalëkalim Rikthimesh Nga Përgjegjësi", "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalim rimarrje që të mund të rimerrni kartela përdoruesi gjatë ndryshimit të fjalëkalimit", "Add Group" : "Shtoni Grup", "Group" : "Grup", diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index f0fc5eb3388..c74b9d04b54 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -213,7 +213,6 @@ OC.L10N.register( "iOS app" : "иОС апликација", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!", "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>", "Password" : "Лозинка", "Unable to change your password" : "Не могу да изменим вашу лозинку", "Current password" : "Тренутна лозинка", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index ec0d3f078dc..9443e134699 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -211,7 +211,6 @@ "iOS app" : "иОС апликација", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ако желите да подржите пројект\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">придружите се развоју</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">разгласите свима</a>!", "Show First Run Wizard again" : "Поново прикажи чаробњака за прво покретање", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>", "Password" : "Лозинка", "Unable to change your password" : "Не могу да изменим вашу лозинку", "Current password" : "Тренутна лозинка", diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js index 414a1121fae..d152a14f515 100644 --- a/settings/l10n/sv.js +++ b/settings/l10n/sv.js @@ -151,7 +151,6 @@ OC.L10N.register( "Android app" : "Android-app", "iOS app" : "iOS-app", "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>", "Password" : "Lösenord", "Unable to change your password" : "Kunde inte ändra ditt lösenord", "Current password" : "Nuvarande lösenord", diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json index 0b0c0ebb88c..814096dbe79 100644 --- a/settings/l10n/sv.json +++ b/settings/l10n/sv.json @@ -149,7 +149,6 @@ "Android app" : "Android-app", "iOS app" : "iOS-app", "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>", "Password" : "Lösenord", "Unable to change your password" : "Kunde inte ändra ditt lösenord", "Current password" : "Nuvarande lösenord", diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js index e1c01ee9d53..0ef4abf7fe5 100644 --- a/settings/l10n/ta_LK.js +++ b/settings/l10n/ta_LK.js @@ -26,7 +26,6 @@ OC.L10N.register( "More" : "மேலதிக", "Less" : "குறைவான", "by" : "மூலம்", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்", "Password" : "கடவுச்சொல்", "Unable to change your password" : "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது", "Current password" : "தற்போதைய கடவுச்சொல்", diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json index 84c2acbe2ac..a1c72071d5e 100644 --- a/settings/l10n/ta_LK.json +++ b/settings/l10n/ta_LK.json @@ -24,7 +24,6 @@ "More" : "மேலதிக", "Less" : "குறைவான", "by" : "மூலம்", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்", "Password" : "கடவுச்சொல்", "Unable to change your password" : "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது", "Current password" : "தற்போதைய கடவுச்சொல்", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 28cc6d0e3b0..f8cf273c1f0 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -230,7 +230,6 @@ OC.L10N.register( "iOS app" : "แอพฯ IOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการที่จะสนับสนุนโครงการ <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">กระจายข่าวสาร</a>!\n\t\t", "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>", "Password" : "รหัสผ่าน", "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้", "Current password" : "รหัสผ่านปัจจุบัน", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index 16757eda425..a606a62f471 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -228,7 +228,6 @@ "iOS app" : "แอพฯ IOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "หากคุณต้องการที่จะสนับสนุนโครงการ <a href=\"https://owncloud.org/contribute\" target=\"_blank\" rel=\"noreferrer\">เข้าร่วมการพัฒนา</a> หรือ <a href=\"https://owncloud.org/promote\" target=\"_blank\" rel=\"noreferrer\">กระจายข่าวสาร</a>!\n\t\t", "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>", "Password" : "รหัสผ่าน", "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้", "Current password" : "รหัสผ่านปัจจุบัน", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 0e8bbe28b17..b138ce2ecd7 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -230,7 +230,6 @@ OC.L10N.register( "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>", "Password" : "Parola", "Unable to change your password" : "Parolanız değiştirilemiyor", "Current password" : "Mevcut parola", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 4774d4dc48f..f079a486285 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -228,7 +228,6 @@ "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">duyurun</a>!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>", "Password" : "Parola", "Unable to change your password" : "Parolanız değiştirilemiyor", "Current password" : "Mevcut parola", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index 6818791d109..f9e542a9466 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -210,7 +210,6 @@ OC.L10N.register( "iOS app" : "iOS додаток", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !", "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>", "Password" : "Пароль", "Unable to change your password" : "Не вдалося змінити Ваш пароль", "Current password" : "Поточний пароль", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index 1b75667fd39..a16133952f0 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -208,7 +208,6 @@ "iOS app" : "iOS додаток", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Якщо Ви хочете підтримати проект\n⇥⇥ <a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> спільна розробка </a> \n⇥⇥або\n⇥ ⇥ <a href=\"https://owncloud.org/promote\"\n ⇥⇥⇥target=\"_blank\" rel=\"noreferrer\"> повідомити у світі </a> !", "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>", "Password" : "Пароль", "Unable to change your password" : "Не вдалося змінити Ваш пароль", "Current password" : "Поточний пароль", diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js index ff82c3e6ca0..3fb0c657159 100644 --- a/settings/l10n/vi.js +++ b/settings/l10n/vi.js @@ -49,7 +49,6 @@ OC.L10N.register( "Forum" : "Diễn đàn", "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn", "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>", "Password" : "Mật khẩu", "Unable to change your password" : "Không thể đổi mật khẩu", "Current password" : "Mật khẩu cũ", diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json index 95674c8fb37..67c65407b06 100644 --- a/settings/l10n/vi.json +++ b/settings/l10n/vi.json @@ -47,7 +47,6 @@ "Forum" : "Diễn đàn", "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn", "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>", "Password" : "Mật khẩu", "Unable to change your password" : "Không thể đổi mật khẩu", "Current password" : "Mật khẩu cũ", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index cc01afbf24c..8ee804c190b 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -225,7 +225,6 @@ OC.L10N.register( "iOS app" : "iOS 应用", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！", "Show First Run Wizard again" : "再次显示首次运行向导", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>", "Password" : "密码", "Unable to change your password" : "无法修改密码", "Current password" : "当前密码", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index e5532b98a5d..1ea648f0988 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -223,7 +223,6 @@ "iOS app" : "iOS 应用", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！", "Show First Run Wizard again" : "再次显示首次运行向导", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>", "Password" : "密码", "Unable to change your password" : "无法修改密码", "Current password" : "当前密码", diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js index c0cf5ad4024..c3599c3d4e7 100644 --- a/settings/l10n/zh_TW.js +++ b/settings/l10n/zh_TW.js @@ -227,7 +227,6 @@ OC.L10N.register( "iOS app" : "iOS 應用程式", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!", "Show First Run Wizard again" : "再次顯示首次使用精靈", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，總共可用空間為 <strong>%s</strong>", "Password" : "密碼", "Unable to change your password" : "無法變更您的密碼", "Current password" : "目前密碼", diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json index aaa5881d449..bf026bf2628 100644 --- a/settings/l10n/zh_TW.json +++ b/settings/l10n/zh_TW.json @@ -225,7 +225,6 @@ "iOS app" : "iOS 應用程式", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!", "Show First Run Wizard again" : "再次顯示首次使用精靈", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，總共可用空間為 <strong>%s</strong>", "Password" : "密碼", "Unable to change your password" : "無法變更您的密碼", "Current password" : "目前密碼", diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 2971121cda0..a7d44a69f8e 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -28,7 +28,7 @@ <div style="width:<?php p($_['usage_relative']);?>%" <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>> <p id="quotatext"> - <?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', + <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', array($_['usage'], $_['total_space'])));?> </p> </div> diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php index d9dace2ef05..1c042dec9f0 100644 --- a/tests/lib/user/session.php +++ b/tests/lib/user/session.php @@ -12,6 +12,10 @@ namespace Test\User; use OC\Session\Memory; use OC\User\User; +/** + * @group DB + * @package Test\User + */ class Session extends \Test\TestCase { public function testGetUser() { $session = $this->getMock('\OC\Session\Memory', array(), array('')); @@ -95,6 +99,8 @@ class Session extends \Test\TestCase { public function testLoginValidPasswordEnabled() { $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->once()) + ->method('regenerateId'); $session->expects($this->exactly(2)) ->method('set') ->with($this->callback(function ($key) { @@ -148,6 +154,8 @@ class Session extends \Test\TestCase { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->never()) ->method('set'); + $session->expects($this->once()) + ->method('regenerateId'); $managerMethods = get_class_methods('\OC\User\Manager'); //keep following methods intact in order to ensure hooks are @@ -179,10 +187,12 @@ class Session extends \Test\TestCase { $userSession->login('foo', 'bar'); } - public function testLoginInValidPassword() { + public function testLoginInvalidPassword() { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->never()) ->method('set'); + $session->expects($this->once()) + ->method('regenerateId'); $managerMethods = get_class_methods('\OC\User\Manager'); //keep following methods intact in order to ensure hooks are @@ -217,6 +227,8 @@ class Session extends \Test\TestCase { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->never()) ->method('set'); + $session->expects($this->once()) + ->method('regenerateId'); $manager = $this->getMock('\OC\User\Manager'); @@ -244,6 +256,8 @@ class Session extends \Test\TestCase { } }, 'foo')); + $session->expects($this->once()) + ->method('regenerateId'); $managerMethods = get_class_methods('\OC\User\Manager'); //keep following methods intact in order to ensure hooks are @@ -292,6 +306,8 @@ class Session extends \Test\TestCase { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->never()) ->method('set'); + $session->expects($this->once()) + ->method('regenerateId'); $managerMethods = get_class_methods('\OC\User\Manager'); //keep following methods intact in order to ensure hooks are @@ -334,6 +350,8 @@ class Session extends \Test\TestCase { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->never()) ->method('set'); + $session->expects($this->once()) + ->method('regenerateId'); $managerMethods = get_class_methods('\OC\User\Manager'); //keep following methods intact in order to ensure hooks are |