diff options
426 files changed, 1963 insertions, 1115 deletions
diff --git a/apps/comments/l10n/es.js b/apps/comments/l10n/es.js index 40d1a8ffb24..98d9d422365 100644 --- a/apps/comments/l10n/es.js +++ b/apps/comments/l10n/es.js @@ -1,7 +1,7 @@ OC.L10N.register( "comments", { - "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Type in a new comment..." : "Escribe un nuevo comentario...", "Delete comment" : "Borrar comentario", "Post" : "Publicar", "Cancel" : "Cancelar", diff --git a/apps/comments/l10n/es.json b/apps/comments/l10n/es.json index 60971bce4d5..636342911c2 100644 --- a/apps/comments/l10n/es.json +++ b/apps/comments/l10n/es.json @@ -1,5 +1,5 @@ { "translations": { - "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Type in a new comment..." : "Escribe un nuevo comentario...", "Delete comment" : "Borrar comentario", "Post" : "Publicar", "Cancel" : "Cancelar", diff --git a/apps/comments/l10n/ru.js b/apps/comments/l10n/ru.js index eb12b3617b0..3ee5e1fb4d4 100644 --- a/apps/comments/l10n/ru.js +++ b/apps/comments/l10n/ru.js @@ -14,6 +14,7 @@ OC.L10N.register( "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}", "{count} unread comments" : "{count} непрочитанных комментариев", "Comment" : "Коментарий", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>", "You commented" : "Вы откомментировали", "%1$s commented" : "%1$s откомментировано", "You commented on %2$s" : "Вы откомментировали в %2$s", diff --git a/apps/comments/l10n/ru.json b/apps/comments/l10n/ru.json index 8089b1e3e64..fcafda4c9cb 100644 --- a/apps/comments/l10n/ru.json +++ b/apps/comments/l10n/ru.json @@ -12,6 +12,7 @@ "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}", "{count} unread comments" : "{count} непрочитанных комментариев", "Comment" : "Коментарий", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>", "You commented" : "Вы откомментировали", "%1$s commented" : "%1$s откомментировано", "You commented on %2$s" : "Вы откомментировали в %2$s", diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js index 6f8b9a28d49..e7f1ebed301 100644 --- a/apps/encryption/l10n/sl.js +++ b/apps/encryption/l10n/sl.js @@ -21,6 +21,7 @@ OC.L10N.register( "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Preseliti je treba šifrirne ključe iz starega sistema (ownCloud <= 8.0) na novega. Zaženite ukaz 'occ encryption:migrate' ali pa stopite v stik s skrbnikom sistema.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Encryption App is enabled and ready" : "Program za šifriranje ne omogočen in pripravljen za delo", @@ -30,10 +31,12 @@ OC.L10N.register( "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Encrypt the home storage" : "Šifriraj domačo shrambo", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", + "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." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop.", "Recovery key password" : "Ključ za obnovitev gesla", "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json index f0bd37fca57..73e31950482 100644 --- a/apps/encryption/l10n/sl.json +++ b/apps/encryption/l10n/sl.json @@ -19,6 +19,7 @@ "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Preseliti je treba šifrirne ključe iz starega sistema (ownCloud <= 8.0) na novega. Zaženite ukaz 'occ encryption:migrate' ali pa stopite v stik s skrbnikom sistema.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Encryption App is enabled and ready" : "Program za šifriranje ne omogočen in pripravljen za delo", @@ -28,10 +29,12 @@ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Encrypt the home storage" : "Šifriraj domačo shrambo", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", + "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." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop.", "Recovery key password" : "Ključ za obnovitev gesla", "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", diff --git a/apps/federation/l10n/es.js b/apps/federation/l10n/es.js index c559a39c979..2eb6aab8bd8 100644 --- a/apps/federation/l10n/es.js +++ b/apps/federation/l10n/es.js @@ -1,15 +1,15 @@ OC.L10N.register( "federation", { - "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía", + "Server added to the list of trusted ownClouds" : "Servidor añadido a la lista de ownClouds en los que se confía", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No ownCloud server found" : "No se ha encontrado el servidor ownCloud", - "Could not add server" : "No se pudo agregar el servidor", + "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se puede usar para autocompletar usuarios externos en caso de compartición federada.", "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "Trusted ownCloud Servers" : "Servidores onwCloud en los que confío", - "+ Add ownCloud server" : "+ Añadir servidor onwCloud", + "+ Add ownCloud server" : "+ Añadir servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json index 17c11ebae3c..67d6dec6de1 100644 --- a/apps/federation/l10n/es.json +++ b/apps/federation/l10n/es.json @@ -1,13 +1,13 @@ { "translations": { - "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía", + "Server added to the list of trusted ownClouds" : "Servidor añadido a la lista de ownClouds en los que se confía", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No ownCloud server found" : "No se ha encontrado el servidor ownCloud", - "Could not add server" : "No se pudo agregar el servidor", + "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se puede usar para autocompletar usuarios externos en caso de compartición federada.", "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "Trusted ownCloud Servers" : "Servidores onwCloud en los que confío", - "+ Add ownCloud server" : "+ Añadir servidor onwCloud", + "+ Add ownCloud server" : "+ Añadir servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ru.js b/apps/federation/l10n/ru.js index 8e4b1372938..f8644e2b9d3 100644 --- a/apps/federation/l10n/ru.js +++ b/apps/federation/l10n/ru.js @@ -7,6 +7,7 @@ OC.L10N.register( "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов ownCloud позволит Вам подключиться к другим доверенным серверам ownCloud для обмена директориями пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически, как только федеративный общий доступ будет успешно создан", "Trusted ownCloud Servers" : "Доверенные серверы ownCloud", "+ Add ownCloud server" : "+ Добавить сервер ownCloud", "ownCloud Server" : "Сервер ownCloud" diff --git a/apps/federation/l10n/ru.json b/apps/federation/l10n/ru.json index 526005e3d38..132794d6580 100644 --- a/apps/federation/l10n/ru.json +++ b/apps/federation/l10n/ru.json @@ -5,6 +5,7 @@ "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов ownCloud позволит Вам подключиться к другим доверенным серверам ownCloud для обмена директориями пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически, как только федеративный общий доступ будет успешно создан", "Trusted ownCloud Servers" : "Доверенные серверы ownCloud", "+ Add ownCloud server" : "+ Добавить сервер ownCloud", "ownCloud Server" : "Сервер ownCloud" diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index 0641304d211..bb20c8c3f77 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -67,7 +67,15 @@ table td.filename .nametext .innernametext { } /* shorten elements for mobile */ -#uploadprogressbar { +#uploadprogressbar, #uploadprogressbar .label.inner { width: 50px; } +/* hide desktop-only parts */ +#uploadprogressbar .desktop { + display: none !important; } +#uploadprogressbar .mobile { + display: block !important; +} + +}
\ No newline at end of file diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index 07b788b937f..f0ffb9ac99e 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -47,7 +47,39 @@ width: 200px; height: 36px; display:inline-block; + text-align: center; +} +#uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left { + height: 100%; + top: 0px; + left: 0px; + position: absolute; + overflow: hidden; +} +#uploadprogressbar .label { + top: 6px; + opacity: 1; + overflow: hidden; + white-space: nowrap; + font-weight: normal; +} +#uploadprogressbar .label.inner { + color:white; + position: absolute; + display: block; + width: 200px; +} +#uploadprogressbar .label.outer { + position: relative; + color: black; +} +#uploadprogressbar .desktop { + display: block; +} +#uploadprogressbar .mobile { + display: none; } + #uploadprogressbar + stop { font-size: 13px; } diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 364475e4a4f..58ac9924ef7 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -39,6 +39,8 @@ } if (options.onDrop) { this.onDrop = options.onDrop; + this.onOver = options.onOver; + this.onOut = options.onOut; } if (options.getCrumbUrl) { this.getCrumbUrl = options.getCrumbUrl; @@ -60,6 +62,8 @@ breadcrumbs: [], onClick: null, onDrop: null, + onOver: null, + onOut: null, /** * Sets the directory to be displayed as breadcrumb. @@ -127,6 +131,8 @@ if (this.onDrop) { this.$el.find('.crumb:not(.last)').droppable({ drop: this.onDrop, + over: this.onOver, + out: this.onOut, tolerance: 'pointer' }); } diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b88a7031dba..3257ded7b89 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -557,7 +557,16 @@ OC.Upload = { window.file_upload_param = fileupload; if (supportAjaxUploadWithProgress()) { - + //remaining time + var lastUpdate = new Date().getMilliseconds(); + var lastSize = 0; + var bufferSize = 20; + var buffer = []; + var bufferIndex = 0; + var bufferTotal = 0; + for(var i = 0; i < bufferSize;i++){ + buffer[i] = 0; + } // add progress handlers fileupload.on('fileuploadadd', function(e, data) { OC.Upload.log('progress handle fileuploadadd', e, data); @@ -570,7 +579,15 @@ OC.Upload = { fileupload.on('fileuploadstart', function(e, data) { OC.Upload.log('progress handle fileuploadstart', e, data); $('#uploadprogresswrapper .stop').show(); + $('#uploadprogresswrapper .label').show(); $('#uploadprogressbar').progressbar({value: 0}); + $('#uploadprogressbar .ui-progressbar-value'). + html('<em class="label inner"><span class="desktop">' + + t('files', 'Uploading...') + + '</span><span class="mobile">' + + t('files', '...') + + '</span></em>'); + $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true}); OC.Upload._showProgressBar(); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -580,11 +597,67 @@ OC.Upload = { fileupload.on('fileuploadprogressall', function(e, data) { OC.Upload.log('progress handle fileuploadprogressall', e, data); var progress = (data.loaded / data.total) * 100; + var thisUpdate = new Date().getMilliseconds(); + var diffUpdate = (thisUpdate - lastUpdate)/1000; // eg. 2s + lastUpdate = thisUpdate; + var diffSize = data.loaded - lastSize; + lastSize = data.loaded; + diffSize = diffSize / diffUpdate; // apply timing factor, eg. 1mb/2s = 0.5mb/s + var remainingSeconds = ((data.total - data.loaded) / diffSize); + if(remainingSeconds >= 0) { + bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds; + buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother + bufferIndex = (bufferIndex + 1) % bufferSize; + } + var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds + var date = new Date(smoothRemainingSeconds * 1000); + var timeStringDesktop = ""; + var timeStringMobile = ""; + if(date.getUTCHours() > 0){ + timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , { + hours:date.getUTCHours(), + minutes: ('0' + date.getUTCMinutes()).slice(-2), + seconds: ('0' + date.getUTCSeconds()).slice(-2), + plural_s: ( smoothRemainingSeconds === 3600 ? "": "s") // 1 hour = 1*60m*60s = 3600s + }); + timeStringMobile = t('files', '{hours}:{minutes}h' , { + hours:date.getUTCHours(), + minutes: ('0' + date.getUTCMinutes()).slice(-2), + seconds: ('0' + date.getUTCSeconds()).slice(-2) + }); + } else if(date.getUTCMinutes() > 0){ + timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , { + minutes: date.getUTCMinutes(), + seconds: ('0' + date.getUTCSeconds()).slice(-2), + plural_s: (smoothRemainingSeconds === 60 ? "": "s") // 1 minute = 1*60s = 60s + }); + timeStringMobile = t('files', '{minutes}:{seconds}m' , { + minutes: date.getUTCMinutes(), + seconds: ('0' + date.getUTCSeconds()).slice(-2) + }); + } else if(date.getUTCSeconds() > 0){ + timeStringDesktop = t('files', '{seconds} second{plural_s} left' , { + seconds: date.getUTCSeconds(), + plural_s: (smoothRemainingSeconds === 1 ? "": "s") // 1 second = 1s = 1s + }); + timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()}); + } else { + timeStringDesktop = t('files', 'Any moment now...'); + timeStringMobile = t('files', 'Soon...'); + } + $('#uploadprogressbar .label .mobile').text(timeStringMobile); + $('#uploadprogressbar .label .desktop').text(timeStringDesktop); + $('#uploadprogressbar').attr('original-title', + t('files', '{loadedSize} of {totalSize} ({bitrate})' , { + loadedSize: humanFileSize(data.loaded), + totalSize: humanFileSize(data.total), + bitrate: humanFileSize(data.bitrate) + '/s' + }) + ); $('#uploadprogressbar').progressbar('value', progress); }); fileupload.on('fileuploadstop', function(e, data) { OC.Upload.log('progress handle fileuploadstop', e, data); - OC.Upload._hideProgressBar(); }); fileupload.on('fileuploadfail', function(e, data) { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9395112bce3..ef29a4844bf 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -271,6 +271,12 @@ // if dropping on folders is allowed, then also allow on breadcrumbs if (this._folderDropOptions) { breadcrumbOptions.onDrop = _.bind(this._onDropOnBreadCrumb, this); + breadcrumbOptions.onOver = function() { + self.$el.find('td.filename.ui-droppable').droppable('disable'); + } + breadcrumbOptions.onOut = function() { + self.$el.find('td.filename.ui-droppable').droppable('enable'); + } } this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions); @@ -785,6 +791,13 @@ } this.move(_.pluck(files, 'name'), targetPath); + + // re-enable td elements to be droppable + // sometimes the filename drop handler is still called after re-enable, + // it seems that waiting for a short time before re-enabling solves the problem + setTimeout(function() { + self.$el.find('td.filename.ui-droppable').droppable('enable'); + }, 10); }, /** diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index 7330264e4e0..a9093c45a96 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "مسار غير صحيح.", "Files" : "الملفات", "All files" : "كل الملفات", - "Favorites" : "المفضلة ", "Home" : "البيت", "Close" : "إغلاق", + "Favorites" : "المفضلة ", "Upload cancelled." : "تم إلغاء عملية رفع الملفات .", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم", + "Uploading..." : "ترفيع...", "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "Actions" : "* تطبيقات.\n* أنشطة.", "Download" : "تحميل", @@ -83,7 +84,6 @@ OC.L10N.register( "Save" : "حفظ", "Settings" : "إعدادات", "WebDAV" : "WebDAV", - "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index 281d546c515..fe07f30c033 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -19,14 +19,15 @@ "Invalid directory." : "مسار غير صحيح.", "Files" : "الملفات", "All files" : "كل الملفات", - "Favorites" : "المفضلة ", "Home" : "البيت", "Close" : "إغلاق", + "Favorites" : "المفضلة ", "Upload cancelled." : "تم إلغاء عملية رفع الملفات .", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم", + "Uploading..." : "ترفيع...", "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "Actions" : "* تطبيقات.\n* أنشطة.", "Download" : "تحميل", @@ -81,7 +82,6 @@ "Save" : "حفظ", "Settings" : "إعدادات", "WebDAV" : "WebDAV", - "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js index 7e5aba5a63b..6fe07fed765 100644 --- a/apps/files/l10n/ast.js +++ b/apps/files/l10n/ast.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Direutoriu non válidu.", "Files" : "Ficheros", "All files" : "Tolos ficheros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Zarrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Xuba encaboxada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}", "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.", + "Uploading..." : "Xubiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.", "Actions" : "Aiciones", "Download" : "Descargar", @@ -92,7 +93,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Encaboxar xuba", "No files in here" : "Nun hai nengún ficheru equí", "Upload some content or sync with your devices!" : "¡Xuba algún conteníu o sincroniza colos sos preseos!", "No entries found in this folder" : "Nenguna entrada en esta carpeta", diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json index f62ec31e0d8..5b554ab8f93 100644 --- a/apps/files/l10n/ast.json +++ b/apps/files/l10n/ast.json @@ -19,14 +19,15 @@ "Invalid directory." : "Direutoriu non válidu.", "Files" : "Ficheros", "All files" : "Tolos ficheros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Zarrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Xuba encaboxada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}", "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.", + "Uploading..." : "Xubiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.", "Actions" : "Aiciones", "Download" : "Descargar", @@ -90,7 +91,6 @@ "Save" : "Guardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Encaboxar xuba", "No files in here" : "Nun hai nengún ficheru equí", "Upload some content or sync with your devices!" : "¡Xuba algún conteníu o sincroniza colos sos preseos!", "No entries found in this folder" : "Nenguna entrada en esta carpeta", diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js index 0adeb3b7a7d..7cce658e6c9 100644 --- a/apps/files/l10n/az.js +++ b/apps/files/l10n/az.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Yalnış qovluq.", "Files" : "Fayllar", "All files" : "Bütün fayllar", - "Favorites" : "Sevimlilər", "Home" : "Ev", "Close" : "Bağla", + "Favorites" : "Sevimlilər", "Upload cancelled." : "Yüklənmə dayandırıldı.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ", "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1} yüklənmə limiti {size2} -ni aşır", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq {size2} var. ", "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.", + "Uploading..." : "Serverə yüklənir...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.", "Actions" : "İşlər", "Download" : "Yüklə", @@ -89,7 +90,6 @@ OC.L10N.register( "Save" : "Saxlamaq", "Settings" : "Quraşdırmalar", "WebDAV" : "WebDAV", - "Cancel upload" : "Yüklənməni dayandır", "No files in here" : "Burda fayl yoxdur", "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!", "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı", diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json index cc98d275ed0..48bb39bc650 100644 --- a/apps/files/l10n/az.json +++ b/apps/files/l10n/az.json @@ -19,14 +19,15 @@ "Invalid directory." : "Yalnış qovluq.", "Files" : "Fayllar", "All files" : "Bütün fayllar", - "Favorites" : "Sevimlilər", "Home" : "Ev", "Close" : "Bağla", + "Favorites" : "Sevimlilər", "Upload cancelled." : "Yüklənmə dayandırıldı.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ", "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1} yüklənmə limiti {size2} -ni aşır", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq {size2} var. ", "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.", + "Uploading..." : "Serverə yüklənir...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.", "Actions" : "İşlər", "Download" : "Yüklə", @@ -87,7 +88,6 @@ "Save" : "Saxlamaq", "Settings" : "Quraşdırmalar", "WebDAV" : "WebDAV", - "Cancel upload" : "Yüklənməni dayandır", "No files in here" : "Burda fayl yoxdur", "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!", "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı", diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index 9e6abe1e554..3a00853fa18 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Невалидна директория.", "Files" : "Файлове", "All files" : "Всички файлове", - "Favorites" : "Любими", "Home" : "Домашен", "Close" : "Затвори", + "Favorites" : "Любими", "Upload cancelled." : "Качването е прекъснато.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.", "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.", "Could not get result from server." : "Не се получи резултат от сървърът.", + "Uploading..." : "Качване...", "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.", "Actions" : "Действия", "Download" : "Изтегли", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Запис", "Settings" : "Настройки", "WebDAV" : "WebDAV", - "Cancel upload" : "Отказване на качването", "No files in here" : "Тук няма файлове", "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", "No entries found in this folder" : "Няма намерени записи в тази папка", diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index 20a146fdf24..4d60be20692 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -19,14 +19,15 @@ "Invalid directory." : "Невалидна директория.", "Files" : "Файлове", "All files" : "Всички файлове", - "Favorites" : "Любими", "Home" : "Домашен", "Close" : "Затвори", + "Favorites" : "Любими", "Upload cancelled." : "Качването е прекъснато.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.", "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.", "Could not get result from server." : "Не се получи резултат от сървърът.", + "Uploading..." : "Качване...", "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.", "Actions" : "Действия", "Download" : "Изтегли", @@ -79,7 +80,6 @@ "Save" : "Запис", "Settings" : "Настройки", "WebDAV" : "WebDAV", - "Cancel upload" : "Отказване на качването", "No files in here" : "Тук няма файлове", "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", "No entries found in this folder" : "Няма намерени записи в тази папка", diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js index e9020ade843..43a8fc62fa6 100644 --- a/apps/files/l10n/bn_BD.js +++ b/apps/files/l10n/bn_BD.js @@ -17,10 +17,11 @@ OC.L10N.register( "Invalid directory." : "ভুল ডিরেক্টরি", "Files" : "ফাইল", "All files" : "সব ফাইল", - "Favorites" : "প্রিয়জন", "Home" : "নিবাস", "Close" : "বন্ধ", + "Favorites" : "প্রিয়জন", "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।", + "Uploading..." : "আপলোড করা হচ্ছে..........", "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", "Actions" : "পদক্ষেপসমূহ", "Download" : "ডাউনলোড", @@ -57,7 +58,6 @@ OC.L10N.register( "Save" : "সংরক্ষণ", "Settings" : "নিয়ামকসমূহ", "WebDAV" : "WebDAV", - "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", "Text file" : "টেক্সট ফাইল" diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json index 1cd65349314..dc114d13a17 100644 --- a/apps/files/l10n/bn_BD.json +++ b/apps/files/l10n/bn_BD.json @@ -15,10 +15,11 @@ "Invalid directory." : "ভুল ডিরেক্টরি", "Files" : "ফাইল", "All files" : "সব ফাইল", - "Favorites" : "প্রিয়জন", "Home" : "নিবাস", "Close" : "বন্ধ", + "Favorites" : "প্রিয়জন", "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।", + "Uploading..." : "আপলোড করা হচ্ছে..........", "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", "Actions" : "পদক্ষেপসমূহ", "Download" : "ডাউনলোড", @@ -55,7 +56,6 @@ "Save" : "সংরক্ষণ", "Settings" : "নিয়ামকসমূহ", "WebDAV" : "WebDAV", - "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", "Text file" : "টেক্সট ফাইল" diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js index e69597d35ca..0ecfb2688e1 100644 --- a/apps/files/l10n/bn_IN.js +++ b/apps/files/l10n/bn_IN.js @@ -13,6 +13,7 @@ OC.L10N.register( "Invalid directory." : "অবৈধ ডিরেক্টরি।", "Files" : "ফাইলস", "Close" : "বন্ধ", + "Uploading..." : "আপলোডইং ...", "Download" : "ডাউনলোড করুন", "Rename" : "পুনঃনামকরণ", "Delete" : "মুছে ফেলা", diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json index 20c8c2e795e..fd1036d9926 100644 --- a/apps/files/l10n/bn_IN.json +++ b/apps/files/l10n/bn_IN.json @@ -11,6 +11,7 @@ "Invalid directory." : "অবৈধ ডিরেক্টরি।", "Files" : "ফাইলস", "Close" : "বন্ধ", + "Uploading..." : "আপলোডইং ...", "Download" : "ডাউনলোড করুন", "Rename" : "পুনঃনামকরণ", "Delete" : "মুছে ফেলা", diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js index 285808e77bc..30adf5d7b06 100644 --- a/apps/files/l10n/bs.js +++ b/apps/files/l10n/bs.js @@ -21,9 +21,9 @@ OC.L10N.register( "Invalid directory." : "Neispravan direktorij.", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvori", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}", @@ -64,7 +64,6 @@ OC.L10N.register( "Save" : "Spasi", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini učitavanje", "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!", "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json index dfe4b910b42..1d06dca2da8 100644 --- a/apps/files/l10n/bs.json +++ b/apps/files/l10n/bs.json @@ -19,9 +19,9 @@ "Invalid directory." : "Neispravan direktorij.", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvori", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}", @@ -62,7 +62,6 @@ "Save" : "Spasi", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini učitavanje", "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!", "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js index c3c16103ada..3773498f6ca 100644 --- a/apps/files/l10n/ca.js +++ b/apps/files/l10n/ca.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Directori no vàlid.", "Files" : "Fitxers", "All files" : "Tots els fitxers", - "Favorites" : "Preferits", "Home" : "Casa", "Close" : "Tanca", + "Favorites" : "Preferits", "Upload cancelled." : "La pujada s'ha cancel·lat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}", "Could not get result from server." : "No hi ha resposta del servidor.", + "Uploading..." : "Pujant...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", "Actions" : "Accions", "Download" : "Baixa", @@ -84,7 +86,6 @@ OC.L10N.register( "Save" : "Desa", "Settings" : "Arranjament", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancel·la la pujada", "No files in here" : "No hi ha arxius", "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.", "No entries found in this folder" : "No hi ha entrades en aquesta carpeta", diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json index a2b5da56dfd..2444742b1bd 100644 --- a/apps/files/l10n/ca.json +++ b/apps/files/l10n/ca.json @@ -19,14 +19,16 @@ "Invalid directory." : "Directori no vàlid.", "Files" : "Fitxers", "All files" : "Tots els fitxers", - "Favorites" : "Preferits", "Home" : "Casa", "Close" : "Tanca", + "Favorites" : "Preferits", "Upload cancelled." : "La pujada s'ha cancel·lat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}", "Could not get result from server." : "No hi ha resposta del servidor.", + "Uploading..." : "Pujant...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", "Actions" : "Accions", "Download" : "Baixa", @@ -82,7 +84,6 @@ "Save" : "Desa", "Settings" : "Arranjament", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancel·la la pujada", "No files in here" : "No hi ha arxius", "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.", "No entries found in this folder" : "No hi ha entrades en aquesta carpeta", diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index 7301549e63a..cf3190c6ca2 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Neplatný adresář", "Files" : "Soubory", "All files" : "Všechny soubory", - "Favorites" : "Oblíbené", "Home" : "Domů", "Close" : "Zavřít", + "Favorites" : "Oblíbené", "Upload cancelled." : "Odesílání zrušeno.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", + "Uploading..." : "Odesílám...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", "Download" : "Stáhnout", @@ -75,6 +77,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "Local link" : "Místní odkaz", "Folder" : "Složka", "New folder" : "Nová složka", "{newname} already exists" : "{newname} již existuje", @@ -108,7 +111,6 @@ OC.L10N.register( "Show hidden files" : "Zobrazit skryté soubory", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>", - "Cancel upload" : "Zrušit odesílání", "No files in here" : "Žádné soubory", "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!", "No entries found in this folder" : "V této složce nebylo nic nalezeno", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index 9423db1ca09..e8890dc8c12 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -19,15 +19,17 @@ "Invalid directory." : "Neplatný adresář", "Files" : "Soubory", "All files" : "Všechny soubory", - "Favorites" : "Oblíbené", "Home" : "Domů", "Close" : "Zavřít", + "Favorites" : "Oblíbené", "Upload cancelled." : "Odesílání zrušeno.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", + "Uploading..." : "Odesílám...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", "Download" : "Stáhnout", @@ -73,6 +75,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "Local link" : "Místní odkaz", "Folder" : "Složka", "New folder" : "Nová složka", "{newname} already exists" : "{newname} již existuje", @@ -106,7 +109,6 @@ "Show hidden files" : "Zobrazit skryté soubory", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>", - "Cancel upload" : "Zrušit odesílání", "No files in here" : "Žádné soubory", "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!", "No entries found in this folder" : "V této složce nebylo nic nalezeno", diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js index e3879890b86..075164ddee4 100644 --- a/apps/files/l10n/cy_GB.js +++ b/apps/files/l10n/cy_GB.js @@ -15,6 +15,7 @@ OC.L10N.register( "Home" : "Cartref", "Close" : "Cau", "Upload cancelled." : "Diddymwyd llwytho i fyny.", + "Uploading..." : "Yn llwytho i fyny...", "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", "Actions" : "Gweithredoedd", "Download" : "Llwytho i lawr", @@ -37,7 +38,6 @@ OC.L10N.register( "max. possible: " : "mwyaf. posib:", "Save" : "Cadw", "Settings" : "Gosodiadau", - "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", "Text file" : "Ffeil destun" diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json index 7d217d631ae..698a79a2d9a 100644 --- a/apps/files/l10n/cy_GB.json +++ b/apps/files/l10n/cy_GB.json @@ -13,6 +13,7 @@ "Home" : "Cartref", "Close" : "Cau", "Upload cancelled." : "Diddymwyd llwytho i fyny.", + "Uploading..." : "Yn llwytho i fyny...", "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", "Actions" : "Gweithredoedd", "Download" : "Llwytho i lawr", @@ -35,7 +36,6 @@ "max. possible: " : "mwyaf. posib:", "Save" : "Cadw", "Settings" : "Gosodiadau", - "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", "Text file" : "Ffeil destun" diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 02e0610c24a..e1013bcafbb 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Foretrukne", "Home" : "Hjemme", "Close" : "Luk", + "Favorites" : "Foretrukne", "Upload cancelled." : "Upload afbrudt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage", "Error uploading file \"{fileName}\": {message}" : "Fejl under upload af filen \"{fileName}\": {message}", "Could not get result from server." : "Kunne ikke hente resultat fra server.", + "Uploading..." : "Uploader...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", "Actions" : "Handlinger", "Download" : "Download", @@ -96,7 +98,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", - "Cancel upload" : "Fortryd upload", "No files in here" : "Her er ingen filer", "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 5a9a14c414a..3162770cc40 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Foretrukne", "Home" : "Hjemme", "Close" : "Luk", + "Favorites" : "Foretrukne", "Upload cancelled." : "Upload afbrudt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage", "Error uploading file \"{fileName}\": {message}" : "Fejl under upload af filen \"{fileName}\": {message}", "Could not get result from server." : "Kunne ikke hente resultat fra server.", + "Uploading..." : "Uploader...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", "Actions" : "Handlinger", "Download" : "Download", @@ -94,7 +96,6 @@ "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", - "Cancel upload" : "Fortryd upload", "No files in here" : "Her er ingen filer", "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 1d3c8ed51e7..068cbe85376 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Home", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 2b0ddc64950..2169d228295 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -19,15 +19,26 @@ "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Home", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -106,7 +118,6 @@ "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner", diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js index 9100dc4d820..356747e1ae1 100644 --- a/apps/files/l10n/de_AT.js +++ b/apps/files/l10n/de_AT.js @@ -21,7 +21,6 @@ OC.L10N.register( "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s löschte %1$s", "Save" : "Speichern", - "Settings" : "Einstellungen", - "Cancel upload" : "Hochladen abbrechen" + "Settings" : "Einstellungen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json index cfbffca2b31..abb023d815f 100644 --- a/apps/files/l10n/de_AT.json +++ b/apps/files/l10n/de_AT.json @@ -19,7 +19,6 @@ "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s löschte %1$s", "Save" : "Speichern", - "Settings" : "Einstellungen", - "Cancel upload" : "Hochladen abbrechen" + "Settings" : "Einstellungen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 3c3c732c885..9a349357a99 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Zuhause", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Ihre Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index f9ad749b41e..9df557e8fa4 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -19,15 +19,26 @@ "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Zuhause", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -106,7 +118,6 @@ "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Ihre Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 7b65dbc90a6..7889f274a6e 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Μη έγκυρος φάκελος.", "Files" : "Αρχεία", "All files" : "Όλα τα αρχεία", - "Favorites" : "Αγαπημένα", "Home" : "Σπίτι", "Close" : "Κλείσιμο", + "Favorites" : "Αγαπημένα", "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.", + "Uploading..." : "Μεταφόρτωση...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Actions" : "Ενέργειες", "Download" : "Λήψη", @@ -101,7 +103,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Δεν υπάρχουν τα απαραίτητα δικαιώματα για να γίνει τροποποιήση σε αυτό το σημείο.", "Settings" : "Ρυθμίσεις", "WebDAV" : "WebDAV", - "Cancel upload" : "Ακύρωση μεταφόρτωσης", "No files in here" : "Δεν υπάρχουν αρχεία", "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 982dc0c97c9..1bbec743a75 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -19,14 +19,16 @@ "Invalid directory." : "Μη έγκυρος φάκελος.", "Files" : "Αρχεία", "All files" : "Όλα τα αρχεία", - "Favorites" : "Αγαπημένα", "Home" : "Σπίτι", "Close" : "Κλείσιμο", + "Favorites" : "Αγαπημένα", "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.", + "Uploading..." : "Μεταφόρτωση...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Actions" : "Ενέργειες", "Download" : "Λήψη", @@ -99,7 +101,6 @@ "Missing permissions to edit from here." : "Δεν υπάρχουν τα απαραίτητα δικαιώματα για να γίνει τροποποιήση σε αυτό το σημείο.", "Settings" : "Ρυθμίσεις", "WebDAV" : "WebDAV", - "Cancel upload" : "Ακύρωση μεταφόρτωσης", "No files in here" : "Δεν υπάρχουν αρχεία", "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index 47e0dfa8cd2..ec8b821c3e7 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Invalid directory.", "Files" : "Files", "All files" : "All files", - "Favorites" : "Favourites", "Home" : "Home", "Close" : "Close", + "Favorites" : "Favourites", "Upload cancelled." : "Upload cancelled.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", + "Uploading..." : "Uploading...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Any moment now...", + "Soon..." : "Soon...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", "Download" : "Download", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favourited", "Favorite" : "Favourite", + "Local link" : "Local link", "Folder" : "Folder", "New folder" : "New folder", "{newname} already exists" : "{newname} already exists", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Show hidden files", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>", - "Cancel upload" : "Cancel upload", "No files in here" : "No files in here", "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!", "No entries found in this folder" : "No entries found in this folder", diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index 7cbcbaeb0f4..6dae8ba41b7 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -19,15 +19,26 @@ "Invalid directory." : "Invalid directory.", "Files" : "Files", "All files" : "All files", - "Favorites" : "Favourites", "Home" : "Home", "Close" : "Close", + "Favorites" : "Favourites", "Upload cancelled." : "Upload cancelled.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", + "Uploading..." : "Uploading...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Any moment now...", + "Soon..." : "Soon...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", "Download" : "Download", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favourited", "Favorite" : "Favourite", + "Local link" : "Local link", "Folder" : "Folder", "New folder" : "New folder", "{newname} already exists" : "{newname} already exists", @@ -106,7 +118,6 @@ "Show hidden files" : "Show hidden files", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>", - "Cancel upload" : "Cancel upload", "No files in here" : "No files in here", "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!", "No entries found in this folder" : "No entries found in this folder", diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js index d0463d0ac10..0a935b38f1b 100644 --- a/apps/files/l10n/eo.js +++ b/apps/files/l10n/eo.js @@ -20,14 +20,15 @@ OC.L10N.register( "Invalid directory." : "Nevalida dosierujo.", "Files" : "Dosieroj", "All files" : "Ĉiuj dosieroj", - "Favorites" : "Favoratoj", "Home" : "Hejmo", "Close" : "Fermi", + "Favorites" : "Favoratoj", "Upload cancelled." : "La alŝuto nuliĝis.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn", "Total file size {size1} exceeds upload limit {size2}" : "Tuta dosiergrando {size1} transpasas alŝutolimon {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ne sufiĉas libera spaco: vi alŝutas {size1} sed nur {size2} restas", "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.", + "Uploading..." : "Alŝutante...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", "Actions" : "Agoj", "Download" : "Elŝuti", @@ -102,7 +103,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Mankas permesoj por redakti ekde ĉi tie.", "Settings" : "Agordo", "WebDAV" : "WebDAV", - "Cancel upload" : "Nuligi alŝuton", "No files in here" : "Neniu dosiero estas ĉi tie", "Upload some content or sync with your devices!" : "Alŝutu iom da enhavo aŭ sinkronigu kun viaj aparatoj!", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json index 743d146699e..4b7602e11a7 100644 --- a/apps/files/l10n/eo.json +++ b/apps/files/l10n/eo.json @@ -18,14 +18,15 @@ "Invalid directory." : "Nevalida dosierujo.", "Files" : "Dosieroj", "All files" : "Ĉiuj dosieroj", - "Favorites" : "Favoratoj", "Home" : "Hejmo", "Close" : "Fermi", + "Favorites" : "Favoratoj", "Upload cancelled." : "La alŝuto nuliĝis.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn", "Total file size {size1} exceeds upload limit {size2}" : "Tuta dosiergrando {size1} transpasas alŝutolimon {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ne sufiĉas libera spaco: vi alŝutas {size1} sed nur {size2} restas", "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.", + "Uploading..." : "Alŝutante...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", "Actions" : "Agoj", "Download" : "Elŝuti", @@ -100,7 +101,6 @@ "Missing permissions to edit from here." : "Mankas permesoj por redakti ekde ĉi tie.", "Settings" : "Agordo", "WebDAV" : "WebDAV", - "Cancel upload" : "Nuligi alŝuton", "No files in here" : "Neniu dosiero estas ĉi tie", "Upload some content or sync with your devices!" : "Alŝutu iom da enhavo aŭ sinkronigu kun viaj aparatoj!", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 87f531a02e6..433945d7c60 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -21,15 +21,21 @@ OC.L10N.register( "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "En cualquier momento...", + "Soon..." : "Dentro de poco...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -40,7 +46,7 @@ OC.L10N.register( "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendiente", - "Unable to determine date" : "No se pudo determinar la fecha", + "Unable to determine date" : "No se ha podido determinar la fecha", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador", "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe", @@ -75,6 +81,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", + "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "{newname} already exists" : "{newname} ya existe", @@ -102,13 +109,12 @@ OC.L10N.register( "Maximum upload size" : "Tamaño máximo de subida", "max. possible: " : "máx. posible:", "Save" : "Guardar", - "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios se apliquen.", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.", "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "Show hidden files" : "Mostrar archivos ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Introduce esta dirección <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> en el cliente de ownCloud para acceder a tus archivos a través de él</a>", - "Cancel upload" : "Cancelar la subida", "No files in here" : "Aquí no hay archivos", "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 73366ba821b..57a6905a497 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -19,15 +19,21 @@ "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "En cualquier momento...", + "Soon..." : "Dentro de poco...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -38,7 +44,7 @@ "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendiente", - "Unable to determine date" : "No se pudo determinar la fecha", + "Unable to determine date" : "No se ha podido determinar la fecha", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador", "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe", @@ -73,6 +79,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", + "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "{newname} already exists" : "{newname} ya existe", @@ -100,13 +107,12 @@ "Maximum upload size" : "Tamaño máximo de subida", "max. possible: " : "máx. posible:", "Save" : "Guardar", - "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios se apliquen.", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.", "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "Show hidden files" : "Mostrar archivos ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Introduce esta dirección <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> en el cliente de ownCloud para acceder a tus archivos a través de él</a>", - "Cancel upload" : "Cancelar la subida", "No files in here" : "Aquí no hay archivos", "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js index 7a5df7542e3..95226ead4d2 100644 --- a/apps/files/l10n/es_AR.js +++ b/apps/files/l10n/es_AR.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "La subida fue cancelada", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Could not get result from server." : "No se pudo obtener resultados del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", "Actions" : "Acciones", "Download" : "Descargar", @@ -70,7 +71,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Configuración", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json index 03a0007c477..891fbc932ed 100644 --- a/apps/files/l10n/es_AR.json +++ b/apps/files/l10n/es_AR.json @@ -19,14 +19,15 @@ "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "La subida fue cancelada", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Could not get result from server." : "No se pudo obtener resultados del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", "Actions" : "Acciones", "Download" : "Descargar", @@ -68,7 +69,6 @@ "Save" : "Guardar", "Settings" : "Configuración", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js index 7b67ca39ac5..d918e9f434b 100644 --- a/apps/files/l10n/es_CL.js +++ b/apps/files/l10n/es_CL.js @@ -17,7 +17,6 @@ OC.L10N.register( "%2$s changed %1$s" : "%2$s cambió %1$s", "You deleted %1$s" : "Ha borrado %1$s", "%2$s deleted %1$s" : "%2$s borró %1$s", - "Settings" : "Configuración", - "Cancel upload" : "cancelar subida" + "Settings" : "Configuración" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json index 7c42b2a4097..0869209474f 100644 --- a/apps/files/l10n/es_CL.json +++ b/apps/files/l10n/es_CL.json @@ -15,7 +15,6 @@ "%2$s changed %1$s" : "%2$s cambió %1$s", "You deleted %1$s" : "Ha borrado %1$s", "%2$s deleted %1$s" : "%2$s borró %1$s", - "Settings" : "Configuración", - "Cancel upload" : "cancelar subida" + "Settings" : "Configuración" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js index 3eb1c68b888..45db24098e5 100644 --- a/apps/files/l10n/es_MX.js +++ b/apps/files/l10n/es_MX.js @@ -17,12 +17,13 @@ OC.L10N.register( "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.", "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -56,7 +57,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Ajustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json index 644ae02a3b5..76e66f1d612 100644 --- a/apps/files/l10n/es_MX.json +++ b/apps/files/l10n/es_MX.json @@ -15,12 +15,13 @@ "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.", "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -54,7 +55,6 @@ "Save" : "Guardar", "Settings" : "Ajustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js index ab205b5ecf9..fc6629c9436 100644 --- a/apps/files/l10n/et_EE.js +++ b/apps/files/l10n/et_EE.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Vigane kaust.", "Files" : "Failid", "All files" : "Kõik failid", - "Favorites" : "Lemmikud", "Home" : "Kodu", "Close" : "Sulge", + "Favorites" : "Lemmikud", "Upload cancelled." : "Üleslaadimine tühistati.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti", "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.", "Could not get result from server." : "Serverist ei saadud tulemusi", + "Uploading..." : "Üleslaadimine...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "Actions" : "Tegevused", "Download" : "Lae alla", @@ -92,7 +94,6 @@ OC.L10N.register( "Save" : "Salvesta", "Settings" : "Seaded", "WebDAV" : "WebDAV", - "Cancel upload" : "Tühista üleslaadimine", "No files in here" : "Siin ei ole faile", "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json index 15881c2a853..9dce37dc64d 100644 --- a/apps/files/l10n/et_EE.json +++ b/apps/files/l10n/et_EE.json @@ -19,14 +19,16 @@ "Invalid directory." : "Vigane kaust.", "Files" : "Failid", "All files" : "Kõik failid", - "Favorites" : "Lemmikud", "Home" : "Kodu", "Close" : "Sulge", + "Favorites" : "Lemmikud", "Upload cancelled." : "Üleslaadimine tühistati.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti", "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.", "Could not get result from server." : "Serverist ei saadud tulemusi", + "Uploading..." : "Üleslaadimine...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "Actions" : "Tegevused", "Download" : "Lae alla", @@ -90,7 +92,6 @@ "Save" : "Salvesta", "Settings" : "Seaded", "WebDAV" : "WebDAV", - "Cancel upload" : "Tühista üleslaadimine", "No files in here" : "Siin ei ole faile", "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index cb4f4486b15..5c1251d5c69 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Baliogabeko karpeta.", "Files" : "Fitxategiak", "All files" : "Fitxategi guztiak", - "Favorites" : "Gogokoak", "Home" : "Etxekoa", "Close" : "Itxi", + "Favorites" : "Gogokoak", "Upload cancelled." : "Igoera ezeztatuta", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako", "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago", "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu", + "Uploading..." : "Igotzen...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Actions" : "Ekintzak", "Download" : "Deskargatu", @@ -79,7 +81,6 @@ OC.L10N.register( "Save" : "Gorde", "Settings" : "Ezarpenak", "WebDAV" : "WebDAV", - "Cancel upload" : "Ezeztatu igoera", "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 956e25a4a91..4872c60e457 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -19,14 +19,16 @@ "Invalid directory." : "Baliogabeko karpeta.", "Files" : "Fitxategiak", "All files" : "Fitxategi guztiak", - "Favorites" : "Gogokoak", "Home" : "Etxekoa", "Close" : "Itxi", + "Favorites" : "Gogokoak", "Upload cancelled." : "Igoera ezeztatuta", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako", "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago", "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu", + "Uploading..." : "Igotzen...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Actions" : "Ekintzak", "Download" : "Deskargatu", @@ -77,7 +79,6 @@ "Save" : "Gorde", "Settings" : "Ezarpenak", "WebDAV" : "WebDAV", - "Cancel upload" : "Ezeztatu igoera", "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js index 9d5e5d46c27..233c877b4b1 100644 --- a/apps/files/l10n/fa.js +++ b/apps/files/l10n/fa.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "فهرست راهنما نامعتبر می باشد.", "Files" : "پروندهها", "All files" : "تمامی فایلها", - "Favorites" : "موارد محبوب", "Home" : "خانه", "Close" : "بستن", + "Favorites" : "موارد محبوب", "Upload cancelled." : "بار گذاری لغو شد", "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشهای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد", "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است", "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1} را انجام میدهید اما تنها {size2} فضا باقی مانده است", "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.", + "Uploading..." : "درحال بارگذاری...", "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", "Actions" : "فعالیت ها", "Download" : "دانلود", @@ -90,7 +91,6 @@ OC.L10N.register( "Save" : "ذخیره", "Settings" : "تنظیمات", "WebDAV" : "WebDAV", - "Cancel upload" : "متوقف کردن بار گذاری", "No files in here" : "هیچ فایلی اینجا وجود ندارد", "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگامسازی کنید!", "No entries found in this folder" : "هیچ ورودیای در این پوشه وجود ندارد", diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json index 53015919436..27145240997 100644 --- a/apps/files/l10n/fa.json +++ b/apps/files/l10n/fa.json @@ -19,14 +19,15 @@ "Invalid directory." : "فهرست راهنما نامعتبر می باشد.", "Files" : "پروندهها", "All files" : "تمامی فایلها", - "Favorites" : "موارد محبوب", "Home" : "خانه", "Close" : "بستن", + "Favorites" : "موارد محبوب", "Upload cancelled." : "بار گذاری لغو شد", "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشهای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد", "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است", "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1} را انجام میدهید اما تنها {size2} فضا باقی مانده است", "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.", + "Uploading..." : "درحال بارگذاری...", "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", "Actions" : "فعالیت ها", "Download" : "دانلود", @@ -88,7 +89,6 @@ "Save" : "ذخیره", "Settings" : "تنظیمات", "WebDAV" : "WebDAV", - "Cancel upload" : "متوقف کردن بار گذاری", "No files in here" : "هیچ فایلی اینجا وجود ندارد", "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگامسازی کنید!", "No entries found in this folder" : "هیچ ورودیای در این پوشه وجود ندارد", diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index acdc64861d7..325955a5492 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -21,15 +21,21 @@ OC.L10N.register( "Invalid directory." : "Virheellinen kansio.", "Files" : "Tiedostot", "All files" : "Kaikki tiedostot", - "Favorites" : "Suosikit", "Home" : "Koti", "Close" : "Sulje", + "Favorites" : "Suosikit", "Upload cancelled." : "Lähetys peruttu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", + "Uploading..." : "Lähetetään...", + "..." : "...", + "{seconds}s" : "{seconds} s", + "Any moment now..." : "Minä tahansa hetkenä...", + "Soon..." : "Pian...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", "Download" : "Lataa", @@ -109,7 +115,6 @@ OC.L10N.register( "Show hidden files" : "Näytä piilotetut tiedostot", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>", - "Cancel upload" : "Peru lähetys", "No files in here" : "Täällä ei ole tiedostoja", "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!", "No entries found in this folder" : "Ei kohteita tässä kansiossa", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index 1f8975878de..966ef7074e4 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -19,15 +19,21 @@ "Invalid directory." : "Virheellinen kansio.", "Files" : "Tiedostot", "All files" : "Kaikki tiedostot", - "Favorites" : "Suosikit", "Home" : "Koti", "Close" : "Sulje", + "Favorites" : "Suosikit", "Upload cancelled." : "Lähetys peruttu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", + "Uploading..." : "Lähetetään...", + "..." : "...", + "{seconds}s" : "{seconds} s", + "Any moment now..." : "Minä tahansa hetkenä...", + "Soon..." : "Pian...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", "Download" : "Lataa", @@ -107,7 +113,6 @@ "Show hidden files" : "Näytä piilotetut tiedostot", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>", - "Cancel upload" : "Peru lähetys", "No files in here" : "Täällä ei ole tiedostoja", "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!", "No entries found in this folder" : "Ei kohteita tässä kansiossa", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 69366bb01fc..c0d1f22e74b 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -21,15 +21,18 @@ OC.L10N.register( "Invalid directory." : "Dossier non valide.", "Files" : "Fichiers", "All files" : "Tous les fichiers", - "Favorites" : "Favoris", "Home" : "Mes fichiers", "Close" : "Fermer", + "Favorites" : "Favoris", "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", + "Uploading..." : "Téléversement en cours…", + "..." : "...", + "Soon..." : "Bientôt...", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", "Download" : "Télécharger", @@ -109,7 +112,6 @@ OC.L10N.register( "Show hidden files" : "Afficher les fichiers cachés", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>", - "Cancel upload" : "Annuler l'envoi", "No files in here" : "Aucun fichier", "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 188de2cdbe7..7db4cf95312 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -19,15 +19,18 @@ "Invalid directory." : "Dossier non valide.", "Files" : "Fichiers", "All files" : "Tous les fichiers", - "Favorites" : "Favoris", "Home" : "Mes fichiers", "Close" : "Fermer", + "Favorites" : "Favoris", "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", + "Uploading..." : "Téléversement en cours…", + "..." : "...", + "Soon..." : "Bientôt...", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", "Download" : "Télécharger", @@ -107,7 +110,6 @@ "Show hidden files" : "Afficher les fichiers cachés", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>", - "Cancel upload" : "Annuler l'envoi", "No files in here" : "Aucun fichier", "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index e02df778102..508eb5cf779 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "O directorio é incorrecto.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Inicio", "Close" : "Pechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envío cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}", "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.", + "Uploading..." : "Enviando...", "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", "Actions" : "Accións", "Download" : "Descargar", @@ -88,7 +89,6 @@ OC.L10N.register( "Save" : "Gardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar o envío", "No files in here" : "Aquí non hai ficheiros", "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!", "No entries found in this folder" : "Non se atoparon entradas neste cartafol", diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 2add4f99144..2749f170d33 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -19,14 +19,15 @@ "Invalid directory." : "O directorio é incorrecto.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Inicio", "Close" : "Pechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envío cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}", "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.", + "Uploading..." : "Enviando...", "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", "Actions" : "Accións", "Download" : "Descargar", @@ -86,7 +87,6 @@ "Save" : "Gardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar o envío", "No files in here" : "Aquí non hai ficheiros", "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!", "No entries found in this folder" : "Non se atoparon entradas neste cartafol", diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js index 138e474f307..6dbc250d55e 100644 --- a/apps/files/l10n/he.js +++ b/apps/files/l10n/he.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "תיקייה שגויה.", "Files" : "קבצים", "All files" : "כל הקבצים", - "Favorites" : "מועדפים", "Home" : "בית", "Close" : "סגירה", + "Favorites" : "מועדפים", "Upload cancelled." : "ההעלאה בוטלה.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", + "Uploading..." : "העלאה...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", "Download" : "הורדה", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "הגדרות", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ניתן להשתמש בכתובת זו כדי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">להכנס לקבצים שלך באמצעות WebDAV</a>", - "Cancel upload" : "ביטול ההעלאה", "No files in here" : "אין כאן קבצים", "Upload some content or sync with your devices!" : "יש להעלות קצת תוכן או לסנכרן עם ההתקנים שלך!", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json index fbe71b5bf4a..c436ffaebc6 100644 --- a/apps/files/l10n/he.json +++ b/apps/files/l10n/he.json @@ -19,15 +19,17 @@ "Invalid directory." : "תיקייה שגויה.", "Files" : "קבצים", "All files" : "כל הקבצים", - "Favorites" : "מועדפים", "Home" : "בית", "Close" : "סגירה", + "Favorites" : "מועדפים", "Upload cancelled." : "ההעלאה בוטלה.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", + "Uploading..." : "העלאה...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", "Download" : "הורדה", @@ -105,7 +107,6 @@ "Settings" : "הגדרות", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ניתן להשתמש בכתובת זו כדי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">להכנס לקבצים שלך באמצעות WebDAV</a>", - "Cancel upload" : "ביטול ההעלאה", "No files in here" : "אין כאן קבצים", "Upload some content or sync with your devices!" : "יש להעלות קצת תוכן או לסנכרן עם ההתקנים שלך!", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js index 906ed19d22f..0ef4a00f268 100644 --- a/apps/files/l10n/hr.js +++ b/apps/files/l10n/hr.js @@ -21,9 +21,9 @@ OC.L10N.register( "Invalid directory." : "Neispravan direktorij", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvorite", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}", @@ -79,7 +79,6 @@ OC.L10N.register( "Save" : "Spremite", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini upload", "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Select all" : "Selektiraj sve", diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json index 950dcee3471..eb0bfca6d29 100644 --- a/apps/files/l10n/hr.json +++ b/apps/files/l10n/hr.json @@ -19,9 +19,9 @@ "Invalid directory." : "Neispravan direktorij", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvorite", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}", @@ -77,7 +77,6 @@ "Save" : "Spremite", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini upload", "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Select all" : "Selektiraj sve", diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js index 181bac52a09..c2a667e04b8 100644 --- a/apps/files/l10n/hu_HU.js +++ b/apps/files/l10n/hu_HU.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Érvénytelen mappa.", "Files" : "Fájlkezelő", "All files" : "Az összes állomány", - "Favorites" : "Kedvencek", "Home" : "Otthoni", "Close" : "Bezárás", + "Favorites" : "Kedvencek", "Upload cancelled." : "A feltöltést megszakítottuk.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.", + "Uploading..." : "Feltöltés...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", "Actions" : "Műveletek", "Download" : "Letöltés", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "Rejtett fájlok megjelenítése", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.", - "Cancel upload" : "A feltöltés megszakítása", "No files in here" : "Itt nincsenek fájlok", "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json index 35e4546923b..301445001b0 100644 --- a/apps/files/l10n/hu_HU.json +++ b/apps/files/l10n/hu_HU.json @@ -19,15 +19,17 @@ "Invalid directory." : "Érvénytelen mappa.", "Files" : "Fájlkezelő", "All files" : "Az összes állomány", - "Favorites" : "Kedvencek", "Home" : "Otthoni", "Close" : "Bezárás", + "Favorites" : "Kedvencek", "Upload cancelled." : "A feltöltést megszakítottuk.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.", + "Uploading..." : "Feltöltés...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", "Actions" : "Műveletek", "Download" : "Letöltés", @@ -106,7 +108,6 @@ "Show hidden files" : "Rejtett fájlok megjelenítése", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.", - "Cancel upload" : "A feltöltés megszakítása", "No files in here" : "Itt nincsenek fájlok", "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js index 8310334287f..1cb6178700d 100644 --- a/apps/files/l10n/ia.js +++ b/apps/files/l10n/ia.js @@ -8,6 +8,7 @@ OC.L10N.register( "Files" : "Files", "Home" : "Domo", "Close" : "Clauder", + "Uploading..." : "Incargante...", "Download" : "Discargar", "Delete" : "Deler", "Unshare" : "Leva compartir", diff --git a/apps/files/l10n/ia.json b/apps/files/l10n/ia.json index eee4980e34a..e113f998748 100644 --- a/apps/files/l10n/ia.json +++ b/apps/files/l10n/ia.json @@ -6,6 +6,7 @@ "Files" : "Files", "Home" : "Domo", "Close" : "Clauder", + "Uploading..." : "Incargante...", "Download" : "Discargar", "Delete" : "Deler", "Unshare" : "Leva compartir", diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index fbf6df463d0..a036c546c07 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Direktori tidak valid.", "Files" : "Berkas", "All files" : "Semua berkas", - "Favorites" : "Favorit", "Home" : "Rumah", "Close" : "Tutup", + "Favorites" : "Favorit", "Upload cancelled." : "Pengunggahan dibatalkan.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", + "Uploading..." : "Mengunggah...", "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", "Actions" : "Tindakan", "Download" : "Unduh", @@ -92,7 +93,6 @@ OC.L10N.register( "Save" : "Simpan", "Settings" : "Pengaturan", "WebDAV" : "WebDAV", - "Cancel upload" : "Batal unggah", "No files in here" : "Tidak ada berkas disini", "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index 230c204fc67..8a0c3e825cb 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -19,14 +19,15 @@ "Invalid directory." : "Direktori tidak valid.", "Files" : "Berkas", "All files" : "Semua berkas", - "Favorites" : "Favorit", "Home" : "Rumah", "Close" : "Tutup", + "Favorites" : "Favorit", "Upload cancelled." : "Pengunggahan dibatalkan.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", + "Uploading..." : "Mengunggah...", "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", "Actions" : "Tindakan", "Download" : "Unduh", @@ -90,7 +91,6 @@ "Save" : "Simpan", "Settings" : "Pengaturan", "WebDAV" : "WebDAV", - "Cancel upload" : "Batal unggah", "No files in here" : "Tidak ada berkas disini", "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index 1a2fe2dd914..811add007bf 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ógild mappa.", "Files" : "Skrár", "All files" : "Allar skrár", - "Favorites" : "Eftirlæti", "Home" : "Heim", "Close" : "Loka", + "Favorites" : "Eftirlæti", "Upload cancelled." : "Hætt við innsendingu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tókst ekki að hlaða inn {filename} þar sem þetta er mappa eða er 0 bæti", "Total file size {size1} exceeds upload limit {size2}" : "Heildarskráastærð {size1} er meiri en leyfilegt innsendingahámark {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ekki nægilegt laust pláss, þú ert að senda inn {size1} en einungis {size2} eru eftir", "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", + "Uploading..." : "Sendi inn ...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.", "Actions" : "Aðgerðir", "Download" : "Niðurhal", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Stillingar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>", - "Cancel upload" : "Hætta við innsendingu", "No files in here" : "Engar skrár hér", "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index 4f7c3822c0f..13dc3717406 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ógild mappa.", "Files" : "Skrár", "All files" : "Allar skrár", - "Favorites" : "Eftirlæti", "Home" : "Heim", "Close" : "Loka", + "Favorites" : "Eftirlæti", "Upload cancelled." : "Hætt við innsendingu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tókst ekki að hlaða inn {filename} þar sem þetta er mappa eða er 0 bæti", "Total file size {size1} exceeds upload limit {size2}" : "Heildarskráastærð {size1} er meiri en leyfilegt innsendingahámark {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ekki nægilegt laust pláss, þú ert að senda inn {size1} en einungis {size2} eru eftir", "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", + "Uploading..." : "Sendi inn ...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.", "Actions" : "Aðgerðir", "Download" : "Niðurhal", @@ -105,7 +107,6 @@ "Settings" : "Stillingar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>", - "Cancel upload" : "Hætta við innsendingu", "No files in here" : "Engar skrár hér", "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 3dc112ad4cd..7d85f952ed4 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Cartella non valida.", "Files" : "File", "All files" : "Tutti i file", - "Favorites" : "Preferiti", "Home" : "Home", "Close" : "Chiudi", + "Favorites" : "Preferiti", "Upload cancelled." : "Caricamento annullato.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", + "Uploading..." : "Caricamento in corso...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Da un momento all'altro...", + "Soon..." : "Presto...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", "Download" : "Scarica", @@ -109,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Mostra i file nascosti", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>", - "Cancel upload" : "Annulla caricamento", "No files in here" : "Qui non c'è alcun file", "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 4c6781dce85..ec7003f7382 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -19,15 +19,26 @@ "Invalid directory." : "Cartella non valida.", "Files" : "File", "All files" : "Tutti i file", - "Favorites" : "Preferiti", "Home" : "Home", "Close" : "Chiudi", + "Favorites" : "Preferiti", "Upload cancelled." : "Caricamento annullato.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", + "Uploading..." : "Caricamento in corso...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Da un momento all'altro...", + "Soon..." : "Presto...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", "Download" : "Scarica", @@ -107,7 +118,6 @@ "Show hidden files" : "Mostra i file nascosti", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>", - "Cancel upload" : "Annulla caricamento", "No files in here" : "Qui non c'è alcun file", "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index d0eaf997dc5..ff3b14dc2b4 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "無効なディレクトリです。", "Files" : "ファイル", "All files" : "すべてのファイル", - "Favorites" : "お気に入り", "Home" : "ホーム", "Close" : "閉じる", + "Favorites" : "お気に入り", "Upload cancelled." : "アップロードはキャンセルされました。", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", + "Uploading..." : "アップロード中...", + "..." : "…", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", "Download" : "ダウンロード", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "隠しファイルを表示", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください", - "Cancel upload" : "アップロードをキャンセル", "No files in here" : "ファイルがありません", "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。", "No entries found in this folder" : "このフォルダーにはエントリーがありません", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index b326ee0e56a..2719e9d50a5 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -19,15 +19,17 @@ "Invalid directory." : "無効なディレクトリです。", "Files" : "ファイル", "All files" : "すべてのファイル", - "Favorites" : "お気に入り", "Home" : "ホーム", "Close" : "閉じる", + "Favorites" : "お気に入り", "Upload cancelled." : "アップロードはキャンセルされました。", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", + "Uploading..." : "アップロード中...", + "..." : "…", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", "Download" : "ダウンロード", @@ -106,7 +108,6 @@ "Show hidden files" : "隠しファイルを表示", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください", - "Cancel upload" : "アップロードをキャンセル", "No files in here" : "ファイルがありません", "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。", "No entries found in this folder" : "このフォルダーにはエントリーがありません", diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js index c54da5a206d..510b1db25eb 100644 --- a/apps/files/l10n/ka_GE.js +++ b/apps/files/l10n/ka_GE.js @@ -13,10 +13,11 @@ OC.L10N.register( "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის", "Invalid directory." : "დაუშვებელი დირექტორია.", "Files" : "ფაილები", - "Favorites" : "ფავორიტები", "Home" : "სახლი", "Close" : "დახურვა", + "Favorites" : "ფავორიტები", "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.", + "Uploading..." : "მიმდინარეობს ატვირთვა...", "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", "Actions" : "მოქმედებები", "Download" : "ჩამოტვირთვა", @@ -42,7 +43,6 @@ OC.L10N.register( "Save" : "შენახვა", "Settings" : "პარამეტრები", "WebDAV" : "WebDAV", - "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", "Text file" : "ტექსტური ფაილი" diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json index cdc9cd03126..55cc188305b 100644 --- a/apps/files/l10n/ka_GE.json +++ b/apps/files/l10n/ka_GE.json @@ -11,10 +11,11 @@ "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის", "Invalid directory." : "დაუშვებელი დირექტორია.", "Files" : "ფაილები", - "Favorites" : "ფავორიტები", "Home" : "სახლი", "Close" : "დახურვა", + "Favorites" : "ფავორიტები", "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.", + "Uploading..." : "მიმდინარეობს ატვირთვა...", "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", "Actions" : "მოქმედებები", "Download" : "ჩამოტვირთვა", @@ -40,7 +41,6 @@ "Save" : "შენახვა", "Settings" : "პარამეტრები", "WebDAV" : "WebDAV", - "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", "Text file" : "ტექსტური ფაილი" diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js index 55080926fc3..0202944bc42 100644 --- a/apps/files/l10n/km.js +++ b/apps/files/l10n/km.js @@ -7,6 +7,7 @@ OC.L10N.register( "Files" : "ឯកសារ", "Close" : "បិទ", "Upload cancelled." : "បានបោះបង់ការផ្ទុកឡើង។", + "Uploading..." : "កំពុងដាក់បញ្ចូល...", "Download" : "ទាញយក", "Rename" : "ប្ដូរឈ្មោះ", "Delete" : "លុប", @@ -31,7 +32,6 @@ OC.L10N.register( "Save" : "រក្សាទុក", "Settings" : "ការកំណត់", "WebDAV" : "WebDAV", - "Cancel upload" : "បោះបង់ការផ្ទុកឡើង", "Upload too large" : "ផ្ទុកឡើងធំពេក", "Text file" : "ឯកសារអក្សរ" }, diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json index c1e9159ee88..8f4b54f10bc 100644 --- a/apps/files/l10n/km.json +++ b/apps/files/l10n/km.json @@ -5,6 +5,7 @@ "Files" : "ឯកសារ", "Close" : "បិទ", "Upload cancelled." : "បានបោះបង់ការផ្ទុកឡើង។", + "Uploading..." : "កំពុងដាក់បញ្ចូល...", "Download" : "ទាញយក", "Rename" : "ប្ដូរឈ្មោះ", "Delete" : "លុប", @@ -29,7 +30,6 @@ "Save" : "រក្សាទុក", "Settings" : "ការកំណត់", "WebDAV" : "WebDAV", - "Cancel upload" : "បោះបង់ការផ្ទុកឡើង", "Upload too large" : "ផ្ទុកឡើងធំពេក", "Text file" : "ឯកសារអក្សរ" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js index 1e97d7ffa79..6ad65bf9806 100644 --- a/apps/files/l10n/kn.js +++ b/apps/files/l10n/kn.js @@ -17,9 +17,9 @@ OC.L10N.register( "Invalid directory." : "ಅಮಾನ್ಯ ಕಡತಕೋಶ.", "Files" : "ಕಡತಗಳು", "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು", - "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Home" : "ಮುಖಪುಟ", "Close" : "ಮುಚ್ಚು", + "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.", "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ", @@ -51,7 +51,6 @@ OC.L10N.register( "Save" : "ಉಳಿಸಿ", "Settings" : "ಆಯ್ಕೆ", "WebDAV" : "WebDAV", - "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ", "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json index 9ebd3cb619b..5fda4e75989 100644 --- a/apps/files/l10n/kn.json +++ b/apps/files/l10n/kn.json @@ -15,9 +15,9 @@ "Invalid directory." : "ಅಮಾನ್ಯ ಕಡತಕೋಶ.", "Files" : "ಕಡತಗಳು", "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು", - "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Home" : "ಮುಖಪುಟ", "Close" : "ಮುಚ್ಚು", + "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.", "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ", @@ -49,7 +49,6 @@ "Save" : "ಉಳಿಸಿ", "Settings" : "ಆಯ್ಕೆ", "WebDAV" : "WebDAV", - "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ", "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index 38e16404c30..9b4afb356ba 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -21,15 +21,18 @@ OC.L10N.register( "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", "All files" : "모든 파일", - "Favorites" : "즐겨찾기", "Home" : "가정", "Close" : "닫기", + "Favorites" : "즐겨찾기", "Upload cancelled." : "업로드가 취소되었습니다.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", + "Uploading..." : "업로드 중...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", "Download" : "다운로드", @@ -106,7 +109,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", - "Cancel upload" : "업로드 취소", "No files in here" : "여기에 파일 없음", "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", "No entries found in this folder" : "이 폴더에 항목 없음", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index 1702efc58fa..e31db19186c 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -19,15 +19,18 @@ "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", "All files" : "모든 파일", - "Favorites" : "즐겨찾기", "Home" : "가정", "Close" : "닫기", + "Favorites" : "즐겨찾기", "Upload cancelled." : "업로드가 취소되었습니다.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", + "Uploading..." : "업로드 중...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", "Download" : "다운로드", @@ -104,7 +107,6 @@ "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", - "Cancel upload" : "업로드 취소", "No files in here" : "여기에 파일 없음", "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", "No entries found in this folder" : "이 폴더에 항목 없음", diff --git a/apps/files/l10n/ku_IQ.js b/apps/files/l10n/ku_IQ.js index 1ceca50b705..804dec891f0 100644 --- a/apps/files/l10n/ku_IQ.js +++ b/apps/files/l10n/ku_IQ.js @@ -2,8 +2,8 @@ OC.L10N.register( "files", { "Files" : "پهڕگەکان", - "Favorites" : "دڵخوازەکان", "Close" : "دابخه", + "Favorites" : "دڵخوازەکان", "Download" : "داگرتن", "Select" : "دیاریکردنی", "Name" : "ناو", diff --git a/apps/files/l10n/ku_IQ.json b/apps/files/l10n/ku_IQ.json index e934b5eb29b..b54d56a922f 100644 --- a/apps/files/l10n/ku_IQ.json +++ b/apps/files/l10n/ku_IQ.json @@ -1,7 +1,7 @@ { "translations": { "Files" : "پهڕگەکان", - "Favorites" : "دڵخوازەکان", "Close" : "دابخه", + "Favorites" : "دڵخوازەکان", "Download" : "داگرتن", "Select" : "دیاریکردنی", "Name" : "ناو", diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js index c6ee76819ec..d0d40965dab 100644 --- a/apps/files/l10n/lb.js +++ b/apps/files/l10n/lb.js @@ -9,10 +9,11 @@ OC.L10N.register( "Missing a temporary folder" : "Et feelt en temporären Dossier", "Failed to write to disk" : "Konnt net op den Disk schreiwen", "Files" : "Dateien", - "Favorites" : "Favoriten", "Home" : "Doheem", "Close" : "Zoumaachen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload ofgebrach.", + "Uploading..." : "Lueden erop...", "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Download" : "Download", "Rename" : "Ëmbenennen", @@ -32,7 +33,6 @@ OC.L10N.register( "max. possible: " : "max. méiglech:", "Save" : "Späicheren", "Settings" : "Astellungen", - "Cancel upload" : "Upload ofbriechen", "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json index 59289599719..d4e81d1d0ba 100644 --- a/apps/files/l10n/lb.json +++ b/apps/files/l10n/lb.json @@ -7,10 +7,11 @@ "Missing a temporary folder" : "Et feelt en temporären Dossier", "Failed to write to disk" : "Konnt net op den Disk schreiwen", "Files" : "Dateien", - "Favorites" : "Favoriten", "Home" : "Doheem", "Close" : "Zoumaachen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload ofgebrach.", + "Uploading..." : "Lueden erop...", "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Download" : "Download", "Rename" : "Ëmbenennen", @@ -30,7 +31,6 @@ "max. possible: " : "max. méiglech:", "Save" : "Späicheren", "Settings" : "Astellungen", - "Cancel upload" : "Upload ofbriechen", "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js index 958cc833b96..524877d6137 100644 --- a/apps/files/l10n/lt_LT.js +++ b/apps/files/l10n/lt_LT.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Neteisingas aplankas", "Files" : "Failai", "All files" : "Visi failai", - "Favorites" : "Mėgstamiausi", "Home" : "Namų", "Close" : "Užverti", + "Favorites" : "Mėgstamiausi", "Upload cancelled." : "Įkėlimas atšauktas.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio", "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę", "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.", + "Uploading..." : "Įkeliama...", "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", "Actions" : "Veiksmai", "Download" : "Atsisiųsti", @@ -105,7 +106,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Draudžiama iš čia redaguoti", "Settings" : "Nustatymai", "WebDAV" : "WebDAV", - "Cancel upload" : "Atšaukti siuntimą", "No files in here" : "Čia nėra failų", "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!", "No entries found in this folder" : "Nerasta įrašų šiame aplanke", diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json index 6613ea4e6ad..a75798167ae 100644 --- a/apps/files/l10n/lt_LT.json +++ b/apps/files/l10n/lt_LT.json @@ -19,14 +19,15 @@ "Invalid directory." : "Neteisingas aplankas", "Files" : "Failai", "All files" : "Visi failai", - "Favorites" : "Mėgstamiausi", "Home" : "Namų", "Close" : "Užverti", + "Favorites" : "Mėgstamiausi", "Upload cancelled." : "Įkėlimas atšauktas.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio", "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę", "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.", + "Uploading..." : "Įkeliama...", "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", "Actions" : "Veiksmai", "Download" : "Atsisiųsti", @@ -103,7 +104,6 @@ "Missing permissions to edit from here." : "Draudžiama iš čia redaguoti", "Settings" : "Nustatymai", "WebDAV" : "WebDAV", - "Cancel upload" : "Atšaukti siuntimą", "No files in here" : "Čia nėra failų", "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!", "No entries found in this folder" : "Nerasta įrašų šiame aplanke", diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js index 9efd5f087cd..5efe5d6f2bd 100644 --- a/apps/files/l10n/lv.js +++ b/apps/files/l10n/lv.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Nederīga direktorija.", "Files" : "Datnes", "All files" : "Visas datnes", - "Favorites" : "Iecienītie", "Home" : "Mājas", "Close" : "Aizvērt", + "Favorites" : "Iecienītie", "Upload cancelled." : "Augšupielāde ir atcelta.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.", "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", + "Uploading..." : "Augšupielādē...", "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", "Actions" : "Darbības", "Download" : "Lejupielādēt", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Saglabāt", "Settings" : "Iestatījumi", "WebDAV" : "WebDAV", - "Cancel upload" : "Atcelt augšupielādi", "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json index 685801c471f..3148589deb4 100644 --- a/apps/files/l10n/lv.json +++ b/apps/files/l10n/lv.json @@ -19,14 +19,15 @@ "Invalid directory." : "Nederīga direktorija.", "Files" : "Datnes", "All files" : "Visas datnes", - "Favorites" : "Iecienītie", "Home" : "Mājas", "Close" : "Aizvērt", + "Favorites" : "Iecienītie", "Upload cancelled." : "Augšupielāde ir atcelta.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.", "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", + "Uploading..." : "Augšupielādē...", "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", "Actions" : "Darbības", "Download" : "Lejupielādēt", @@ -79,7 +80,6 @@ "Save" : "Saglabāt", "Settings" : "Iestatījumi", "WebDAV" : "WebDAV", - "Cancel upload" : "Atcelt augšupielādi", "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js index ec8387af0f6..d6a8369cab3 100644 --- a/apps/files/l10n/mk.js +++ b/apps/files/l10n/mk.js @@ -19,11 +19,12 @@ OC.L10N.register( "Invalid directory." : "Погрешна папка.", "Files" : "Датотеки", "All files" : "Сите датотеки", - "Favorites" : "Омилени", "Home" : "Дома", "Close" : "Затвори", + "Favorites" : "Омилени", "Upload cancelled." : "Преземањето е прекинато.", "Could not get result from server." : "Не можам да добијам резултат од серверот.", + "Uploading..." : "Подигнувам...", "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "Actions" : "Акции", "Download" : "Преземи", @@ -67,7 +68,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука", "Settings" : "Подесувања", "WebDAV" : "WebDAV", - "Cancel upload" : "Откажи прикачување", "No files in here" : "Тука нема датотеки", "No entries found in this folder" : "Нема ништо во оваа папка", "Select all" : "Избери се", diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json index e587f4883ef..b7523498fbd 100644 --- a/apps/files/l10n/mk.json +++ b/apps/files/l10n/mk.json @@ -17,11 +17,12 @@ "Invalid directory." : "Погрешна папка.", "Files" : "Датотеки", "All files" : "Сите датотеки", - "Favorites" : "Омилени", "Home" : "Дома", "Close" : "Затвори", + "Favorites" : "Омилени", "Upload cancelled." : "Преземањето е прекинато.", "Could not get result from server." : "Не можам да добијам резултат од серверот.", + "Uploading..." : "Подигнувам...", "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "Actions" : "Акции", "Download" : "Преземи", @@ -65,7 +66,6 @@ "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука", "Settings" : "Подесувања", "WebDAV" : "WebDAV", - "Cancel upload" : "Откажи прикачување", "No files in here" : "Тука нема датотеки", "No entries found in this folder" : "Нема ништо во оваа папка", "Select all" : "Избери се", diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js index dcd0c8e15e8..c29758cfba1 100644 --- a/apps/files/l10n/ms_MY.js +++ b/apps/files/l10n/ms_MY.js @@ -30,7 +30,6 @@ OC.L10N.register( "max. possible: " : "maksimum:", "Save" : "Simpan", "Settings" : "Tetapan", - "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", "Text file" : "Fail teks" diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json index 6f7b93d6ef1..c1202e3eb40 100644 --- a/apps/files/l10n/ms_MY.json +++ b/apps/files/l10n/ms_MY.json @@ -28,7 +28,6 @@ "max. possible: " : "maksimum:", "Save" : "Simpan", "Settings" : "Tetapan", - "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", "Text file" : "Fail teks" diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index 086ed3bc144..c0eb97fbc18 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ugyldig katalog.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favoritter", "Home" : "Hjem", "Close" : "Lukk", + "Favorites" : "Favoritter", "Upload cancelled." : "Opplasting avbrutt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", + "Uploading..." : "Laster opp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", "Download" : "Last ned", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Innstillinger", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>", - "Cancel upload" : "Avbryt opplasting", "No files in here" : "Ingen filer her", "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 0f034867f51..95ae79f1d72 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ugyldig katalog.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favoritter", "Home" : "Hjem", "Close" : "Lukk", + "Favorites" : "Favoritter", "Upload cancelled." : "Opplasting avbrutt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", + "Uploading..." : "Laster opp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", "Download" : "Last ned", @@ -105,7 +107,6 @@ "Settings" : "Innstillinger", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>", - "Cancel upload" : "Avbryt opplasting", "No files in here" : "Ingen filer her", "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", diff --git a/apps/files/l10n/nds.js b/apps/files/l10n/nds.js index 5e3a7c06142..487af19faef 100644 --- a/apps/files/l10n/nds.js +++ b/apps/files/l10n/nds.js @@ -13,7 +13,6 @@ OC.L10N.register( "New folder" : "Neuer Ordner", "Upload" : "Hochladen", "Settings" : "Einstellungen", - "WebDAV" : "WebDAV", - "Cancel upload" : "Upload abbrechen" + "WebDAV" : "WebDAV" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/nds.json b/apps/files/l10n/nds.json index 62b55a1b64e..6fda367103a 100644 --- a/apps/files/l10n/nds.json +++ b/apps/files/l10n/nds.json @@ -11,7 +11,6 @@ "New folder" : "Neuer Ordner", "Upload" : "Hochladen", "Settings" : "Einstellungen", - "WebDAV" : "WebDAV", - "Cancel upload" : "Upload abbrechen" + "WebDAV" : "WebDAV" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index cb565a4a725..94483ede498 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ongeldige directory.", "Files" : "Bestanden", "All files" : "Alle bestanden", - "Favorites" : "Favorieten", "Home" : "Thuis", "Close" : "Sluiten", + "Favorites" : "Favorieten", "Upload cancelled." : "Uploaden geannuleerd.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", + "Uploading..." : "Uploading...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", "Download" : "Downloaden", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "Tonen verborgen bestanden", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om uw bestanden via WebDAV te benaderen</a>", - "Cancel upload" : "Upload afbreken", "No files in here" : "Hier geen bestanden", "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!", "No entries found in this folder" : "Niets", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 190abe67919..524570f487e 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ongeldige directory.", "Files" : "Bestanden", "All files" : "Alle bestanden", - "Favorites" : "Favorieten", "Home" : "Thuis", "Close" : "Sluiten", + "Favorites" : "Favorieten", "Upload cancelled." : "Uploaden geannuleerd.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", + "Uploading..." : "Uploading...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", "Download" : "Downloaden", @@ -106,7 +108,6 @@ "Show hidden files" : "Tonen verborgen bestanden", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om uw bestanden via WebDAV te benaderen</a>", - "Cancel upload" : "Upload afbreken", "No files in here" : "Hier geen bestanden", "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!", "No entries found in this folder" : "Niets", diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js index ee983939e7d..73d01d0461f 100644 --- a/apps/files/l10n/nn_NO.js +++ b/apps/files/l10n/nn_NO.js @@ -18,12 +18,13 @@ OC.L10N.register( "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favorittar", "Home" : "Heime", "Close" : "Lukk", + "Favorites" : "Favorittar", "Upload cancelled." : "Opplasting avbroten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.", "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.", + "Uploading..." : "Lastar opp …", "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "Actions" : "Handlingar", "Download" : "Last ned", @@ -63,7 +64,6 @@ OC.L10N.register( "Save" : "Lagre", "Settings" : "Innstillingar", "WebDAV" : "WebDAV", - "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", "Text file" : "Tekst fil" diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json index ec9b4efef11..199bb6aeb9a 100644 --- a/apps/files/l10n/nn_NO.json +++ b/apps/files/l10n/nn_NO.json @@ -16,12 +16,13 @@ "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favorittar", "Home" : "Heime", "Close" : "Lukk", + "Favorites" : "Favorittar", "Upload cancelled." : "Opplasting avbroten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.", "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.", + "Uploading..." : "Lastar opp …", "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "Actions" : "Handlingar", "Download" : "Last ned", @@ -61,7 +62,6 @@ "Save" : "Lagre", "Settings" : "Innstillingar", "WebDAV" : "WebDAV", - "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", "Text file" : "Tekst fil" diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js index 567e3bfa6f5..5e5bc3dc11b 100644 --- a/apps/files/l10n/oc.js +++ b/apps/files/l10n/oc.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Dorsièr invalid.", "Files" : "Fichièrs", "All files" : "Totes los fichièrs", - "Favorites" : "Favorits", "Home" : "Mos fichièrs", "Close" : "Tampar", + "Favorites" : "Favorits", "Upload cancelled." : "Mandadís anullat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla", "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles", "Could not get result from server." : "Pòt pas recebre los resultats del servidor.", + "Uploading..." : "Mandadís en cors…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.", "Actions" : "Accions", "Download" : "Telecargar", @@ -105,7 +107,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Manca de permissions per editar a partir d'aicí.", "Settings" : "Paramètres", "WebDAV" : "WebDAV", - "Cancel upload" : "Anullar lo mandadís", "No files in here" : "Pas cap de fichièr aicí", "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json index a6e32c220ab..156794e707d 100644 --- a/apps/files/l10n/oc.json +++ b/apps/files/l10n/oc.json @@ -19,14 +19,16 @@ "Invalid directory." : "Dorsièr invalid.", "Files" : "Fichièrs", "All files" : "Totes los fichièrs", - "Favorites" : "Favorits", "Home" : "Mos fichièrs", "Close" : "Tampar", + "Favorites" : "Favorits", "Upload cancelled." : "Mandadís anullat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla", "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles", "Could not get result from server." : "Pòt pas recebre los resultats del servidor.", + "Uploading..." : "Mandadís en cors…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.", "Actions" : "Accions", "Download" : "Telecargar", @@ -103,7 +105,6 @@ "Missing permissions to edit from here." : "Manca de permissions per editar a partir d'aicí.", "Settings" : "Paramètres", "WebDAV" : "WebDAV", - "Cancel upload" : "Anullar lo mandadís", "No files in here" : "Pas cap de fichièr aicí", "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js index 847adbc5ac1..fd44d84e81c 100644 --- a/apps/files/l10n/pa.js +++ b/apps/files/l10n/pa.js @@ -8,7 +8,6 @@ OC.L10N.register( "Delete" : "ਹਟਾਓ", "Details" : "ਵੇਰਵ", "Upload" : "ਅੱਪਲੋਡ", - "Settings" : "ਸੈਟਿੰਗ", - "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + "Settings" : "ਸੈਟਿੰਗ" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json index 6d7025feec1..0aebbb53bd0 100644 --- a/apps/files/l10n/pa.json +++ b/apps/files/l10n/pa.json @@ -6,7 +6,6 @@ "Delete" : "ਹਟਾਓ", "Details" : "ਵੇਰਵ", "Upload" : "ਅੱਪਲੋਡ", - "Settings" : "ਸੈਟਿੰਗ", - "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + "Settings" : "ਸੈਟਿੰਗ" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index 04a57287e32..6a5b74a253f 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Zła ścieżka.", "Files" : "Pliki", "All files" : "Wszystkie pliki", - "Favorites" : "Ulubione", "Home" : "Dom", "Close" : "Zamknij", + "Favorites" : "Ulubione", "Upload cancelled." : "Wczytywanie anulowane.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów", "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}", "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", + "Uploading..." : "Wgrywanie....", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", "Actions" : "Akcje", "Download" : "Pobierz", @@ -96,7 +98,6 @@ OC.L10N.register( "Settings" : "Ustawienia", "Show hidden files" : "Pokaż ukryte pliki", "WebDAV" : "WebDAV", - "Cancel upload" : "Anuluj wysyłanie", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Select all" : "Wybierz wszystko", diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index e8dc25de050..e67527bc634 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -19,15 +19,17 @@ "Invalid directory." : "Zła ścieżka.", "Files" : "Pliki", "All files" : "Wszystkie pliki", - "Favorites" : "Ulubione", "Home" : "Dom", "Close" : "Zamknij", + "Favorites" : "Ulubione", "Upload cancelled." : "Wczytywanie anulowane.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów", "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}", "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", + "Uploading..." : "Wgrywanie....", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", "Actions" : "Akcje", "Download" : "Pobierz", @@ -94,7 +96,6 @@ "Settings" : "Ustawienia", "Show hidden files" : "Pokaż ukryte pliki", "WebDAV" : "WebDAV", - "Cancel upload" : "Anuluj wysyłanie", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Select all" : "Wybierz wszystko", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 7469013f447..d8a7097161d 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Diretório inválido.", "Files" : "Arquivos", "All files" : "Todos os arquivos", - "Favorites" : "Favoritos", "Home" : "Home", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "Enviando...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "A qualquer momento...", + "Soon..." : "Logo...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", "Download" : "Baixar", @@ -109,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Mostrar arquivos escondidos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", - "Cancel upload" : "Cancelar envio", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index e18c6dbccad..f5fa97a94af 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -19,15 +19,26 @@ "Invalid directory." : "Diretório inválido.", "Files" : "Arquivos", "All files" : "Todos os arquivos", - "Favorites" : "Favoritos", "Home" : "Home", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "Enviando...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "A qualquer momento...", + "Soon..." : "Logo...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", "Download" : "Baixar", @@ -107,7 +118,6 @@ "Show hidden files" : "Mostrar arquivos escondidos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", - "Cancel upload" : "Cancelar envio", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index ed4819046a2..653f7552bb9 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Diretoria inválida.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "A carregar...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", "Download" : "Descarregar", @@ -75,6 +77,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "Local link" : "Ligação Local", "Folder" : "Pasta", "New folder" : "Nova Pasta", "{newname} already exists" : "{newname} já existe", @@ -108,7 +111,6 @@ OC.L10N.register( "Show hidden files" : "Mostrar ficheiros ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">aceder aos seus ficheiros via WebDAV</a>", - "Cancel upload" : "Cancelar o envio", "No files in here" : "Nenhuns ficheiros aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index c2104a25703..0a3e1b040e9 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -19,15 +19,17 @@ "Invalid directory." : "Diretoria inválida.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "A carregar...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", "Download" : "Descarregar", @@ -73,6 +75,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "Local link" : "Ligação Local", "Folder" : "Pasta", "New folder" : "Nova Pasta", "{newname} already exists" : "{newname} já existe", @@ -106,7 +109,6 @@ "Show hidden files" : "Mostrar ficheiros ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">aceder aos seus ficheiros via WebDAV</a>", - "Cancel upload" : "Cancelar o envio", "No files in here" : "Nenhuns ficheiros aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js index 654bc42a260..a0ecbc06e27 100644 --- a/apps/files/l10n/ro.js +++ b/apps/files/l10n/ro.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Dosar invalid.", "Files" : "Fișiere", "All files" : "Toate fișierele.", - "Favorites" : "Favorite", "Home" : "Acasă", "Close" : "Închide", + "Favorites" : "Favorite", "Upload cancelled." : "Încărcare anulată.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți", "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas", "Could not get result from server." : "Nu se poate obține rezultatul de la server.", + "Uploading..." : "Încărcare", "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", "Actions" : "Acțiuni", "Download" : "Descarcă", @@ -42,6 +43,8 @@ OC.L10N.register( "Unable to determine date" : "Nu s-a putut determina data", "This operation is forbidden" : "Operațiunea este interzisă", "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", + "Could not move \"{file}\", target exists" : "Nu s-a putut muta fișierul \"{file}\", există deja un altul cu același nume în directorul destinație", + "Could not move \"{file}\"" : "Nu s-a putut muta fișierul \"{file}\"", "{newName} already exists" : "{newName} există deja", "Could not rename \"{fileName}\"" : "Nu s-a putut redenumi \"{fileName}\"", "Could not create file \"{file}\"" : "Nu s-a putut crea fișierul \"{file}\"", @@ -87,7 +90,6 @@ OC.L10N.register( "Save" : "Salvează", "Settings" : "Setări", "WebDAV" : "WebDAV", - "Cancel upload" : "Anulează încărcarea", "No files in here" : "Niciun fișier aici", "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json index 81ea6b24d46..6adf4eaac55 100644 --- a/apps/files/l10n/ro.json +++ b/apps/files/l10n/ro.json @@ -19,14 +19,15 @@ "Invalid directory." : "Dosar invalid.", "Files" : "Fișiere", "All files" : "Toate fișierele.", - "Favorites" : "Favorite", "Home" : "Acasă", "Close" : "Închide", + "Favorites" : "Favorite", "Upload cancelled." : "Încărcare anulată.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți", "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas", "Could not get result from server." : "Nu se poate obține rezultatul de la server.", + "Uploading..." : "Încărcare", "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", "Actions" : "Acțiuni", "Download" : "Descarcă", @@ -40,6 +41,8 @@ "Unable to determine date" : "Nu s-a putut determina data", "This operation is forbidden" : "Operațiunea este interzisă", "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", + "Could not move \"{file}\", target exists" : "Nu s-a putut muta fișierul \"{file}\", există deja un altul cu același nume în directorul destinație", + "Could not move \"{file}\"" : "Nu s-a putut muta fișierul \"{file}\"", "{newName} already exists" : "{newName} există deja", "Could not rename \"{fileName}\"" : "Nu s-a putut redenumi \"{fileName}\"", "Could not create file \"{file}\"" : "Nu s-a putut crea fișierul \"{file}\"", @@ -85,7 +88,6 @@ "Save" : "Salvează", "Settings" : "Setări", "WebDAV" : "WebDAV", - "Cancel upload" : "Anulează încărcarea", "No files in here" : "Niciun fișier aici", "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index 8e20c65f548..1c54751807b 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Неверный каталог.", "Files" : "Файлы", "All files" : "Все файлы", - "Favorites" : "Избранное", "Home" : "Главная", "Close" : "Закрыть", + "Favorites" : "Избранное", "Upload cancelled." : "Загрузка отменена.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", + "Uploading..." : "Загрузка...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} час{plural_s} осталось", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} минут{plural_s} осталось", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} секунд{plural_s} осталось", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "В любой момент...", + "Soon..." : "Скоро...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", "Actions" : "Действия", "Download" : "Скачать", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", + "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "{newname} already exists" : "{newname} уже существует", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Показать скрытые файлы", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа к вашим файлам по WebDAV</a>", - "Cancel upload" : "Отменить загрузку", "No files in here" : "Здесь нет файлов", "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!", "No entries found in this folder" : "Ничего не найдено", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index d4f8617e343..88cae3d0577 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -19,15 +19,26 @@ "Invalid directory." : "Неверный каталог.", "Files" : "Файлы", "All files" : "Все файлы", - "Favorites" : "Избранное", "Home" : "Главная", "Close" : "Закрыть", + "Favorites" : "Избранное", "Upload cancelled." : "Загрузка отменена.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", + "Uploading..." : "Загрузка...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} час{plural_s} осталось", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} минут{plural_s} осталось", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} секунд{plural_s} осталось", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "В любой момент...", + "Soon..." : "Скоро...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", "Actions" : "Действия", "Download" : "Скачать", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", + "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "{newname} already exists" : "{newname} уже существует", @@ -106,7 +118,6 @@ "Show hidden files" : "Показать скрытые файлы", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа к вашим файлам по WebDAV</a>", - "Cancel upload" : "Отменить загрузку", "No files in here" : "Здесь нет файлов", "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!", "No entries found in this folder" : "Ничего не найдено", diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js index 4c26c421076..88db222a45c 100644 --- a/apps/files/l10n/si_LK.js +++ b/apps/files/l10n/si_LK.js @@ -12,6 +12,7 @@ OC.L10N.register( "Home" : "නිවස", "Close" : "වසන්න", "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී", + "Uploading..." : "උඩුගත කෙරේ...", "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", @@ -33,7 +34,6 @@ OC.L10N.register( "max. possible: " : "හැකි උපරිමය:", "Save" : "සුරකින්න", "Settings" : "සිටුවම්", - "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", "Text file" : "පෙළ ගොනුව" diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json index 2db6c10b75c..72ec97a0067 100644 --- a/apps/files/l10n/si_LK.json +++ b/apps/files/l10n/si_LK.json @@ -10,6 +10,7 @@ "Home" : "නිවස", "Close" : "වසන්න", "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී", + "Uploading..." : "උඩුගත කෙරේ...", "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", @@ -31,7 +32,6 @@ "max. possible: " : "හැකි උපරිමය:", "Save" : "සුරකින්න", "Settings" : "සිටුවම්", - "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", "Text file" : "පෙළ ගොනුව" diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js index 3fc39663934..db8c505b02b 100644 --- a/apps/files/l10n/sk_SK.js +++ b/apps/files/l10n/sk_SK.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Neplatný priečinok.", "Files" : "Súbory", "All files" : "Všetky súbory", - "Favorites" : "Obľúbené", "Home" : "Domov", "Close" : "Zavrieť", + "Favorites" : "Obľúbené", "Upload cancelled." : "Odosielanie je zrušené.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov", "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}", "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.", + "Uploading..." : "Nahrávam...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", "Actions" : "Akcie", "Download" : "Sťahovanie", @@ -89,7 +91,6 @@ OC.L10N.register( "Save" : "Uložiť", "Settings" : "Nastavenia", "WebDAV" : "WebDAV", - "Cancel upload" : "Zrušiť nahrávanie", "No files in here" : "Nie sú tu žiadne súbory", "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json index 5a672616260..1e1075ba958 100644 --- a/apps/files/l10n/sk_SK.json +++ b/apps/files/l10n/sk_SK.json @@ -19,14 +19,16 @@ "Invalid directory." : "Neplatný priečinok.", "Files" : "Súbory", "All files" : "Všetky súbory", - "Favorites" : "Obľúbené", "Home" : "Domov", "Close" : "Zavrieť", + "Favorites" : "Obľúbené", "Upload cancelled." : "Odosielanie je zrušené.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov", "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}", "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.", + "Uploading..." : "Nahrávam...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", "Actions" : "Akcie", "Download" : "Sťahovanie", @@ -87,7 +89,6 @@ "Save" : "Uložiť", "Settings" : "Nastavenia", "WebDAV" : "WebDAV", - "Cancel upload" : "Zrušiť nahrávanie", "No files in here" : "Nie sú tu žiadne súbory", "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index b9f19666fa0..e9f2247d098 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -21,15 +21,23 @@ OC.L10N.register( "Invalid directory." : "Neveljavna mapa.", "Files" : "Datoteke", "All files" : "Vse datoteke", - "Favorites" : "Priljubljene", "Home" : "Domači naslov", "Close" : "Zapri", + "Favorites" : "Priljubljene", "Upload cancelled." : "Pošiljanje je preklicano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", + "Uploading..." : "Poteka pošiljanje ...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}min", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Vsak trenutek ...", + "Soon..." : "Kmalu", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", "Download" : "Prejmi", @@ -75,6 +83,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", + "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "{newname} already exists" : "{newname} že obstaja", @@ -108,7 +117,6 @@ OC.L10N.register( "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", - "Cancel upload" : "Prekliči pošiljanje", "No files in here" : "V mapi ni datotek", "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index ce674108901..74293263043 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -19,15 +19,23 @@ "Invalid directory." : "Neveljavna mapa.", "Files" : "Datoteke", "All files" : "Vse datoteke", - "Favorites" : "Priljubljene", "Home" : "Domači naslov", "Close" : "Zapri", + "Favorites" : "Priljubljene", "Upload cancelled." : "Pošiljanje je preklicano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", + "Uploading..." : "Poteka pošiljanje ...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}min", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Vsak trenutek ...", + "Soon..." : "Kmalu", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", "Download" : "Prejmi", @@ -73,6 +81,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", + "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "{newname} already exists" : "{newname} že obstaja", @@ -106,7 +115,6 @@ "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", - "Cancel upload" : "Prekliči pošiljanje", "No files in here" : "V mapi ni datotek", "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js index 7ef830e631b..6ec154a9ac3 100644 --- a/apps/files/l10n/sq.js +++ b/apps/files/l10n/sq.js @@ -21,15 +21,23 @@ OC.L10N.register( "Invalid directory." : "Drejtori e pavlefshme.", "Files" : "Kartela", "All files" : "Krejt kartelat", - "Favorites" : "Të parapëlqyera", "Home" : "Kreu", "Close" : "Mbylle", + "Favorites" : "Të parapëlqyera", "Upload cancelled." : "Ngarkimi u anulua.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", + "Uploading..." : "Po ngarkohet...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Në çdo çast tani…", + "Soon..." : "Së shpejti…", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", "Download" : "Shkarkoje", @@ -75,6 +83,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajte"], "Favorited" : "U kalua e parapëlqyer", "Favorite" : "E parapëlqyer", + "Local link" : "Lidhje vendore", "Folder" : "Dosje", "New folder" : "Dosje e re", "{newname} already exists" : "Ka tashmë një {newname}", @@ -108,7 +117,6 @@ OC.L10N.register( "Show hidden files" : "Shfaq kartela të fshehura", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>", - "Cancel upload" : "Anuloje ngarkimin", "No files in here" : "S’ka kartela këtu", "Upload some content or sync with your devices!" : "Ngarkoni ca lëndë ose bëni njëkohësim me pajisjet tuaja!", "No entries found in this folder" : "Në këtë dosje s’u gjetën zëra", diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json index 9b14554309e..5520c286f19 100644 --- a/apps/files/l10n/sq.json +++ b/apps/files/l10n/sq.json @@ -19,15 +19,23 @@ "Invalid directory." : "Drejtori e pavlefshme.", "Files" : "Kartela", "All files" : "Krejt kartelat", - "Favorites" : "Të parapëlqyera", "Home" : "Kreu", "Close" : "Mbylle", + "Favorites" : "Të parapëlqyera", "Upload cancelled." : "Ngarkimi u anulua.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", + "Uploading..." : "Po ngarkohet...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Në çdo çast tani…", + "Soon..." : "Së shpejti…", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", "Download" : "Shkarkoje", @@ -73,6 +81,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajte"], "Favorited" : "U kalua e parapëlqyer", "Favorite" : "E parapëlqyer", + "Local link" : "Lidhje vendore", "Folder" : "Dosje", "New folder" : "Dosje e re", "{newname} already exists" : "Ka tashmë një {newname}", @@ -106,7 +115,6 @@ "Show hidden files" : "Shfaq kartela të fshehura", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>", - "Cancel upload" : "Anuloje ngarkimin", "No files in here" : "S’ka kartela këtu", "Upload some content or sync with your devices!" : "Ngarkoni ca lëndë ose bëni njëkohësim me pajisjet tuaja!", "No entries found in this folder" : "Në këtë dosje s’u gjetën zëra", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index b906d9cdeb6..74dd5dc3988 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Неисправна фасцикла.", "Files" : "Фајлови", "All files" : "Сви фајлови", - "Favorites" : "Омиљени", "Home" : "Почетна", "Close" : "Затвори", + "Favorites" : "Омиљени", "Upload cancelled." : "Отпремање је отказано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова", "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало", "Could not get result from server." : "Не могу да добијем резултат са сервера.", + "Uploading..." : "Отпремам…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.", "Actions" : "Радње", "Download" : "Преузми", @@ -92,7 +94,6 @@ OC.L10N.register( "Save" : "Сачувај", "Settings" : "Поставке", "WebDAV" : "ВебДАВ", - "Cancel upload" : "Откажи отпремање", "No files in here" : "Овде нема фајлова", "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!", "No entries found in this folder" : "Нема ничега у овој фасцикли", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index fa9a4b42b47..25683cd1df7 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -19,14 +19,16 @@ "Invalid directory." : "Неисправна фасцикла.", "Files" : "Фајлови", "All files" : "Сви фајлови", - "Favorites" : "Омиљени", "Home" : "Почетна", "Close" : "Затвори", + "Favorites" : "Омиљени", "Upload cancelled." : "Отпремање је отказано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова", "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало", "Could not get result from server." : "Не могу да добијем резултат са сервера.", + "Uploading..." : "Отпремам…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.", "Actions" : "Радње", "Download" : "Преузми", @@ -90,7 +92,6 @@ "Save" : "Сачувај", "Settings" : "Поставке", "WebDAV" : "ВебДАВ", - "Cancel upload" : "Откажи отпремање", "No files in here" : "Овде нема фајлова", "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!", "No entries found in this folder" : "Нема ничега у овој фасцикли", diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js index 6d6e3dfd414..736e4a1cc81 100644 --- a/apps/files/l10n/sr@latin.js +++ b/apps/files/l10n/sr@latin.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Neispravna fascikla.", "Files" : "Fajlovi", "All files" : "Svi fajlovi", - "Favorites" : "Omiljeni", "Home" : "Početna", "Close" : "Zatvori", + "Favorites" : "Omiljeni", "Upload cancelled." : "Otpremanje je otkazano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova", "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo", "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.", + "Uploading..." : "Otpremam…", "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.", "Download" : "Preuzmi", "Rename" : "Preimenuj", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Sačuvaj", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Otkaži otpremanje", "No files in here" : "Ovde nema fajlova", "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!", "No entries found in this folder" : "Nema ničega u ovoj fascikli", diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json index 29798adf208..0710435eb69 100644 --- a/apps/files/l10n/sr@latin.json +++ b/apps/files/l10n/sr@latin.json @@ -19,14 +19,15 @@ "Invalid directory." : "Neispravna fascikla.", "Files" : "Fajlovi", "All files" : "Svi fajlovi", - "Favorites" : "Omiljeni", "Home" : "Početna", "Close" : "Zatvori", + "Favorites" : "Omiljeni", "Upload cancelled." : "Otpremanje je otkazano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova", "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo", "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.", + "Uploading..." : "Otpremam…", "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.", "Download" : "Preuzmi", "Rename" : "Preimenuj", @@ -79,7 +80,6 @@ "Save" : "Sačuvaj", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Otkaži otpremanje", "No files in here" : "Ovde nema fajlova", "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!", "No entries found in this folder" : "Nema ničega u ovoj fascikli", diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js index dfae22a7c3e..d2f7df4a3a4 100644 --- a/apps/files/l10n/sv.js +++ b/apps/files/l10n/sv.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Felaktig mapp.", "Files" : "Filer", "All files" : "Alla filer", - "Favorites" : "Favoriter", "Home" : "Hem", "Close" : "Stäng", + "Favorites" : "Favoriter", "Upload cancelled." : "Uppladdning avbruten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.", "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", + "Uploading..." : "Laddar upp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", "Actions" : "Åtgärder", "Download" : "Ladda ner", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "Visa dolda filer", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>", - "Cancel upload" : "Avbryt uppladdning", "No files in here" : "Inga filer kunde hittas", "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!", "No entries found in this folder" : "Inga innehåll hittades i denna mapp", diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json index f5587e5cb57..c2d1d464bc9 100644 --- a/apps/files/l10n/sv.json +++ b/apps/files/l10n/sv.json @@ -19,15 +19,17 @@ "Invalid directory." : "Felaktig mapp.", "Files" : "Filer", "All files" : "Alla filer", - "Favorites" : "Favoriter", "Home" : "Hem", "Close" : "Stäng", + "Favorites" : "Favoriter", "Upload cancelled." : "Uppladdning avbruten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.", "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", + "Uploading..." : "Laddar upp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", "Actions" : "Åtgärder", "Download" : "Ladda ner", @@ -106,7 +108,6 @@ "Show hidden files" : "Visa dolda filer", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>", - "Cancel upload" : "Avbryt uppladdning", "No files in here" : "Inga filer kunde hittas", "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!", "No entries found in this folder" : "Inga innehåll hittades i denna mapp", diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js index 8b731d1f64b..f22aa9743ef 100644 --- a/apps/files/l10n/ta_LK.js +++ b/apps/files/l10n/ta_LK.js @@ -9,10 +9,11 @@ OC.L10N.register( "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை", "Files" : "கோப்புகள்", - "Favorites" : "விருப்பங்கள்", "Home" : "அகம்", "Close" : "மூடுக", + "Favorites" : "விருப்பங்கள்", "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", + "Uploading..." : "பதிவேற்றல்...", "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "Actions" : "செயல்கள்", "Download" : "பதிவிறக்குக", @@ -34,7 +35,6 @@ OC.L10N.register( "max. possible: " : "ஆகக் கூடியது:", "Save" : "சேமிக்க ", "Settings" : "அமைப்புகள்", - "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", "Text file" : "கோப்பு உரை" diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json index 67cc6f18d88..4d5b92402ad 100644 --- a/apps/files/l10n/ta_LK.json +++ b/apps/files/l10n/ta_LK.json @@ -7,10 +7,11 @@ "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை", "Files" : "கோப்புகள்", - "Favorites" : "விருப்பங்கள்", "Home" : "அகம்", "Close" : "மூடுக", + "Favorites" : "விருப்பங்கள்", "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", + "Uploading..." : "பதிவேற்றல்...", "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "Actions" : "செயல்கள்", "Download" : "பதிவிறக்குக", @@ -32,7 +33,6 @@ "max. possible: " : "ஆகக் கூடியது:", "Save" : "சேமிக்க ", "Settings" : "அமைப்புகள்", - "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", "Text file" : "கோப்பு உரை" diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js index e3a78b4d794..06a02adab7f 100644 --- a/apps/files/l10n/th_TH.js +++ b/apps/files/l10n/th_TH.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" : "ไฟล์", "All files" : "ไฟล์ทั้งหมด", - "Favorites" : "รายการโปรด", "Home" : "บ้าน", "Close" : "ปิด", + "Favorites" : "รายการโปรด", "Upload cancelled." : "การอัพโหลดถูกยกเลิก", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์", "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}", "Error uploading file \"{fileName}\": {message}" : "ข้อผิดพลาดขณะอัพโหลดไฟล์ \"{fileName}\": {message}", "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์", + "Uploading..." : "กำลังอัพโหลด...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", "Actions" : "การกระทำ", "Download" : "ดาวน์โหลด", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>", - "Cancel upload" : "ยกเลิกการอัพโหลด", "No files in here" : "ไม่มีไฟล์ที่นี่", "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json index 623f61e86e1..5c526d80a65 100644 --- a/apps/files/l10n/th_TH.json +++ b/apps/files/l10n/th_TH.json @@ -19,15 +19,17 @@ "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" : "ไฟล์", "All files" : "ไฟล์ทั้งหมด", - "Favorites" : "รายการโปรด", "Home" : "บ้าน", "Close" : "ปิด", + "Favorites" : "รายการโปรด", "Upload cancelled." : "การอัพโหลดถูกยกเลิก", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์", "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}", "Error uploading file \"{fileName}\": {message}" : "ข้อผิดพลาดขณะอัพโหลดไฟล์ \"{fileName}\": {message}", "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์", + "Uploading..." : "กำลังอัพโหลด...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", "Actions" : "การกระทำ", "Download" : "ดาวน์โหลด", @@ -106,7 +108,6 @@ "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>", - "Cancel upload" : "ยกเลิกการอัพโหลด", "No files in here" : "ไม่มีไฟล์ที่นี่", "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index d5b7a5bfe36..e878fdda386 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Geçersiz dizin.", "Files" : "Dosyalar", "All files" : "Tüm dosyalar", - "Favorites" : "Sık kullanılanlar", "Home" : "Ev", "Close" : "Kapat", + "Favorites" : "Sık kullanılanlar", "Upload cancelled." : "Yükleme iptal edildi.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi", "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\" dosyası yüklenirken hata: {message}", "Could not get result from server." : "Sunucudan sonuç alınamadı.", + "Uploading..." : "Yükleniyor...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.", "Actions" : "Eylemler", "Download" : "İndir", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Ayarlar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV ile erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>", - "Cancel upload" : "Yüklemeyi iptal et", "No files in here" : "Burada hiç dosya yok", "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 1be304f7c3b..38e78fc6e6f 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -19,15 +19,17 @@ "Invalid directory." : "Geçersiz dizin.", "Files" : "Dosyalar", "All files" : "Tüm dosyalar", - "Favorites" : "Sık kullanılanlar", "Home" : "Ev", "Close" : "Kapat", + "Favorites" : "Sık kullanılanlar", "Upload cancelled." : "Yükleme iptal edildi.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi", "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\" dosyası yüklenirken hata: {message}", "Could not get result from server." : "Sunucudan sonuç alınamadı.", + "Uploading..." : "Yükleniyor...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.", "Actions" : "Eylemler", "Download" : "İndir", @@ -105,7 +107,6 @@ "Settings" : "Ayarlar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV ile erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>", - "Cancel upload" : "Yüklemeyi iptal et", "No files in here" : "Burada hiç dosya yok", "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js index b587b590632..6f0c6f9a733 100644 --- a/apps/files/l10n/ug.js +++ b/apps/files/l10n/ug.js @@ -8,10 +8,11 @@ OC.L10N.register( "Failed to write to disk" : "دىسكىغا يازالمىدى", "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق", "Files" : "ھۆججەتلەر", - "Favorites" : "يىغقۇچ", "Home" : "ئۆي", "Close" : "ياپ", + "Favorites" : "يىغقۇچ", "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.", + "Uploading..." : "يۈكلەۋاتىدۇ…", "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.", "Actions" : "مەشغۇلاتلار", "Download" : "چۈشۈر", @@ -30,7 +31,6 @@ OC.L10N.register( "Save" : "ساقلا", "Settings" : "تەڭشەكلەر", "WebDAV" : "WebDAV", - "Cancel upload" : "يۈكلەشتىن ۋاز كەچ", "Upload too large" : "يۈكلەندىغىنى بەك چوڭ", "Text file" : "تېكىست ھۆججەت" }, diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json index dd2e9c98ee5..e4e6e32e1c5 100644 --- a/apps/files/l10n/ug.json +++ b/apps/files/l10n/ug.json @@ -6,10 +6,11 @@ "Failed to write to disk" : "دىسكىغا يازالمىدى", "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق", "Files" : "ھۆججەتلەر", - "Favorites" : "يىغقۇچ", "Home" : "ئۆي", "Close" : "ياپ", + "Favorites" : "يىغقۇچ", "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.", + "Uploading..." : "يۈكلەۋاتىدۇ…", "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.", "Actions" : "مەشغۇلاتلار", "Download" : "چۈشۈر", @@ -28,7 +29,6 @@ "Save" : "ساقلا", "Settings" : "تەڭشەكلەر", "WebDAV" : "WebDAV", - "Cancel upload" : "يۈكلەشتىن ۋاز كەچ", "Upload too large" : "يۈكلەندىغىنى بەك چوڭ", "Text file" : "تېكىست ھۆججەت" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 43700de436d..d85ff0a6d14 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Невірний каталог.", "Files" : "Файли", "All files" : "Усі файли", - "Favorites" : "Улюблені", "Home" : "Домашня адреса", "Close" : "Закрити", + "Favorites" : "Улюблені", "Upload cancelled." : "Вивантаження скасовано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.", "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}", "Could not get result from server." : "Не вдалося отримати результат від сервера.", + "Uploading..." : "Вивантаження...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.", "Actions" : "Дії", "Download" : "Завантажити", @@ -84,7 +86,6 @@ OC.L10N.register( "Save" : "Зберегти", "Settings" : "Налаштування", "WebDAV" : "WebDAV", - "Cancel upload" : "Скасувати вивантаження", "No files in here" : "Тут немає файлів", "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!", "No entries found in this folder" : "В цій теці нічого немає", diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index 039cd449bfe..a4b4fd1a7c1 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -19,14 +19,16 @@ "Invalid directory." : "Невірний каталог.", "Files" : "Файли", "All files" : "Усі файли", - "Favorites" : "Улюблені", "Home" : "Домашня адреса", "Close" : "Закрити", + "Favorites" : "Улюблені", "Upload cancelled." : "Вивантаження скасовано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.", "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}", "Could not get result from server." : "Не вдалося отримати результат від сервера.", + "Uploading..." : "Вивантаження...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.", "Actions" : "Дії", "Download" : "Завантажити", @@ -82,7 +84,6 @@ "Save" : "Зберегти", "Settings" : "Налаштування", "WebDAV" : "WebDAV", - "Cancel upload" : "Скасувати вивантаження", "No files in here" : "Тут немає файлів", "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!", "No entries found in this folder" : "В цій теці нічого немає", diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js index fda3539b886..5c50ebe4d52 100644 --- a/apps/files/l10n/vi.js +++ b/apps/files/l10n/vi.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Thư mục không hợp lệ", "Files" : "Tập tin", "All files" : "Tất cả tệp tin", - "Favorites" : "Ưa thích", "Home" : "Nhà", "Close" : "Đóng", + "Favorites" : "Ưa thích", "Upload cancelled." : "Hủy tải lên", "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Kích cở tập tin {size1} vượt giới hạn tải lên {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống", "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.", + "Uploading..." : "tải lên...", "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", "Actions" : "Actions", "Download" : "Tải về", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Lưu", "Settings" : "Cài đặt", "WebDAV" : "WebDAV", - "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json index 5271940f0dc..5f9d64f2732 100644 --- a/apps/files/l10n/vi.json +++ b/apps/files/l10n/vi.json @@ -19,14 +19,15 @@ "Invalid directory." : "Thư mục không hợp lệ", "Files" : "Tập tin", "All files" : "Tất cả tệp tin", - "Favorites" : "Ưa thích", "Home" : "Nhà", "Close" : "Đóng", + "Favorites" : "Ưa thích", "Upload cancelled." : "Hủy tải lên", "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Kích cở tập tin {size1} vượt giới hạn tải lên {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống", "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.", + "Uploading..." : "tải lên...", "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", "Actions" : "Actions", "Download" : "Tải về", @@ -79,7 +80,6 @@ "Save" : "Lưu", "Settings" : "Cài đặt", "WebDAV" : "WebDAV", - "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index 60a7a990f27..4e5afe599d2 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "无效文件夹。", "Files" : "文件", "All files" : "全部文件", - "Favorites" : "收藏", "Home" : "家庭", "Close" : "关闭", + "Favorites" : "收藏", "Upload cancelled." : "上传已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节", "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。", "Error uploading file \"{fileName}\": {message}" : "上传文件错误 \"{fileName}\": {message}", "Could not get result from server." : "不能从服务器得到结果", + "Uploading..." : "上传中...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。", "Actions" : "动作", "Download" : "下载", @@ -106,7 +108,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "没有从这里进行编辑的权限", "Settings" : "设置", "WebDAV" : "WebDAV", - "Cancel upload" : "取消上传", "No files in here" : "无文件", "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!", "No entries found in this folder" : "此文件夹中无项目", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index 30b6ad1b78d..a4cd89935f6 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -19,15 +19,17 @@ "Invalid directory." : "无效文件夹。", "Files" : "文件", "All files" : "全部文件", - "Favorites" : "收藏", "Home" : "家庭", "Close" : "关闭", + "Favorites" : "收藏", "Upload cancelled." : "上传已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节", "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。", "Error uploading file \"{fileName}\": {message}" : "上传文件错误 \"{fileName}\": {message}", "Could not get result from server." : "不能从服务器得到结果", + "Uploading..." : "上传中...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。", "Actions" : "动作", "Download" : "下载", @@ -104,7 +106,6 @@ "Missing permissions to edit from here." : "没有从这里进行编辑的权限", "Settings" : "设置", "WebDAV" : "WebDAV", - "Cancel upload" : "取消上传", "No files in here" : "无文件", "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!", "No entries found in this folder" : "此文件夹中无项目", diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js index 8ecae84be99..83cb534fe75 100644 --- a/apps/files/l10n/zh_HK.js +++ b/apps/files/l10n/zh_HK.js @@ -28,7 +28,6 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s 刪除了 %1$s", "Save" : "儲存", "Settings" : "設定", - "WebDAV" : "WebDAV", - "Cancel upload" : "取消上戴" + "WebDAV" : "WebDAV" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json index 798dbe13abe..af7cfef52f7 100644 --- a/apps/files/l10n/zh_HK.json +++ b/apps/files/l10n/zh_HK.json @@ -26,7 +26,6 @@ "%2$s deleted %1$s" : "%2$s 刪除了 %1$s", "Save" : "儲存", "Settings" : "設定", - "WebDAV" : "WebDAV", - "Cancel upload" : "取消上戴" + "WebDAV" : "WebDAV" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 3d51a9a5133..98391b2cfee 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "無效的資料夾", "Files" : "檔案", "All files" : "所有檔案", - "Favorites" : "最愛", "Home" : "家目錄", "Close" : " 關閉", + "Favorites" : "最愛", "Upload cancelled." : "上傳已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳", "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}", "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", + "Uploading..." : "上傳中…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", "Download" : "下載", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "設定", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>", - "Cancel upload" : "取消上傳", "No files in here" : "沒有任何檔案", "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容", "No entries found in this folder" : "在此資料夾中沒有任何項目", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 0c70aab817c..fcc1d3baee3 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -19,15 +19,17 @@ "Invalid directory." : "無效的資料夾", "Files" : "檔案", "All files" : "所有檔案", - "Favorites" : "最愛", "Home" : "家目錄", "Close" : " 關閉", + "Favorites" : "最愛", "Upload cancelled." : "上傳已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳", "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}", "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", + "Uploading..." : "上傳中…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", "Download" : "下載", @@ -105,7 +107,6 @@ "Settings" : "設定", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>", - "Cancel upload" : "取消上傳", "No files in here" : "沒有任何檔案", "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容", "No entries found in this folder" : "在此資料夾中沒有任何項目", diff --git a/apps/files/lib/activity.php b/apps/files/lib/Activity.php index 1cbd6c3b973..1cbd6c3b973 100644 --- a/apps/files/lib/activity.php +++ b/apps/files/lib/Activity.php diff --git a/apps/files/lib/activityhelper.php b/apps/files/lib/ActivityHelper.php index 046dd59bc76..046dd59bc76 100644 --- a/apps/files/lib/activityhelper.php +++ b/apps/files/lib/ActivityHelper.php diff --git a/apps/files/lib/app.php b/apps/files/lib/App.php index 981c41ff413..981c41ff413 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/App.php diff --git a/apps/files/appinfo/application.php b/apps/files/lib/AppInfo/Application.php index b2faa43cc3c..b2faa43cc3c 100644 --- a/apps/files/appinfo/application.php +++ b/apps/files/lib/AppInfo/Application.php diff --git a/apps/files/lib/backgroundjob/cleanupfilelocks.php b/apps/files/lib/BackgroundJob/CleanupFileLocks.php index b5cf8e94551..b5cf8e94551 100644 --- a/apps/files/lib/backgroundjob/cleanupfilelocks.php +++ b/apps/files/lib/BackgroundJob/CleanupFileLocks.php diff --git a/apps/files/lib/backgroundjob/deleteorphaneditems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php index 1eef9c24e0c..1eef9c24e0c 100644 --- a/apps/files/lib/backgroundjob/deleteorphaneditems.php +++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php diff --git a/apps/files/lib/backgroundjob/scanfiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index dcc180bcfbe..dcc180bcfbe 100644 --- a/apps/files/lib/backgroundjob/scanfiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/Capabilities.php index dc49ca174b3..dc49ca174b3 100644 --- a/apps/files/lib/capabilities.php +++ b/apps/files/lib/Capabilities.php diff --git a/apps/files/command/deleteorphanedfiles.php b/apps/files/lib/Command/DeleteOrphanedFiles.php index 91043471ce5..91043471ce5 100644 --- a/apps/files/command/deleteorphanedfiles.php +++ b/apps/files/lib/Command/DeleteOrphanedFiles.php diff --git a/apps/files/command/scan.php b/apps/files/lib/Command/Scan.php index 1ae04c585bb..1ae04c585bb 100644 --- a/apps/files/command/scan.php +++ b/apps/files/lib/Command/Scan.php diff --git a/apps/files/command/transferownership.php b/apps/files/lib/Command/TransferOwnership.php index 1f46efdde0d..1f46efdde0d 100644 --- a/apps/files/command/transferownership.php +++ b/apps/files/lib/Command/TransferOwnership.php diff --git a/apps/files/controller/apicontroller.php b/apps/files/lib/Controller/ApiController.php index 072498c7b5f..072498c7b5f 100644 --- a/apps/files/controller/apicontroller.php +++ b/apps/files/lib/Controller/ApiController.php diff --git a/apps/files/controller/viewcontroller.php b/apps/files/lib/Controller/ViewController.php index 7539a3ab649..7539a3ab649 100644 --- a/apps/files/controller/viewcontroller.php +++ b/apps/files/lib/Controller/ViewController.php diff --git a/apps/files/lib/helper.php b/apps/files/lib/Helper.php index d21a65afcee..d21a65afcee 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/Helper.php diff --git a/apps/files/service/tagservice.php b/apps/files/lib/Service/TagService.php index 57cad43a539..57cad43a539 100644 --- a/apps/files/service/tagservice.php +++ b/apps/files/lib/Service/TagService.php diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 29769bcd825..dda7a1814a0 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -1,12 +1,10 @@ <div id="controls"> <div class="actions creatable hidden"> <div id="uploadprogresswrapper"> - <div id="uploadprogressbar"></div> - <button class="stop icon-close" style="display:none"> - <span class="hidden-visually"> - <?php p($l->t('Cancel upload'))?> - </span> - </button> + <div id="uploadprogressbar"> + <em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em> + </div> + <input type="button" class="stop icon-close" style="display:none" value="" /> </div> </div> <div id="file_action_panel"></div> diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/ActivityTest.php index bc062dd0542..bc062dd0542 100644 --- a/apps/files/tests/activitytest.php +++ b/apps/files/tests/ActivityTest.php diff --git a/apps/files/tests/backgroundjob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php index e802a248a9b..e802a248a9b 100644 --- a/apps/files/tests/backgroundjob/DeleteOrphanedItemsJobTest.php +++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php diff --git a/apps/files/tests/backgroundjob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index eab28071b70..eab28071b70 100644 --- a/apps/files/tests/backgroundjob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php diff --git a/apps/files/tests/command/deleteorphanedfilestest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index ff29942bc4a..ff29942bc4a 100644 --- a/apps/files/tests/command/deleteorphanedfilestest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/Controller/ApiControllerTest.php index 2eba7d62feb..2eba7d62feb 100644 --- a/apps/files/tests/controller/apicontrollertest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 4e4e88043e4..affcdb53a4b 100644 --- a/apps/files/tests/controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -26,6 +26,7 @@ namespace OCA\Files\Tests\Controller; use OCA\Files\Controller\ViewController; use OCP\AppFramework\Http; +use OCP\IUser; use OCP\Template; use Test\TestCase; use OCP\IRequest; diff --git a/apps/files/tests/helper.php b/apps/files/tests/HelperTest.php index 654ec8332ed..d2d52b4f8a3 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/HelperTest.php @@ -23,12 +23,12 @@ * */ -use OCA\Files; +use OCA\Files\Tests; /** - * Class Test_Files_Helper + * Class Helper */ -class Test_Files_Helper extends \Test\TestCase { +class HelperTest extends \Test\TestCase { private function makeFileInfo($name, $size, $mtime, $isDir = false) { return new \OC\Files\FileInfo( diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/Service/TagServiceTest.php index 5fcf64b1352..3f210b500ff 100644 --- a/apps/files/tests/service/tagservice.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -20,9 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OCA\Files; +namespace OCA\Files\Tests\Service; -use \OCA\Files\Service\TagService; +use OCA\Files\Service\TagService; /** * Class TagServiceTest @@ -55,13 +55,11 @@ class TagServiceTest extends \Test\TestCase { protected function setUp() { parent::setUp(); - $this->user = $this->getUniqueId('user'); + $this->user = $this->getUniqueID('user'); \OC::$server->getUserManager()->createUser($this->user, 'test'); \OC_User::setUserId($this->user); \OC_Util::setupFS($this->user); - /** - * @var \OCP\IUser - */ + /** @var \OCP\IUser */ $user = new \OC\User\User($this->user, null); /** * @var \OCP\IUserSession @@ -105,12 +103,12 @@ class TagServiceTest extends \Test\TestCase { $this->assertEquals(array($fileId), $this->tagger->getIdsForTag($tag2)); // remove tag - $result = $this->tagService->updateFileTags('subdir/test.txt', array($tag2)); + $this->tagService->updateFileTags('subdir/test.txt', array($tag2)); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag1)); $this->assertEquals(array($fileId), $this->tagger->getIdsForTag($tag2)); // clear tags - $result = $this->tagService->updateFileTags('subdir/test.txt', array()); + $this->tagService->updateFileTags('subdir/test.txt', array()); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag1)); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag2)); diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 9338b8d3ee7..6dfb012b15e 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -18,6 +18,11 @@ td.mountPoint, td.backend { width:160px; } #addMountPoint>td.applicable { visibility:hidden; } #addMountPoint>td.hidden { visibility:hidden; } +#externalStorage .icon-settings { + padding: 11px 20px; + vertical-align: text-bottom; +} + #selectBackend { margin-left: -10px; width: 150px; @@ -45,6 +50,10 @@ td.mountPoint, td.backend { width:160px; } margin-right: 6px; } +#externalStorage td.configuration input.disabled-success { + background-color: rgba(134, 255, 110, 0.9); +} + #externalStorage td.applicable div.chzn-container { position: relative; diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js new file mode 100644 index 00000000000..8302f5711d6 --- /dev/null +++ b/apps/files_external/js/dropbox.js @@ -0,0 +1,30 @@ +$(document).ready(function() { + + function generateUrl($tr) { + var app_key = $tr.find('[data-parameter="app_key"]').val(); + if (app_key) { + return 'https://www.dropbox.com/developers/apps/info/' + app_key; + } else { + return 'https://www.dropbox.com/developers/apps'; + } + } + + OCA.External.Settings.mountConfig.whenSelectBackend(function($tr, backend, onCompletion) { + if (backend === 'dropbox') { + var backendEl = $tr.find('.backend'); + var el = $(document.createElement('a')) + .attr('href', generateUrl($tr)) + .attr('target', '_blank') + .attr('title', t('files_external', 'Dropbox App Configuration')) + .addClass('icon-settings svg') + ; + el.on('click', function(event) { + var a = $(event.target); + a.attr('href', generateUrl($(this).closest('tr'))); + }); + el.tooltip({placement: 'top'}); + backendEl.append(el); + } + }); + +}); diff --git a/apps/files_external/js/gdrive.js b/apps/files_external/js/gdrive.js new file mode 100644 index 00000000000..e02cedd6b45 --- /dev/null +++ b/apps/files_external/js/gdrive.js @@ -0,0 +1,26 @@ +$(document).ready(function() { + + function generateUrl($tr) { + // no mapping between client ID and Google 'project', so we always load the same URL + return 'https://console.developers.google.com/'; + } + + OCA.External.Settings.mountConfig.whenSelectBackend(function($tr, backend, onCompletion) { + if (backend === 'googledrive') { + var backendEl = $tr.find('.backend'); + var el = $(document.createElement('a')) + .attr('href', generateUrl($tr)) + .attr('target', '_blank') + .attr('title', t('files_external', 'Google Drive App Configuration')) + .addClass('icon-settings svg') + ; + el.on('click', function(event) { + var a = $(event.target); + a.attr('href', generateUrl($(this).closest('tr'))); + }); + el.tooltip({placement: 'top'}); + backendEl.append(el); + } + }); + +}); diff --git a/apps/files_external/js/oauth1.js b/apps/files_external/js/oauth1.js index e2ba25ebf8e..79248a3e3b2 100644 --- a/apps/files_external/js/oauth1.js +++ b/apps/files_external/js/oauth1.js @@ -1,5 +1,9 @@ $(document).ready(function() { + function displayGranted($tr) { + $tr.find('.configuration input.auth-param').attr('disabled', 'disabled').addClass('disabled-success'); + } + OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme, onCompletion) { if (authMechanism === 'oauth1::oauth1') { var config = $tr.find('.configuration'); @@ -13,8 +17,7 @@ $(document).ready(function() { onCompletion.then(function() { var configured = $tr.find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>'); + displayGranted($tr); } else { var app_key = $tr.find('.configuration [data-parameter="app_key"]').val(); var app_secret = $tr.find('.configuration [data-parameter="app_secret"]').val(); @@ -33,8 +36,7 @@ $(document).ready(function() { $(configured).val('true'); OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) { if (status) { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>'); + displayGranted($tr); } }); } else { diff --git a/apps/files_external/js/oauth2.js b/apps/files_external/js/oauth2.js index 2556bf45cae..13b5162694e 100644 --- a/apps/files_external/js/oauth2.js +++ b/apps/files_external/js/oauth2.js @@ -1,5 +1,9 @@ $(document).ready(function() { + function displayGranted($tr) { + $tr.find('.configuration input.auth-param').attr('disabled', 'disabled').addClass('disabled-success'); + } + OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme, onCompletion) { if (authMechanism === 'oauth2::oauth2') { var config = $tr.find('.configuration'); @@ -13,9 +17,7 @@ $(document).ready(function() { onCompletion.then(function() { var configured = $tr.find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append($('<span/>').attr('id', 'access') - .text(t('files_external', 'Access granted'))); + displayGranted($tr); } else { var client_id = $tr.find('.configuration [data-parameter="client_id"]').val(); var client_secret = $tr.find('.configuration [data-parameter="client_secret"]') @@ -43,10 +45,7 @@ $(document).ready(function() { $(configured).val('true'); OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) { if (status) { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append($('<span/>') - .attr('id', 'access') - .text(t('files_external', 'Access granted'))); + displayGranted($tr); } }); } else { diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js index dde6d0c1e52..0fab7b15e81 100644 --- a/apps/files_external/l10n/ast.js +++ b/apps/files_external/l10n/ast.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder accesu", - "Access granted" : "Accesu concedíu", "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.", "(group)" : "(grupu)", "Saved" : "Guardáu", diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json index f31a288618c..56bfc2757ea 100644 --- a/apps/files_external/l10n/ast.json +++ b/apps/files_external/l10n/ast.json @@ -5,7 +5,6 @@ "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder accesu", - "Access granted" : "Accesu concedíu", "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.", "(group)" : "(grupu)", "Saved" : "Guardáu", diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js index ebb84a1b6f3..75c15d57a12 100644 --- a/apps/files_external/l10n/az.js +++ b/apps/files_external/l10n/az.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Şəxsi", "System" : "Sistem", "Grant access" : "Yetkinin verilməsi", - "Access granted" : "Yetki verildi", "Generate keys" : "Açarları generasiya et", "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi", "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.", diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json index a8ec16bf97d..608a083f736 100644 --- a/apps/files_external/l10n/az.json +++ b/apps/files_external/l10n/az.json @@ -8,7 +8,6 @@ "Personal" : "Şəxsi", "System" : "Sistem", "Grant access" : "Yetkinin verilməsi", - "Access granted" : "Yetki verildi", "Generate keys" : "Açarları generasiya et", "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi", "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.", diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js index 8e8ce312138..a0c5bccc65c 100644 --- a/apps/files_external/l10n/bg_BG.js +++ b/apps/files_external/l10n/bg_BG.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "Личен", "System" : "Системен", "Grant access" : "Разреши достъп", - "Access granted" : "Достъпът разрешен", "Generate keys" : "Генериране на криптографски ключове", "Error generating key pair" : "Грешка при генериране на криптографски ключове", "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.", diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json index cc76db1ebed..dc358c71857 100644 --- a/apps/files_external/l10n/bg_BG.json +++ b/apps/files_external/l10n/bg_BG.json @@ -7,7 +7,6 @@ "Personal" : "Личен", "System" : "Системен", "Grant access" : "Разреши достъп", - "Access granted" : "Достъпът разрешен", "Generate keys" : "Генериране на криптографски ключове", "Error generating key pair" : "Грешка при генериране на криптографски ключове", "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.", diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js index 13e9c436a01..4d99e32ffdd 100644 --- a/apps/files_external/l10n/bn_BD.js +++ b/apps/files_external/l10n/bn_BD.js @@ -5,7 +5,6 @@ OC.L10N.register( "External storage" : "বাহ্যিক সংরক্ষণাগার", "Personal" : "ব্যক্তিগত", "Grant access" : "অধিগমনের অনুমতি প্রদান কর", - "Access granted" : "অধিগমনের অনুমতি প্রদান করা হলো", "(group)" : "(গোষ্ঠি)", "Saved" : "সংরক্ষণ করা হলো", "Username" : "ব্যবহারকারী", diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json index 979e0b43837..d7035b0737f 100644 --- a/apps/files_external/l10n/bn_BD.json +++ b/apps/files_external/l10n/bn_BD.json @@ -3,7 +3,6 @@ "External storage" : "বাহ্যিক সংরক্ষণাগার", "Personal" : "ব্যক্তিগত", "Grant access" : "অধিগমনের অনুমতি প্রদান কর", - "Access granted" : "অধিগমনের অনুমতি প্রদান করা হলো", "(group)" : "(গোষ্ঠি)", "Saved" : "সংরক্ষণ করা হলো", "Username" : "ব্যবহারকারী", diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js index 767318876d2..c654e171e46 100644 --- a/apps/files_external/l10n/ca.js +++ b/apps/files_external/l10n/ca.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Concedeix accés", - "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json index a88071fdbea..96e1a52f229 100644 --- a/apps/files_external/l10n/ca.json +++ b/apps/files_external/l10n/ca.json @@ -8,7 +8,6 @@ "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Concedeix accés", - "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index 93c660187d1..c2d99356eb6 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", - "Access granted" : "Přístup povolen", "Error configuring OAuth1" : "Chyba nastavení OAuth1", "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index 85734785379..71704dccae8 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -20,7 +20,6 @@ "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", - "Access granted" : "Přístup povolen", "Error configuring OAuth1" : "Chyba nastavení OAuth1", "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js index 7305364c686..a30d790d685 100644 --- a/apps/files_external/l10n/da.js +++ b/apps/files_external/l10n/da.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", - "Access granted" : "Adgang godkendt", "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1", "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json index f2aa731623c..f0b79b1f93a 100644 --- a/apps/files_external/l10n/da.json +++ b/apps/files_external/l10n/da.json @@ -20,7 +20,6 @@ "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", - "Access granted" : "Adgang godkendt", "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1", "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index af51458d8a4..003a2bd56b9 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Speicher mit der ID \"%i\" kann nicht vom Benutzer bearbeitet werden", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index 2cb80cc32ae..a18205519fb 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Speicher mit der ID \"%i\" kann nicht vom Benutzer bearbeitet werden", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 8582d672aa9..13769ab9787 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index c63904c89cb..996723d7dc5 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index 8ca17f848d3..4cb950530bf 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "Προσωπικά", "System" : "Σύστημα", "Grant access" : "Παροχή πρόσβασης", - "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1", "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index 2bac56048a5..1a64c1eca06 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -19,7 +19,6 @@ "Personal" : "Προσωπικά", "System" : "Σύστημα", "Grant access" : "Παροχή πρόσβασης", - "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1", "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index 288a0561765..b9cf62e1965 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Insufficient data: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Storage with id \"%i\" is not user editable", + "Dropbox App Configuration" : "Dropbox App Configuration", + "Google Drive App Configuration" : "Google Drive App Configuration", "Personal" : "Personal", "System" : "System", "Grant access" : "Grant access", - "Access granted" : "Access granted", "Error configuring OAuth1" : "Error configuring OAuth1", "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index d479ff7b3af..f8eba19c544 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Insufficient data: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Storage with id \"%i\" is not user editable", + "Dropbox App Configuration" : "Dropbox App Configuration", + "Google Drive App Configuration" : "Google Drive App Configuration", "Personal" : "Personal", "System" : "System", "Grant access" : "Grant access", - "Access granted" : "Access granted", "Error configuring OAuth1" : "Error configuring OAuth1", "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js index 1a3e6145641..56c9dab1cf4 100644 --- a/apps/files_external/l10n/eo.js +++ b/apps/files_external/l10n/eo.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "Persona", "System" : "Sistemo", "Grant access" : "Doni alirpermeson", - "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json index 7af3ffad2ca..5988fd66a5d 100644 --- a/apps/files_external/l10n/eo.json +++ b/apps/files_external/l10n/eo.json @@ -7,7 +7,6 @@ "Personal" : "Persona", "System" : "Sistemo", "Grant access" : "Doni alirpermeson", - "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 71a93dc7da9..2fdeaf1c8a0 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Datos insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "El almacenamiento con id \"%i\" no es editable por usuarios", + "Dropbox App Configuration" : "Configuración de la app de Dropbox", + "Google Drive App Configuration" : "Configuración de la app de Google Drive", "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Error configuring OAuth1" : "Error al configurar OAuth1", "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 351135e3011..912455132fa 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Datos insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "El almacenamiento con id \"%i\" no es editable por usuarios", + "Dropbox App Configuration" : "Configuración de la app de Dropbox", + "Google Drive App Configuration" : "Configuración de la app de Google Drive", "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Error configuring OAuth1" : "Error al configurar OAuth1", "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js index 4b8367dfcc9..13c56f78ada 100644 --- a/apps/files_external/l10n/es_AR.js +++ b/apps/files_external/l10n/es_AR.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Permitir acceso", - "Access granted" : "Acceso permitido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json index 90e2ba255ba..4da77b799a1 100644 --- a/apps/files_external/l10n/es_AR.json +++ b/apps/files_external/l10n/es_AR.json @@ -2,7 +2,6 @@ "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Permitir acceso", - "Access granted" : "Acceso permitido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js index e61b0efa2e1..be4478ab639 100644 --- a/apps/files_external/l10n/es_MX.js +++ b/apps/files_external/l10n/es_MX.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json index 904f0f3c8da..b37b125f036 100644 --- a/apps/files_external/l10n/es_MX.json +++ b/apps/files_external/l10n/es_MX.json @@ -2,7 +2,6 @@ "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js index 40bcef6bf05..dac4ed3b3fb 100644 --- a/apps/files_external/l10n/et_EE.js +++ b/apps/files_external/l10n/et_EE.js @@ -14,7 +14,6 @@ OC.L10N.register( "Personal" : "Isiklik", "System" : "Süsteem", "Grant access" : "Anna ligipääs", - "Access granted" : "Ligipääs on antud", "Error configuring OAuth1" : "OAuth1 seadistamise tõrge", "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json index d9b5a2446f1..e941509ccfe 100644 --- a/apps/files_external/l10n/et_EE.json +++ b/apps/files_external/l10n/et_EE.json @@ -12,7 +12,6 @@ "Personal" : "Isiklik", "System" : "Süsteem", "Grant access" : "Anna ligipääs", - "Access granted" : "Ligipääs on antud", "Error configuring OAuth1" : "OAuth1 seadistamise tõrge", "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js index 8790c1c1173..419a1fca697 100644 --- a/apps/files_external/l10n/eu.js +++ b/apps/files_external/l10n/eu.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Pertsonala", "System" : "Sistema", "Grant access" : "Baimendu sarrera", - "Access granted" : "Sarrera baimendua", "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.", "(group)" : "(taldea)", "Saved" : "Gordeta", diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json index b083c3e210a..9118d77b3a7 100644 --- a/apps/files_external/l10n/eu.json +++ b/apps/files_external/l10n/eu.json @@ -5,7 +5,6 @@ "Personal" : "Pertsonala", "System" : "Sistema", "Grant access" : "Baimendu sarrera", - "Access granted" : "Sarrera baimendua", "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.", "(group)" : "(taldea)", "Saved" : "Gordeta", diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js index 629775c23a1..bfdf480cdfa 100644 --- a/apps/files_external/l10n/fa.js +++ b/apps/files_external/l10n/fa.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "شخصی", "System" : "سیستم", "Grant access" : " مجوز اعطا دسترسی", - "Access granted" : "مجوز دسترسی صادر شد", "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json index 4e7337b95c5..66da7c5785e 100644 --- a/apps/files_external/l10n/fa.json +++ b/apps/files_external/l10n/fa.json @@ -7,7 +7,6 @@ "Personal" : "شخصی", "System" : "سیستم", "Grant access" : " مجوز اعطا دسترسی", - "Access granted" : "مجوز دسترسی صادر شد", "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index 3da8e1aea39..1a75d42efdb 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", - "Access granted" : "Pääsy sallittu", "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä", "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index cc7e933d468..a342d6b84f7 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -8,7 +8,6 @@ "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", - "Access granted" : "Pääsy sallittu", "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä", "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 12aeef22fc1..b6cb04355f0 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Données insuffisantes : %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Le support de stockage d'id \"%i\" n'est pas modifiable par les utilisateurs", + "Dropbox App Configuration" : "Configuration de l'application Dropbox", + "Google Drive App Configuration" : "Configuration de l'application Google Drive", "Personal" : "Personnel", "System" : "Système", "Grant access" : "Autoriser l'accès", - "Access granted" : "Accès autorisé", "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1", "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index b345136b5fc..89bd6d19542 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Données insuffisantes : %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Le support de stockage d'id \"%i\" n'est pas modifiable par les utilisateurs", + "Dropbox App Configuration" : "Configuration de l'application Dropbox", + "Google Drive App Configuration" : "Configuration de l'application Google Drive", "Personal" : "Personnel", "System" : "Système", "Grant access" : "Autoriser l'accès", - "Access granted" : "Accès autorisé", "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1", "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 3206f829813..e0db1aac509 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Persoal", "System" : "Sistema", "Grant access" : "Permitir o acceso", - "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index effb0b23fd5..f3df77435f7 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -8,7 +8,6 @@ "Personal" : "Persoal", "System" : "Sistema", "Grant access" : "Permitir o acceso", - "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js index 5e07126d249..f2d23c61b7b 100644 --- a/apps/files_external/l10n/he.js +++ b/apps/files_external/l10n/he.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "אישי", "System" : "מערכת", "Grant access" : "הענקת גישה", - "Access granted" : "הוענקה גישה", "Error configuring OAuth1" : "שגיאה בתצורת OAuth1", "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json index 5ece8736fc3..9e3ac62475f 100644 --- a/apps/files_external/l10n/he.json +++ b/apps/files_external/l10n/he.json @@ -20,7 +20,6 @@ "Personal" : "אישי", "System" : "מערכת", "Grant access" : "הענקת גישה", - "Access granted" : "הוענקה גישה", "Error configuring OAuth1" : "שגיאה בתצורת OAuth1", "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js index 021c29253bc..7b5fda27d11 100644 --- a/apps/files_external/l10n/hr.js +++ b/apps/files_external/l10n/hr.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Osobno", "System" : "Sustav", "Grant access" : "Dodijeli pristup", - "Access granted" : "Pristup odobren", "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.", "(group)" : "(grupa)", "Saved" : "Spremljeno", diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json index 35da2cb9109..211a19849f4 100644 --- a/apps/files_external/l10n/hr.json +++ b/apps/files_external/l10n/hr.json @@ -5,7 +5,6 @@ "Personal" : "Osobno", "System" : "Sustav", "Grant access" : "Dodijeli pristup", - "Access granted" : "Pristup odobren", "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.", "(group)" : "(grupa)", "Saved" : "Spremljeno", diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js index ce9f7561373..63f31d417ec 100644 --- a/apps/files_external/l10n/hu_HU.js +++ b/apps/files_external/l10n/hu_HU.js @@ -6,7 +6,6 @@ OC.L10N.register( "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", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json index d98753c9838..582ebb4aa36 100644 --- a/apps/files_external/l10n/hu_HU.json +++ b/apps/files_external/l10n/hu_HU.json @@ -4,7 +4,6 @@ "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", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index 6707a8cb455..d4fae999373 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Pribadi", "System" : "Sistem", "Grant access" : "Berikan hak akses", - "Access granted" : "Akses diberikan", "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1", "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index cec244e4a83..7d83789176a 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -17,7 +17,6 @@ "Personal" : "Pribadi", "System" : "Sistem", "Grant access" : "Berikan hak akses", - "Access granted" : "Akses diberikan", "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1", "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index ab588b8785c..06839f9d3d9 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Einka", "System" : "Kerfi", "Grant access" : "Veita aðgengi", - "Access granted" : "Aðgengi veitt", "Error configuring OAuth1" : "Villa við uppsetningu OAuth1", "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index 1b57e9d55c8..2a9f31333e9 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -20,7 +20,6 @@ "Personal" : "Einka", "System" : "Kerfi", "Grant access" : "Veita aðgengi", - "Access granted" : "Aðgengi veitt", "Error configuring OAuth1" : "Villa við uppsetningu OAuth1", "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index 9a9df7bf093..f95c3c69155 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Dati insufficienti: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "L'archiviazione con ID \"%i\" non è modificabile dall'utente", + "Dropbox App Configuration" : "Configurazione applicazione Dropbox", + "Google Drive App Configuration" : "Configurazione applicazione Google Drive", "Personal" : "Personale", "System" : "Sistema", "Grant access" : "Concedi l'accesso", - "Access granted" : "Accesso consentito", "Error configuring OAuth1" : "Errore di configurazione OAuth1", "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index 50f00242721..30b3445558b 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Dati insufficienti: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "L'archiviazione con ID \"%i\" non è modificabile dall'utente", + "Dropbox App Configuration" : "Configurazione applicazione Dropbox", + "Google Drive App Configuration" : "Configurazione applicazione Google Drive", "Personal" : "Personale", "System" : "Sistema", "Grant access" : "Concedi l'accesso", - "Access granted" : "Accesso consentito", "Error configuring OAuth1" : "Errore di configurazione OAuth1", "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index 6406699d412..e8dc52136aa 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "個人", "System" : "システム", "Grant access" : "アクセスを許可", - "Access granted" : "アクセスは許可されました", "Error configuring OAuth1" : "OAuth1 設定エラー", "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index e44969c7c66..d6babb07ec5 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -20,7 +20,6 @@ "Personal" : "個人", "System" : "システム", "Grant access" : "アクセスを許可", - "Access granted" : "アクセスは許可されました", "Error configuring OAuth1" : "OAuth1 設定エラー", "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js index c1a729b6655..46fcbd6238c 100644 --- a/apps/files_external/l10n/ka_GE.js +++ b/apps/files_external/l10n/ka_GE.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "ექსტერნალ საცავი", "Personal" : "პირადი", "Grant access" : "დაშვების მინიჭება", - "Access granted" : "დაშვება მინიჭებულია", "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Save" : "შენახვა", diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json index f6b0891bb0a..08f0d76d0fb 100644 --- a/apps/files_external/l10n/ka_GE.json +++ b/apps/files_external/l10n/ka_GE.json @@ -2,7 +2,6 @@ "External storage" : "ექსტერნალ საცავი", "Personal" : "პირადი", "Grant access" : "დაშვების მინიჭება", - "Access granted" : "დაშვება მინიჭებულია", "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Save" : "შენახვა", diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js index 5986399f84c..3f42823824b 100644 --- a/apps/files_external/l10n/km.js +++ b/apps/files_external/l10n/km.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ", "Personal" : "ផ្ទាល់ខ្លួន", "Grant access" : "ទទួលសិទ្ធិចូល", - "Access granted" : "បានទទួលសិទ្ធិចូល", "Saved" : "បានរក្សាទុក", "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json index 83036382487..06ab103b606 100644 --- a/apps/files_external/l10n/km.json +++ b/apps/files_external/l10n/km.json @@ -2,7 +2,6 @@ "External storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ", "Personal" : "ផ្ទាល់ខ្លួន", "Grant access" : "ទទួលសិទ្ធិចូល", - "Access granted" : "បានទទួលសិទ្ធិចូល", "Saved" : "បានរក្សាទុក", "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index b1df3ab3ef1..2f6d48529a7 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", - "Access granted" : "접근 허가됨", "Error configuring OAuth1" : "OAuth1 설정 오류", "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 0dfedaf5cee..e1c127a9e13 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -20,7 +20,6 @@ "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", - "Access granted" : "접근 허가됨", "Error configuring OAuth1" : "OAuth1 설정 오류", "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js index 1cdb7b7e715..80399022794 100644 --- a/apps/files_external/l10n/lt_LT.js +++ b/apps/files_external/l10n/lt_LT.js @@ -7,7 +7,6 @@ OC.L10N.register( "External storage" : "Išorinė saugykla", "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", - "Access granted" : "Priėjimas suteiktas", "Saved" : "Išsaugoti", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json index f4eca160de3..d7c4d7966ac 100644 --- a/apps/files_external/l10n/lt_LT.json +++ b/apps/files_external/l10n/lt_LT.json @@ -5,7 +5,6 @@ "External storage" : "Išorinė saugykla", "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", - "Access granted" : "Priėjimas suteiktas", "Saved" : "Išsaugoti", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js index b31323bc859..2034054737e 100644 --- a/apps/files_external/l10n/lv.js +++ b/apps/files_external/l10n/lv.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Ārējā krātuve", "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", - "Access granted" : "Piešķirta pieeja", "Saved" : "Saglabāts", "Username" : "Lietotājvārds", "Password" : "Parole", diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json index 59192d946e7..59321f9957a 100644 --- a/apps/files_external/l10n/lv.json +++ b/apps/files_external/l10n/lv.json @@ -2,7 +2,6 @@ "External storage" : "Ārējā krātuve", "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", - "Access granted" : "Piešķirta pieeja", "Saved" : "Saglabāts", "Username" : "Lietotājvārds", "Password" : "Parole", diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js index 69649d9ffeb..e18307a8fc1 100644 --- a/apps/files_external/l10n/mk.js +++ b/apps/files_external/l10n/mk.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "Лично", "Grant access" : "Дозволи пристап", - "Access granted" : "Пристапот е дозволен", "Saved" : "Снимено", "Username" : "Корисничко име", "Password" : "Лозинка", diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json index fea359e8e52..49ac252700b 100644 --- a/apps/files_external/l10n/mk.json +++ b/apps/files_external/l10n/mk.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "Лично", "Grant access" : "Дозволи пристап", - "Access granted" : "Пристапот е дозволен", "Saved" : "Снимено", "Username" : "Корисничко име", "Password" : "Лозинка", diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index 5a2f725e483..bc135fea960 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Personlig", "System" : "System", "Grant access" : "Gi tilgang", - "Access granted" : "Tilgang innvilget", "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1", "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 071557b23ca..37d3ffd61cd 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -20,7 +20,6 @@ "Personal" : "Personlig", "System" : "System", "Grant access" : "Gi tilgang", - "Access granted" : "Tilgang innvilget", "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1", "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", diff --git a/apps/files_external/l10n/nds.js b/apps/files_external/l10n/nds.js index 6f5d9739018..b6de58cc433 100644 --- a/apps/files_external/l10n/nds.js +++ b/apps/files_external/l10n/nds.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Persönlich", "System" : "System", "Grant access" : "Erlaube Zugriff", - "Access granted" : "Zugriff erlaubt", "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", diff --git a/apps/files_external/l10n/nds.json b/apps/files_external/l10n/nds.json index d1d939702f3..d1aa0f4751d 100644 --- a/apps/files_external/l10n/nds.json +++ b/apps/files_external/l10n/nds.json @@ -17,7 +17,6 @@ "Personal" : "Persönlich", "System" : "System", "Grant access" : "Erlaube Zugriff", - "Access granted" : "Zugriff erlaubt", "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index 5b4f3050e70..bcbd185aed8 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Persoonlijk", "System" : "Systeem", "Grant access" : "Sta toegang toe", - "Access granted" : "Toegang toegestaan", "Error configuring OAuth1" : "Fout bij configureren OAuth1", "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 062aee79c16..ddc7ccfa8cc 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -20,7 +20,6 @@ "Personal" : "Persoonlijk", "System" : "Systeem", "Grant access" : "Sta toegang toe", - "Access granted" : "Toegang toegestaan", "Error configuring OAuth1" : "Fout bij configureren OAuth1", "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js index 40c222e0cf3..3ac21f8748d 100644 --- a/apps/files_external/l10n/oc.js +++ b/apps/files_external/l10n/oc.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistèma", "Grant access" : "Autorizar l'accès", - "Access granted" : "Accès autorizat", "Error configuring OAuth1" : "Error al moment de la configuracion d'OAuth1", "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json index 06992b89604..02283c7098b 100644 --- a/apps/files_external/l10n/oc.json +++ b/apps/files_external/l10n/oc.json @@ -19,7 +19,6 @@ "Personal" : "Personal", "System" : "Sistèma", "Grant access" : "Autorizar l'accès", - "Access granted" : "Accès autorizat", "Error configuring OAuth1" : "Error al moment de la configuracion d'OAuth1", "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index ac074059712..2034b73bd8a 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Osobiste", "System" : "System", "Grant access" : "Udziel dostępu", - "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index a583a454f1c..0d1a97abfcb 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -8,7 +8,6 @@ "Personal" : "Osobiste", "System" : "System", "Grant access" : "Udziel dostępu", - "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 08e1bac5ae6..74d6e30f9da 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Armazenamento com ID \"%i\" não é editável pelo usuário", + "Dropbox App Configuration" : "Configuração do Aplicativo Dropbox", + "Google Drive App Configuration" : "Configuração do Aplicativo Google Drive", "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Permitir acesso", - "Access granted" : "Acesso concedido", "Error configuring OAuth1" : "Erro configurando OAuth1", "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index a1e52e280ee..7f1db48e93f 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Armazenamento com ID \"%i\" não é editável pelo usuário", + "Dropbox App Configuration" : "Configuração do Aplicativo Dropbox", + "Google Drive App Configuration" : "Configuração do Aplicativo Google Drive", "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Permitir acesso", - "Access granted" : "Acesso concedido", "Error configuring OAuth1" : "Erro configurando OAuth1", "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index 0b596bb2553..771e2571b78 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Conceder acesso", - "Access granted" : "Acesso autorizado", "Error configuring OAuth1" : "Erro de configuração OAuth1", "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index f8487134f1a..4982d50e555 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -20,7 +20,6 @@ "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Conceder acesso", - "Access granted" : "Acesso autorizado", "Error configuring OAuth1" : "Erro de configuração OAuth1", "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js index a7f40aa4544..8a2d8950068 100644 --- a/apps/files_external/l10n/ro.js +++ b/apps/files_external/l10n/ro.js @@ -6,7 +6,6 @@ OC.L10N.register( "External storage" : "Stocare externă", "Personal" : "Personal", "Grant access" : "Permite accesul", - "Access granted" : "Acces permis", "Generate keys" : "Generează chei", "Error generating key pair" : "Eroarea la generarea cheilor", "(group)" : "(grup)", diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json index e8c158fbbc7..6107ad0e0f5 100644 --- a/apps/files_external/l10n/ro.json +++ b/apps/files_external/l10n/ro.json @@ -4,7 +4,6 @@ "External storage" : "Stocare externă", "Personal" : "Personal", "Grant access" : "Permite accesul", - "Access granted" : "Acces permis", "Generate keys" : "Generează chei", "Error generating key pair" : "Eroarea la generarea cheilor", "(group)" : "(grup)", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 92bebd4f008..644596d34ba 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Недостаточно данных: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Пользователь не может редактировать хранилище \"%i\"", + "Dropbox App Configuration" : "Настройка приложения Dropbox", + "Google Drive App Configuration" : "Настройка приложения Google Drive", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", - "Access granted" : "Доступ предоставлен", "Error configuring OAuth1" : "Ошибка настройки OAuth1", "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 65281caec0b..c86c1bac477 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Недостаточно данных: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Пользователь не может редактировать хранилище \"%i\"", + "Dropbox App Configuration" : "Настройка приложения Dropbox", + "Google Drive App Configuration" : "Настройка приложения Google Drive", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", - "Access granted" : "Доступ предоставлен", "Error configuring OAuth1" : "Ошибка настройки OAuth1", "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", diff --git a/apps/files_external/l10n/si_LK.js b/apps/files_external/l10n/si_LK.js index 21c808a4644..ae57532622d 100644 --- a/apps/files_external/l10n/si_LK.js +++ b/apps/files_external/l10n/si_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "පෞද්ගලික", "Grant access" : "පිවිසුම ලබාදෙන්න", - "Access granted" : "පිවිසීමට හැක", "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Save" : "සුරකින්න", diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json index 3d2c31fb87f..5f6a8fcb106 100644 --- a/apps/files_external/l10n/si_LK.json +++ b/apps/files_external/l10n/si_LK.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "පෞද්ගලික", "Grant access" : "පිවිසුම ලබාදෙන්න", - "Access granted" : "පිවිසීමට හැක", "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Save" : "සුරකින්න", diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js index ab820378a81..3f4a6bd0b8a 100644 --- a/apps/files_external/l10n/sk_SK.js +++ b/apps/files_external/l10n/sk_SK.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Osobné", "System" : "Systém", "Grant access" : "Povoliť prístup", - "Access granted" : "Prístup povolený", "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json index 28d37a83697..6bc96ad35c2 100644 --- a/apps/files_external/l10n/sk_SK.json +++ b/apps/files_external/l10n/sk_SK.json @@ -17,7 +17,6 @@ "Personal" : "Osobné", "System" : "Systém", "Grant access" : "Povoliť prístup", - "Access granted" : "Prístup povolený", "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index 8c8a60c9132..5b58901b372 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -18,10 +18,11 @@ OC.L10N.register( "Unsatisfied authentication mechanism parameters" : "Nezadovoljivi parametri mehanizma overitve", "Insufficient data: %s" : "Nepopolni podatki: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Shramba z ID \"%i\" ni uporabniško uredljiva.", + "Google Drive App Configuration" : "Nastavitve programa Google Drive", "Personal" : "Osebno", "System" : "Sistem", "Grant access" : "Odobri dostop", - "Access granted" : "Dostop je odobren", "Error configuring OAuth1" : "Napaka nastavljanja OAuth1", "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", @@ -37,6 +38,8 @@ OC.L10N.register( "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", "external-storage" : "zunanja-shramba", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Ni mogoče pridobiti seznama priklopnih točk omrežnega pogona: ni odziva s strežnika", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Nekatere izmed nastavljenih zunanjih priklopnih točk niso povezane. Več podrobnosti je na voljo s klikom na rdeče vrstice.", "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", @@ -57,6 +60,7 @@ OC.L10N.register( "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", + "Rackspace" : "Rackspace", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index 13f5d00b81a..2bf8565b7e2 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -16,10 +16,11 @@ "Unsatisfied authentication mechanism parameters" : "Nezadovoljivi parametri mehanizma overitve", "Insufficient data: %s" : "Nepopolni podatki: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Shramba z ID \"%i\" ni uporabniško uredljiva.", + "Google Drive App Configuration" : "Nastavitve programa Google Drive", "Personal" : "Osebno", "System" : "Sistem", "Grant access" : "Odobri dostop", - "Access granted" : "Dostop je odobren", "Error configuring OAuth1" : "Napaka nastavljanja OAuth1", "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", @@ -35,6 +36,8 @@ "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", "external-storage" : "zunanja-shramba", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Ni mogoče pridobiti seznama priklopnih točk omrežnega pogona: ni odziva s strežnika", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Nekatere izmed nastavljenih zunanjih priklopnih točk niso povezane. Več podrobnosti je na voljo s klikom na rdeče vrstice.", "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", @@ -55,6 +58,7 @@ "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", + "Rackspace" : "Rackspace", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji", diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js index c2bd82ebde0..9b23453e3e4 100644 --- a/apps/files_external/l10n/sq.js +++ b/apps/files_external/l10n/sq.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Depozita me id \"%i\" s’është e përpunueshme nga përdoruesi", + "Dropbox App Configuration" : "Formësim i Aplikacionit Dropbox", + "Google Drive App Configuration" : "Formësim i Aplikacionit Google Drive", "Personal" : "Personale", "System" : "Sistem", "Grant access" : "Akordoji hyrje", - "Access granted" : "Hyrja u akordua", "Error configuring OAuth1" : "Gabim gjatë formësimit të OAuth1", "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json index 3979fc3d23b..f0e420e1ab9 100644 --- a/apps/files_external/l10n/sq.json +++ b/apps/files_external/l10n/sq.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Depozita me id \"%i\" s’është e përpunueshme nga përdoruesi", + "Dropbox App Configuration" : "Formësim i Aplikacionit Dropbox", + "Google Drive App Configuration" : "Formësim i Aplikacionit Google Drive", "Personal" : "Personale", "System" : "Sistem", "Grant access" : "Akordoji hyrje", - "Access granted" : "Hyrja u akordua", "Error configuring OAuth1" : "Gabim gjatë formësimit të OAuth1", "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index 8a96b403134..a0888bbb0b9 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Лично", "System" : "Систем", "Grant access" : "Одобри приступ", - "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index d9b9300ae94..143f0dae15a 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -8,7 +8,6 @@ "Personal" : "Лично", "System" : "Систем", "Grant access" : "Одобри приступ", - "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js index 68954a6b6ae..2cc12ecf4aa 100644 --- a/apps/files_external/l10n/sr@latin.js +++ b/apps/files_external/l10n/sr@latin.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Lično", "System" : "Sistemsko", "Grant access" : "Dozvoli pristup", - "Access granted" : "Pristup Dozvoljen", "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.", "(group)" : "(grupa)", "Saved" : "Sačuvano", diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json index ffe95d4a52e..2460d2544a4 100644 --- a/apps/files_external/l10n/sr@latin.json +++ b/apps/files_external/l10n/sr@latin.json @@ -5,7 +5,6 @@ "Personal" : "Lično", "System" : "Sistemsko", "Grant access" : "Dozvoli pristup", - "Access granted" : "Pristup Dozvoljen", "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.", "(group)" : "(grupa)", "Saved" : "Sačuvano", diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js index 25a637e31fa..bee41cf7322 100644 --- a/apps/files_external/l10n/sv.js +++ b/apps/files_external/l10n/sv.js @@ -11,7 +11,6 @@ OC.L10N.register( "Personal" : "Personligt", "System" : "System", "Grant access" : "Bevilja åtkomst", - "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json index 5e6ee5e75bf..66b95d84a0b 100644 --- a/apps/files_external/l10n/sv.json +++ b/apps/files_external/l10n/sv.json @@ -9,7 +9,6 @@ "Personal" : "Personligt", "System" : "System", "Grant access" : "Bevilja åtkomst", - "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js index 2aeb63ed2cf..8b24951e118 100644 --- a/apps/files_external/l10n/ta_LK.js +++ b/apps/files_external/l10n/ta_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "தனிப்பட்ட", "Grant access" : "அனுமதியை வழங்கல்", - "Access granted" : "அனுமதி வழங்கப்பட்டது", "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Save" : "சேமிக்க ", diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json index 8c0ad0a9cae..15936d3f191 100644 --- a/apps/files_external/l10n/ta_LK.json +++ b/apps/files_external/l10n/ta_LK.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "தனிப்பட்ட", "Grant access" : "அனுமதியை வழங்கல்", - "Access granted" : "அனுமதி வழங்கப்பட்டது", "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Save" : "சேமிக்க ", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index d2abf4eb427..8ee72ac0eff 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "ส่วนตัว", "System" : "ระบบ", "Grant access" : "อนุญาตให้เข้าถึงได้", - "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว", "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1", "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 16035bfc6b5..380a69402b0 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -20,7 +20,6 @@ "Personal" : "ส่วนตัว", "System" : "ระบบ", "Grant access" : "อนุญาตให้เข้าถึงได้", - "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว", "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1", "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index 28e95fd5eed..8365741a128 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Kişisel", "System" : "Sistem", "Grant access" : "Erişimi sağla", - "Access granted" : "Giriş kabul edildi", "Error configuring OAuth1" : "OAuth1 yapılandırma hatası", "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 4b131181b9e..f035cbdb134 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -20,7 +20,6 @@ "Personal" : "Kişisel", "System" : "Sistem", "Grant access" : "Erişimi sağla", - "Access granted" : "Giriş kabul edildi", "Error configuring OAuth1" : "OAuth1 yapılandırma hatası", "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js index d21348ff73b..0f1e4e35e94 100644 --- a/apps/files_external/l10n/uk.js +++ b/apps/files_external/l10n/uk.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Особисте", "System" : "Система", "Grant access" : "Дозволити доступ", - "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json index 33886b821cc..72f74347d03 100644 --- a/apps/files_external/l10n/uk.json +++ b/apps/files_external/l10n/uk.json @@ -8,7 +8,6 @@ "Personal" : "Особисте", "System" : "Система", "Grant access" : "Дозволити доступ", - "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js index fae262730cf..0e99f70c3a4 100644 --- a/apps/files_external/l10n/vi.js +++ b/apps/files_external/l10n/vi.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Lưu trữ ngoài", "Personal" : "Cá nhân", "Grant access" : "Cấp quyền truy cập", - "Access granted" : "Đã cấp quyền truy cập", "Saved" : "Đã lưu", "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json index b6deab1dfdf..90e2a0d97c3 100644 --- a/apps/files_external/l10n/vi.json +++ b/apps/files_external/l10n/vi.json @@ -2,7 +2,6 @@ "External storage" : "Lưu trữ ngoài", "Personal" : "Cá nhân", "Grant access" : "Cấp quyền truy cập", - "Access granted" : "Đã cấp quyền truy cập", "Saved" : "Đã lưu", "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 805ae91d4de..cc7edb361fd 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "个人", "System" : "系统", "Grant access" : "授权", - "Access granted" : "权限已授予。", "Saved" : "已保存", "External mount error" : "外部挂载错误", "external-storage" : "外部存储", diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json index 71babc081f6..105cf564843 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -7,7 +7,6 @@ "Personal" : "个人", "System" : "系统", "Grant access" : "授权", - "Access granted" : "权限已授予。", "Saved" : "已保存", "External mount error" : "外部挂载错误", "external-storage" : "外部存储", diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js index cf3eb29c250..1749eda96dd 100644 --- a/apps/files_external/l10n/zh_TW.js +++ b/apps/files_external/l10n/zh_TW.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "個人", "System" : "系統", "Grant access" : "允許存取", - "Access granted" : "允許存取", "Error configuring OAuth1" : "設定 OAuth1 時發生錯誤", "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json index 9dcfdba255f..7b49bb919ca 100644 --- a/apps/files_external/l10n/zh_TW.json +++ b/apps/files_external/l10n/zh_TW.json @@ -19,7 +19,6 @@ "Personal" : "個人", "System" : "系統", "Grant access" : "允許存取", - "Access granted" : "允許存取", "Error configuring OAuth1" : "設定 OAuth1 時發生錯誤", "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php index dd83c9a6a69..808681530ea 100644 --- a/apps/files_external/lib/auth/oauth1/oauth1.php +++ b/apps/files_external/lib/auth/oauth1/oauth1.php @@ -46,7 +46,7 @@ class OAuth1 extends AuthMechanism { (new DefinitionParameter('token_secret', 'token_secret')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('oauth1') + ->addCustomJs('oauth1') ; } diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php index c89007b52ba..d4bba8ef0eb 100644 --- a/apps/files_external/lib/auth/oauth2/oauth2.php +++ b/apps/files_external/lib/auth/oauth2/oauth2.php @@ -44,7 +44,7 @@ class OAuth2 extends AuthMechanism { (new DefinitionParameter('token', 'token')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('oauth2') + ->addCustomJs('oauth2') ; } diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php index 9045f6818f9..7732beeddf8 100644 --- a/apps/files_external/lib/auth/publickey/rsa.php +++ b/apps/files_external/lib/auth/publickey/rsa.php @@ -52,7 +52,7 @@ class RSA extends AuthMechanism { (new DefinitionParameter('private_key', 'private_key')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('public_key') + ->addCustomJs('public_key') ; } diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php index f9156082515..2133c274996 100644 --- a/apps/files_external/lib/backend/dropbox.php +++ b/apps/files_external/lib/backend/dropbox.php @@ -44,6 +44,7 @@ class Dropbox extends Backend { // all parameters handled in OAuth1 mechanism ]) ->addAuthScheme(AuthMechanism::SCHEME_OAUTH1) + ->addCustomJs('dropbox') ->setLegacyAuthMechanism($legacyAuth) ; } diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php index b2b48a0e402..b18b7bdb348 100644 --- a/apps/files_external/lib/backend/google.php +++ b/apps/files_external/lib/backend/google.php @@ -44,6 +44,7 @@ class Google extends Backend { // all parameters handled in OAuth2 mechanism ]) ->addAuthScheme(AuthMechanism::SCHEME_OAUTH2) + ->addCustomJs('gdrive') ->setLegacyAuthMechanism($legacyAuth) ; } diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php index 084758ff78a..752c501e1ec 100644 --- a/apps/files_external/lib/backend/legacybackend.php +++ b/apps/files_external/lib/backend/legacybackend.php @@ -84,7 +84,7 @@ class LegacyBackend extends Backend { $this->setPriority($definition['priority']); } if (isset($definition['custom'])) { - $this->setCustomJs($definition['custom']); + $this->addCustomJs($definition['custom']); } if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { $this->hasDependencies = true; diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php index 9f2b7c40f7f..ccc2a75fd1b 100644 --- a/apps/files_external/lib/frontenddefinitiontrait.php +++ b/apps/files_external/lib/frontenddefinitiontrait.php @@ -36,8 +36,8 @@ trait FrontendDefinitionTrait { /** @var DefinitionParameter[] parameters for mechanism */ private $parameters = []; - /** @var string|null custom JS */ - private $customJs = null; + /** @var string[] custom JS */ + private $customJs = []; /** * @return string @@ -92,7 +92,7 @@ trait FrontendDefinitionTrait { } /** - * @return string|null + * @return string[] */ public function getCustomJs() { return $this->customJs; @@ -102,8 +102,18 @@ trait FrontendDefinitionTrait { * @param string $custom * @return self */ + public function addCustomJs($custom) { + $this->customJs[] = $custom; + return $this; + } + + /** + * @param string $custom + * @return self + * @deprecated 9.1.0, use addCustomJs() instead + */ public function setCustomJs($custom) { - $this->customJs = $custom; + $this->customJs = [$custom]; return $this; } @@ -121,10 +131,8 @@ trait FrontendDefinitionTrait { $data = [ 'name' => $this->getText(), 'configuration' => $configuration, + 'custom' => $this->getCustomJs(), ]; - if (isset($this->customJs)) { - $data['custom'] = $this->getCustomJs(); - } return $data; } diff --git a/apps/files_external/lib/storage/google.php b/apps/files_external/lib/storage/google.php index 8d1fe808130..13e89299c22 100644 --- a/apps/files_external/lib/storage/google.php +++ b/apps/files_external/lib/storage/google.php @@ -445,7 +445,7 @@ class Google extends \OC\Files\Storage\Common { $response = $client->get($downloadUrl, [ 'headers' => $httpRequest->getRequestHeaders(), 'stream' => true, - 'verify' => __DIR__ . '/../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem', + 'verify' => __DIR__ . '/../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem', ]); } catch (RequestException $e) { if(!is_null($e->getResponse())) { diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 7edd66fe4d5..c9cc40b0ba0 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,5 +1,6 @@ <?php use \OCA\Files_External\Lib\Backend\Backend; + use \OCA\Files_External\Lib\Auth\AuthMechanism; use \OCA\Files_External\Lib\DefinitionParameter; use \OCA\Files_External\Service\BackendService; @@ -16,13 +17,16 @@ // load custom JS foreach ($_['backends'] as $backend) { /** @var Backend $backend */ - if ($backend->getCustomJs()) { - script('files_external', $backend->getCustomJs()); + $scripts = $backend->getCustomJs(); + foreach ($scripts as $script) { + script('files_external', $script); } } foreach ($_['authMechanisms'] as $authMechanism) { - if ($authMechanism->getCustomJs()) { - script('files_external', $authMechanism->getCustomJs()); + /** @var AuthMechanism $authMechanism */ + $scripts = $authMechanism->getCustomJs(); + foreach ($scripts as $script) { + script('files_external', $script); } } diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php index d825b7627b7..465b79a6be6 100644 --- a/apps/files_external/tests/backend/legacybackendtest.php +++ b/apps/files_external/tests/backend/legacybackendtest.php @@ -62,7 +62,7 @@ class LegacyBackendTest extends \Test\TestCase { $this->assertEquals('\OCA\Files_External\Tests\Backend\LegacyBackendTest', $backend->getStorageClass()); $this->assertEquals('Backend text', $backend->getText()); $this->assertEquals(123, $backend->getPriority()); - $this->assertEquals('foo/bar.js', $backend->getCustomJs()); + $this->assertContains('foo/bar.js', $backend->getCustomJs()); $this->assertArrayHasKey('builtin', $backend->getAuthSchemes()); $this->assertEquals($auth, $backend->getLegacyAuthMechanism()); diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php index 2afc87762e9..b3846fa1510 100644 --- a/apps/files_external/tests/frontenddefinitiontraittest.php +++ b/apps/files_external/tests/frontenddefinitiontraittest.php @@ -33,12 +33,14 @@ class FrontendDefinitionTraitTest extends \Test\TestCase { $trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait'); $trait->setText('test'); $trait->addParameters([$param]); - $trait->setCustomJs('foo/bar.js'); + $trait->addCustomJs('foo/bar.js'); + $trait->addCustomJs('bar/foo.js'); $json = $trait->jsonSerializeDefinition(); $this->assertEquals('test', $json['name']); - $this->assertEquals('foo/bar.js', $json['custom']); + $this->assertContains('foo/bar.js', $json['custom']); + $this->assertContains('bar/foo.js', $json['custom']); $configuration = $json['configuration']; $this->assertArrayHasKey('foo', $configuration); diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index ffaaa9a841a..f6e937a723d 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", + "Could not lock path" : "Nepodařilo se uzamknout cestu", "Can't change permissions for public share links" : "Nelze změnit oprávnění pro veřejně sdílené odkazy", "Wrong or no update parameter given" : "Chyba nebo žádná aktualizace dle zadaných parametrů", "Cannot increase permissions" : "Nelze navýšit oprávnění", diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 533f5bdeb4f..45c81e4e4e0 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", + "Could not lock path" : "Nepodařilo se uzamknout cestu", "Can't change permissions for public share links" : "Nelze změnit oprávnění pro veřejně sdílené odkazy", "Wrong or no update parameter given" : "Chyba nebo žádná aktualizace dle zadaných parametrů", "Cannot increase permissions" : "Nelze navýšit oprávnění", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 964aef9e0df..503529b7a5b 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -8,8 +8,19 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", + "Share API is disabled" : "El API de compartir está deshabilitado", + "Wrong share ID, share doesn't exist" : "El ID del recurso compartido no es correcto, el recurso compartido no existe", + "Could not delete share" : "No se ha podido eliminar el recurso compartido", + "Please specify a file or folder path" : "Por favor, especifica la ubicación de un archivo o carpeta", + "Wrong path, file/folder doesn't exist" : "Ubicación incorrecta, el archivo/carpeta no existe", + "Please specify a valid user" : "Por favor, especifica un usuario válido", + "Group sharing is disabled by the administrator" : "Compartir en grupo está deshabilitado por el administrador", + "Please specify a valid group" : "Por favor, especifica un grupo válido", + "Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador", "Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD", + "Unknown share type" : "Tipo desconocido de recurso compartido", "Not a directory" : "No es un directorio", + "Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos", "Cannot increase permissions" : "No es posible aumentar permisos", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 172de7e3f47..ca2f1aa196f 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -6,8 +6,19 @@ "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", + "Share API is disabled" : "El API de compartir está deshabilitado", + "Wrong share ID, share doesn't exist" : "El ID del recurso compartido no es correcto, el recurso compartido no existe", + "Could not delete share" : "No se ha podido eliminar el recurso compartido", + "Please specify a file or folder path" : "Por favor, especifica la ubicación de un archivo o carpeta", + "Wrong path, file/folder doesn't exist" : "Ubicación incorrecta, el archivo/carpeta no existe", + "Please specify a valid user" : "Por favor, especifica un usuario válido", + "Group sharing is disabled by the administrator" : "Compartir en grupo está deshabilitado por el administrador", + "Please specify a valid group" : "Por favor, especifica un grupo válido", + "Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador", "Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD", + "Unknown share type" : "Tipo desconocido de recurso compartido", "Not a directory" : "No es un directorio", + "Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos", "Cannot increase permissions" : "No es posible aumentar permisos", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index 41c20a6ff4f..611295f947a 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -8,6 +8,10 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", + "Please specify a valid user" : "Por favor indique um utilizador válido", + "Please specify a valid group" : "Por favor indique um grupo válido", + "Unknown share type" : "Tipo de partilha desconhecido", + "Not a directory" : "Não é um directoria", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index 5ff546a1397..b817385e060 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -6,6 +6,10 @@ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", + "Please specify a valid user" : "Por favor indique um utilizador válido", + "Please specify a valid group" : "Por favor indique um grupo válido", + "Unknown share type" : "Tipo de partilha desconhecido", + "Not a directory" : "Não é um directoria", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js index 751da9881cd..ac3de75f4e2 100644 --- a/apps/files_sharing/l10n/ro.js +++ b/apps/files_sharing/l10n/ro.js @@ -11,6 +11,8 @@ OC.L10N.register( "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă", "Nothing shared yet" : "Nimic partajat încă", "Cancel" : "Anulare", + "No ownCloud installation (7 or higher) found at {remote}" : "Nu s-a găsit nicio instanță ownCloud (versiunea 7 sau mai mare) la {remote}", + "Invalid ownCloud url" : "URL ownCloud invalid", "Shared by" : "impartite in ", "Sharing" : "Partajare", "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>", diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json index 042d7324d47..2fa1f4a049e 100644 --- a/apps/files_sharing/l10n/ro.json +++ b/apps/files_sharing/l10n/ro.json @@ -9,6 +9,8 @@ "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă", "Nothing shared yet" : "Nimic partajat încă", "Cancel" : "Anulare", + "No ownCloud installation (7 or higher) found at {remote}" : "Nu s-a găsit nicio instanță ownCloud (versiunea 7 sau mai mare) la {remote}", + "Invalid ownCloud url" : "URL ownCloud invalid", "Shared by" : "impartite in ", "Sharing" : "Partajare", "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>", diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 92fd2bc5a5c..c181742df7a 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -17,11 +17,12 @@ OC.L10N.register( "Please specify a valid group" : "Navesti je treba veljavno skupino", "Public link sharing is disabled by the administrator" : "Souporaba prek javne povezave je skrbniško onemogočena", "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", - "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javno objavljene mape.", + "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", "Could not lock path" : "Poti ni mogoče zakleniti", + "Can't change permissions for public share links" : "Za javne povezave souporabe, spreminjanje dovoljenj ni mogoče.", "Wrong or no update parameter given" : "Parameter posodobitve ni podan ali pa je navedena napačna vrednost", "Cannot increase permissions" : "Ni mogoče povišati dovoljenj", "Shared with you" : "V souporabi z vami", @@ -44,28 +45,29 @@ OC.L10N.register( "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", - "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.", - "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", + "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je omogočena <strong>souporaba</strong>.", + "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je omogočena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", - "You received a new remote share %2$s from %1$s" : "Prejeli ste oddaljeno mapo za souporabo %2$s od %1$s", + "You received a new remote share %2$s from %1$s" : "Uporabnik %1$s vam je omogočil souporabo mape %2$s", "You received a new remote share from %s" : "Prejeli ste mapo za oddaljeno souporabo z %s", "%1$s accepted remote share %2$s" : "Uporabnik %1$s je prejel oddaljeno souporabo %2$s", "%1$s declined remote share %2$s" : "Uporabnik %1$s je zavrnil souporabo %2$s", "%1$s unshared %2$s from you" : "Uporabnik %1$s je onemogoči souporabo %2$s z vami", - "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta", + "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta.", "Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta", "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", - "%2$s shared %1$s with %3$s" : "%2$s je omogočil souporabo %1$s z %3$s", - "You removed the share of %2$s for %1$s" : "Odstranili ste mapo za souporabo %2$s za %1$s", + "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", + "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", - "Shared with %2$s" : "Omogočena souporaba z %2$s", - "Shared via public link" : "Omogočena javna povezava za souporabo", + "Shared with %2$s" : "V souporabi z %2$s", + "Shared via public link" : "V souporabi prek javne povezave", "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", - "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", + "Public link of %2$s expired" : "Javna povezava %2$s je potekla", + "Shared by %2$s" : "Souporabo je omogočil uporabnik %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 1d0ebbd1e32..aab8c565335 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -15,11 +15,12 @@ "Please specify a valid group" : "Navesti je treba veljavno skupino", "Public link sharing is disabled by the administrator" : "Souporaba prek javne povezave je skrbniško onemogočena", "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", - "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javno objavljene mape.", + "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", "Could not lock path" : "Poti ni mogoče zakleniti", + "Can't change permissions for public share links" : "Za javne povezave souporabe, spreminjanje dovoljenj ni mogoče.", "Wrong or no update parameter given" : "Parameter posodobitve ni podan ali pa je navedena napačna vrednost", "Cannot increase permissions" : "Ni mogoče povišati dovoljenj", "Shared with you" : "V souporabi z vami", @@ -42,28 +43,29 @@ "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", - "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.", - "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", + "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je omogočena <strong>souporaba</strong>.", + "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je omogočena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", - "You received a new remote share %2$s from %1$s" : "Prejeli ste oddaljeno mapo za souporabo %2$s od %1$s", + "You received a new remote share %2$s from %1$s" : "Uporabnik %1$s vam je omogočil souporabo mape %2$s", "You received a new remote share from %s" : "Prejeli ste mapo za oddaljeno souporabo z %s", "%1$s accepted remote share %2$s" : "Uporabnik %1$s je prejel oddaljeno souporabo %2$s", "%1$s declined remote share %2$s" : "Uporabnik %1$s je zavrnil souporabo %2$s", "%1$s unshared %2$s from you" : "Uporabnik %1$s je onemogoči souporabo %2$s z vami", - "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta", + "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta.", "Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta", "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", - "%2$s shared %1$s with %3$s" : "%2$s je omogočil souporabo %1$s z %3$s", - "You removed the share of %2$s for %1$s" : "Odstranili ste mapo za souporabo %2$s za %1$s", + "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", + "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", - "Shared with %2$s" : "Omogočena souporaba z %2$s", - "Shared via public link" : "Omogočena javna povezava za souporabo", + "Shared with %2$s" : "V souporabi z %2$s", + "Shared via public link" : "V souporabi prek javne povezave", "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", - "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", + "Public link of %2$s expired" : "Javna povezava %2$s je potekla", + "Shared by %2$s" : "Souporabo je omogočil uporabnik %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index a9f676fad98..f0f659d1bc6 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -2,15 +2,41 @@ OC.L10N.register( "files_sharing", { "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" : "存储无效", "Couldn't add remote share" : "无法添加远程分享", + "Share API is disabled" : "共享 API 已被禁用", + "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在", + "Could not delete share" : "不能删除共享", + "Please specify a file or folder path" : "请指定一个文件或文件夹路径", + "Wrong path, file/folder doesn't exist" : "路径错误，文件/文件夹不存在", + "Please specify a valid user" : "请指定一个有效的用户", + "Group sharing is disabled by the administrator" : "群组共享已被管理员禁用", + "Please specify a valid group" : "请指定一个有效的组", + "Public link sharing is disabled by the administrator" : "公共链接共享已被管理员禁用", + "Public upload disabled by the administrator" : "公共上传已被管理员禁用", + "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹", + "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型", + "Unknown share type" : "未知共享类型", + "Not a directory" : "不是一个目录", + "Could not lock path" : "无法锁定路径", + "Can't change permissions for public share links" : "不能改变公共分享链接权限", + "Wrong or no update parameter given" : "错误或没有更新参数给出", + "Cannot increase permissions" : "不能增加权限", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", "Shared by link" : "分享链接的文件", "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", + "Files and folders others share with you will show up here" : "其它人共享给您的文件和文件夹将显示在这里", "Nothing shared yet" : "还没有共享过文件", + "Files and folders you share will show up here" : "您共享的文件和文件夹将显示在这里", "No shared links" : "无分享链接", + "Files and folders you share by link will show up here" : "您通过链接共享的文件和文件夹将显示在这里", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -22,21 +48,40 @@ OC.L10N.register( "Shared by" : "共享人", "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", + "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ", + "A public shared file or folder was <strong>downloaded</strong>" : "一个公共共享的文件或文件夹<strong>已下载</strong>", + "You received a new remote share %2$s from %1$s" : "您收到一个新的远程共享 %2$s 来自于 %1$s", "You received a new remote share from %s" : "您从%s收到了新的远程分享", "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", + "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ", "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载", "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", + "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s", + "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", + "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s", + "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s", "%2$s shared %1$s via link" : "%2$s 以链接方式共享 %1$s", "You shared %1$s via link" : "您通过链接共享了 %1$s", + "You removed the public link for %1$s" : "你移除了公共链接 %1$s", + "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s", + "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期", + "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期", "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您", + "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s", "Downloaded via public link" : "通过公开链接下载", "Shared with %2$s" : "共享给 %2$s", "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s", + "Removed share for %2$s" : "移除共享 %2$s", + "%2$s removed share for %3$s" : "%2$s 移除共享 %3$s", "Shared with group %2$s" : "共享给组%2$s", "Shared with group %3$s by %2$s" : "由 %2$s 共享给组 %3$s", + "Removed share of group %2$s" : "移除了组 %2$s 的共享", + "%2$s removed share of group %3$s" : "%2$s 移除了群 %3$s 的共享", "Shared via link by %2$s" : "%2$s 以链接方式共享", "Shared via public link" : "通过公开链接共享", "Removed public link" : "移除公开链接", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index bffaa9b6b5b..e1ba3104700 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -1,14 +1,40 @@ { "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" : "存储无效", "Couldn't add remote share" : "无法添加远程分享", + "Share API is disabled" : "共享 API 已被禁用", + "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在", + "Could not delete share" : "不能删除共享", + "Please specify a file or folder path" : "请指定一个文件或文件夹路径", + "Wrong path, file/folder doesn't exist" : "路径错误，文件/文件夹不存在", + "Please specify a valid user" : "请指定一个有效的用户", + "Group sharing is disabled by the administrator" : "群组共享已被管理员禁用", + "Please specify a valid group" : "请指定一个有效的组", + "Public link sharing is disabled by the administrator" : "公共链接共享已被管理员禁用", + "Public upload disabled by the administrator" : "公共上传已被管理员禁用", + "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹", + "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型", + "Unknown share type" : "未知共享类型", + "Not a directory" : "不是一个目录", + "Could not lock path" : "无法锁定路径", + "Can't change permissions for public share links" : "不能改变公共分享链接权限", + "Wrong or no update parameter given" : "错误或没有更新参数给出", + "Cannot increase permissions" : "不能增加权限", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", "Shared by link" : "分享链接的文件", "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", + "Files and folders others share with you will show up here" : "其它人共享给您的文件和文件夹将显示在这里", "Nothing shared yet" : "还没有共享过文件", + "Files and folders you share will show up here" : "您共享的文件和文件夹将显示在这里", "No shared links" : "无分享链接", + "Files and folders you share by link will show up here" : "您通过链接共享的文件和文件夹将显示在这里", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -20,21 +46,40 @@ "Shared by" : "共享人", "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", + "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ", + "A public shared file or folder was <strong>downloaded</strong>" : "一个公共共享的文件或文件夹<strong>已下载</strong>", + "You received a new remote share %2$s from %1$s" : "您收到一个新的远程共享 %2$s 来自于 %1$s", "You received a new remote share from %s" : "您从%s收到了新的远程分享", "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", + "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ", "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载", "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", + "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s", + "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", + "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s", + "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s", "%2$s shared %1$s via link" : "%2$s 以链接方式共享 %1$s", "You shared %1$s via link" : "您通过链接共享了 %1$s", + "You removed the public link for %1$s" : "你移除了公共链接 %1$s", + "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s", + "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期", + "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期", "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您", + "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s", "Downloaded via public link" : "通过公开链接下载", "Shared with %2$s" : "共享给 %2$s", "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s", + "Removed share for %2$s" : "移除共享 %2$s", + "%2$s removed share for %3$s" : "%2$s 移除共享 %3$s", "Shared with group %2$s" : "共享给组%2$s", "Shared with group %3$s by %2$s" : "由 %2$s 共享给组 %3$s", + "Removed share of group %2$s" : "移除了组 %2$s 的共享", + "%2$s removed share of group %3$s" : "%2$s 移除了群 %3$s 的共享", "Shared via link by %2$s" : "%2$s 以链接方式共享", "Shared via public link" : "通过公开链接共享", "Removed public link" : "移除公开链接", diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index 0950c2a62f5..b1d6facafd6 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -143,7 +143,7 @@ abstract class TestCase extends \Test\TestCase { \OC_User::clearBackends(); \OC_User::useBackend('database'); \OC_Group::clearBackends(); - \OC_Group::useBackend(new \OC_Group_Database()); + \OC_Group::useBackend(new \OC\Group\Database()); parent::tearDownAfterClass(); } diff --git a/apps/systemtags/l10n/es.js b/apps/systemtags/l10n/es.js index 19a1b67feae..95183d5c827 100644 --- a/apps/systemtags/l10n/es.js +++ b/apps/systemtags/l10n/es.js @@ -9,11 +9,17 @@ OC.L10N.register( "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo", "You assigned system tag %3$s" : "Se asignó la etiqueta de sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s", + "You unassigned system tag %3$s" : "Desasignaste la etiqueta del sistema %3$s", "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s", + "You created system tag %2$s" : "Creaste la etiqueta del sistema %2$s", "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s", + "You deleted system tag %2$s" : "Eliminaste la etiqueta del sistema %2$s", "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s", + "You updated system tag %3$s to %2$s" : "Actualizaste la etiqueta del sistema de %3$s a %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s", + "You assigned system tag %3$s to %2$s" : "Asignaste la etiqueta del sistema de %3$s a %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s", + "You unassigned system tag %3$s from %2$s" : "Desasignaste la etiqueta del sistema a %3$s de %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s", "%s (not-assignable)" : "%s (no asignable)", "%s (invisible)" : "%s (invisible)", diff --git a/apps/systemtags/l10n/es.json b/apps/systemtags/l10n/es.json index 69bd5b4d44b..4bc5a63dd83 100644 --- a/apps/systemtags/l10n/es.json +++ b/apps/systemtags/l10n/es.json @@ -7,11 +7,17 @@ "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo", "You assigned system tag %3$s" : "Se asignó la etiqueta de sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s", + "You unassigned system tag %3$s" : "Desasignaste la etiqueta del sistema %3$s", "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s", + "You created system tag %2$s" : "Creaste la etiqueta del sistema %2$s", "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s", + "You deleted system tag %2$s" : "Eliminaste la etiqueta del sistema %2$s", "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s", + "You updated system tag %3$s to %2$s" : "Actualizaste la etiqueta del sistema de %3$s a %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s", + "You assigned system tag %3$s to %2$s" : "Asignaste la etiqueta del sistema de %3$s a %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s", + "You unassigned system tag %3$s from %2$s" : "Desasignaste la etiqueta del sistema a %3$s de %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s", "%s (not-assignable)" : "%s (no asignable)", "%s (invisible)" : "%s (invisible)", diff --git a/apps/systemtags/l10n/ko.js b/apps/systemtags/l10n/ko.js index 25a7f2eccb5..10eb1cf229e 100644 --- a/apps/systemtags/l10n/ko.js +++ b/apps/systemtags/l10n/ko.js @@ -2,6 +2,10 @@ OC.L10N.register( "systemtags", { "Tags" : "태그", + "Tagged files" : "태그 된 파일", + "Select tags to filter by" : "필터링 할 태그 선택", + "Please select tags to filter by" : "필터링 할 태그 선택", + "No files found for the selected tags" : "선택한 태그에 대한 파일을 찾을 수 없음", "No files in here" : "여기에 파일 없음", "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", diff --git a/apps/systemtags/l10n/ko.json b/apps/systemtags/l10n/ko.json index af4d378f844..f5a9052168c 100644 --- a/apps/systemtags/l10n/ko.json +++ b/apps/systemtags/l10n/ko.json @@ -1,5 +1,9 @@ { "translations": { "Tags" : "태그", + "Tagged files" : "태그 된 파일", + "Select tags to filter by" : "필터링 할 태그 선택", + "Please select tags to filter by" : "필터링 할 태그 선택", + "No files found for the selected tags" : "선택한 태그에 대한 파일을 찾을 수 없음", "No files in here" : "여기에 파일 없음", "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", diff --git a/apps/systemtags/l10n/ru.js b/apps/systemtags/l10n/ru.js index b42decbc224..23080dbf5eb 100644 --- a/apps/systemtags/l10n/ru.js +++ b/apps/systemtags/l10n/ru.js @@ -7,12 +7,19 @@ OC.L10N.register( "Please select tags to filter by" : "Выберите метки для фильтра", "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You assigned system tag %3$s" : "Вы назначили системный тег %3$s", "%1$s assigned system tag %3$s" : "%1$s назначил системную метку %3$s", + "You unassigned system tag %3$s" : "Вы отменили системный тег %3$s", "%1$s unassigned system tag %3$s" : "%1$s отсоединил системную метку %3$s", + "You created system tag %2$s" : "Вы создали системный тег %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", + "You deleted system tag %2$s" : "Вы удалили системный тег %2$s", "%1$s deleted system tag %2$s" : "%1$s удалил системную метку %2$s", + "You updated system tag %3$s to %2$s" : "Вы обновили системный тег %3$s на %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s обновил системную метку %3$s для %2$s", + "You assigned system tag %3$s to %2$s" : "Вы назначили системный тег %3$s на %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s назначил системную метку %3$s для %2$s", + "You unassigned system tag %3$s from %2$s" : "Вы назначили системный тег %3$s из %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s отсоединил системную метку %3$s для %2$s", "%s (not-assignable)" : "%s (неназначаемые)", "%s (invisible)" : "%s (невидимые)", diff --git a/apps/systemtags/l10n/ru.json b/apps/systemtags/l10n/ru.json index 0f14253fe03..e7e42366aaf 100644 --- a/apps/systemtags/l10n/ru.json +++ b/apps/systemtags/l10n/ru.json @@ -5,12 +5,19 @@ "Please select tags to filter by" : "Выберите метки для фильтра", "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You assigned system tag %3$s" : "Вы назначили системный тег %3$s", "%1$s assigned system tag %3$s" : "%1$s назначил системную метку %3$s", + "You unassigned system tag %3$s" : "Вы отменили системный тег %3$s", "%1$s unassigned system tag %3$s" : "%1$s отсоединил системную метку %3$s", + "You created system tag %2$s" : "Вы создали системный тег %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", + "You deleted system tag %2$s" : "Вы удалили системный тег %2$s", "%1$s deleted system tag %2$s" : "%1$s удалил системную метку %2$s", + "You updated system tag %3$s to %2$s" : "Вы обновили системный тег %3$s на %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s обновил системную метку %3$s для %2$s", + "You assigned system tag %3$s to %2$s" : "Вы назначили системный тег %3$s на %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s назначил системную метку %3$s для %2$s", + "You unassigned system tag %3$s from %2$s" : "Вы назначили системный тег %3$s из %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s отсоединил системную метку %3$s для %2$s", "%s (not-assignable)" : "%s (неназначаемые)", "%s (invisible)" : "%s (невидимые)", diff --git a/apps/updatenotification/l10n/es.js b/apps/updatenotification/l10n/es.js index 0ba60384822..2dc16b3c517 100644 --- a/apps/updatenotification/l10n/es.js +++ b/apps/updatenotification/l10n/es.js @@ -9,6 +9,6 @@ OC.L10N.register( "Your version is up to date." : "Su versión está actualizada.", "Checked on %s" : "Revisado el %s", "Update channel:" : "Canal de actualización: ", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás volver a un canal más estable." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/es.json b/apps/updatenotification/l10n/es.json index 034e7b2133b..dd49fc5e8a1 100644 --- a/apps/updatenotification/l10n/es.json +++ b/apps/updatenotification/l10n/es.json @@ -7,6 +7,6 @@ "Your version is up to date." : "Su versión está actualizada.", "Checked on %s" : "Revisado el %s", "Update channel:" : "Canal de actualización: ", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás volver a un canal más estable." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/ko.js b/apps/updatenotification/l10n/ko.js index 2025731fbf3..cc225791380 100644 --- a/apps/updatenotification/l10n/ko.js +++ b/apps/updatenotification/l10n/ko.js @@ -2,6 +2,7 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", + "Updated channel" : "업데이트 된 채널", "Updater" : "업데이터", "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", "Open updater" : "업데이터 열기", diff --git a/apps/updatenotification/l10n/ko.json b/apps/updatenotification/l10n/ko.json index 1794dd919d0..a2e0474a0e3 100644 --- a/apps/updatenotification/l10n/ko.json +++ b/apps/updatenotification/l10n/ko.json @@ -1,5 +1,6 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", + "Updated channel" : "업데이트 된 채널", "Updater" : "업데이터", "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", "Open updater" : "업데이터 열기", diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index eba39ca50f7..ff8197fb43a 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -894,6 +894,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)(\OC_Group_Backend::COUNT_USERS & $actions); + return (bool)(\OC\Group\Backend::COUNT_USERS & $actions); } } diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js index 9e5b0d910f0..0392c27f2b4 100644 --- a/apps/user_ldap/l10n/cs_CZ.js +++ b/apps/user_ldap/l10n/cs_CZ.js @@ -96,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", + "%s access is limited to users meeting these criteria:" : "Přístup pro %s je omezen na uživatele odpovídající těmto kritériím:", "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." : "Nejčastější třídy objektů pro uživatele jsou organizationalPerson, person, user a inetOrgPerson. Pokud si nejste jisti které třídy objektů zvolit, obraťte se na svého adresářového správce.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "Verify settings and count users" : "Ověřit nastavení a spočítat uživatele", diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json index 106072c6875..4bf061691c2 100644 --- a/apps/user_ldap/l10n/cs_CZ.json +++ b/apps/user_ldap/l10n/cs_CZ.json @@ -94,6 +94,7 @@ "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", + "%s access is limited to users meeting these criteria:" : "Přístup pro %s je omezen na uživatele odpovídající těmto kritériím:", "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." : "Nejčastější třídy objektů pro uživatele jsou organizationalPerson, person, user a inetOrgPerson. Pokud si nejste jisti které třídy objektů zvolit, obraťte se na svého adresářového správce.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "Verify settings and count users" : "Ověřit nastavení a spočítat uživatele", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index bc3afcdf52b..7a60a8ec18e 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -96,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "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." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index e44f7d07957..9631cab94ac 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -94,6 +94,7 @@ "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "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." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index 61a26f9b7f9..8e617a1735b 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -96,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "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." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 59a108a66a7..5ed4af8ef3a 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -94,6 +94,7 @@ "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "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." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 77d08e6df12..44de36d6d81 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -96,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.", "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)", + "%s access is limited to users meeting these criteria:" : "%s access is limited to users meeting these criteria:", "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." : "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.", "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.", "Verify settings and count users" : "Verify settings and count users", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index 6cfeac642f6..04d6a199c6f 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -94,6 +94,7 @@ "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.", "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)", + "%s access is limited to users meeting these criteria:" : "%s access is limited to users meeting these criteria:", "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." : "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.", "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.", "Verify settings and count users" : "Verify settings and count users", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index 34a6edfa19c..bb1a3d824b0 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -96,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Probar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)", + "%s access is limited to users meeting these criteria:" : "Acceso limitado a %s a los usuarios que cumplan estos criterios:", "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." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.", "Verify settings and count users" : "Verificar configuración y contar usuarios", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index 7d3133ce391..9c1f5046254 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -94,6 +94,7 @@ "Test Base DN" : "Probar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)", + "%s access is limited to users meeting these criteria:" : "Acceso limitado a %s a los usuarios que cumplan estos criterios:", "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." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.", "Verify settings and count users" : "Verificar configuración y contar usuarios", diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index 5bd2b7b6911..2b0cecaab6a 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -13,6 +13,7 @@ OC.L10N.register( " Could not set configuration %s" : "Невозможно создать конфигурацию %s", "Action does not exist" : "Действия не существует", "The Base DN appears to be wrong" : "База поиска DN по всей видимости указана неправильно", + "Testing configuration…" : "Проверка конфигурации...", "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Configuration OK" : "Конфигурация в порядке", @@ -95,6 +96,7 @@ OC.L10N.register( "Test Base DN" : "Проверить базу поиска DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", + "%s access is limited to users meeting these criteria:" : "%s доступ ограничен для пользователей, отвечающих следующим критериям:", "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." : "Наиболее частые классы объектов для пользователей organizationalPerson, person, user и inetOrgPerson. Если вы не уверены какой класс объектов выбрать, пожалуйста обратитесь к администратору.", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "Verify settings and count users" : "Проверить настройки и пересчитать пользователей", diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index 8c9452eb259..fc9cc081787 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -11,6 +11,7 @@ " Could not set configuration %s" : "Невозможно создать конфигурацию %s", "Action does not exist" : "Действия не существует", "The Base DN appears to be wrong" : "База поиска DN по всей видимости указана неправильно", + "Testing configuration…" : "Проверка конфигурации...", "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Configuration OK" : "Конфигурация в порядке", @@ -93,6 +94,7 @@ "Test Base DN" : "Проверить базу поиска DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", + "%s access is limited to users meeting these criteria:" : "%s доступ ограничен для пользователей, отвечающих следующим критериям:", "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." : "Наиболее частые классы объектов для пользователей organizationalPerson, person, user и inetOrgPerson. Если вы не уверены какой класс объектов выбрать, пожалуйста обратитесь к администратору.", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "Verify settings and count users" : "Проверить настройки и пересчитать пользователей", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 83d91140ca5..752c578192f 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -20,19 +20,33 @@ OC.L10N.register( "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", + "Please specify the port, it could not be auto-detected." : "Določiti je treba ustrezna vrata, ker jih ni mogoče samodejno zaznati.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", + " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Prišlo je do napake. Preverite osnovno enoznačno ime, nastavitve povezave in poverila.", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Brezimne vezave niso dovoljene. Navedeno mora biti uporabniško enoznačno ime (DN) in geslo.", "LDAP Operations error. Anonymous bind might not be allowed." : "Napaka opravila LDAP: brezimne povezave morda niso dovoljene.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Shranjevanje je spodletelo. Prepričajte se, da je dostop do podatkovne zbirke omogočen. Pred nadaljevanjem je treba stran osvežiti.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Preklop načina omogoči samodejne poizvedbe LDAP. Glede na velikost je lahko opravilo dolgotrajno. Ali res želite preklopiti način?", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Uporabnika ni mogoče najti. Preverite atribute prijave in uporabniško ime. Učinkovit filter (za kopiranje overitve ukazne vrstice): <br/>", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Nastavitve so overjene, najden pa je le en uporabnik. Le prvi se bo lahko prijavil. Priporočljivo je navesti ožji filter.", + "An unspecified error occurred. Please check the settings and the log." : "Prišlo je do nedoločene napake. Preveriti je treba dnevnik in nastavitve.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Filter iskanja ni veljaven. Najverjetneje je to zaradi napake skladnje, kot je neustrezno ali neskladno uporabljen oklepaj. Preverite vpis.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Prišlo je do napake povezave z LDAP / AD. Preverite podatke o gostitelju, vratih in poverilih.", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.", + "Please provide a login name to test against" : "Vpisati je treba uporabniško ime za preizkus", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Skupina je onemogočena, ker na strežniku ni omogočena podpora atributu memberOf.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -54,9 +68,11 @@ OC.L10N.register( "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", + "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", + "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Test Loginname" : "Preizkusi prijavno ime", @@ -64,6 +80,8 @@ OC.L10N.register( "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Add a new and blank configuration" : "In nova, privzeta nastavitev", + "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", + "Delete the current configuration" : "Izbriši trenutne nastavitve", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", @@ -74,9 +92,12 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.", "One Base DN per line" : "Eno osnovno enolično ime na vrstico", "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", + "Detect Base DN" : "Zaznava osnovnega enoznačnega imena (DN)", + "Test Base DN" : "Preizkus osnovnega enoznačnega imena (DN)", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.", + "Verify settings and count users" : "Preveri nastavitve in preštej uporabnike", "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", @@ -100,6 +121,7 @@ OC.L10N.register( "Directory Settings" : "Nastavitve mape", "User Display Name Field" : "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.", + "2nd User Display Name Field" : "Polje 2. prikaznega imena uporabnika", "Base User Tree" : "Osnovno uporabniško drevo", "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico", "User Search Attributes" : "Uporabnikovi atributi iskanja", @@ -110,6 +132,7 @@ OC.L10N.register( "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico", "Group Search Attributes" : "Skupinski atributi iskanja", "Group-Member association" : "Povezava član-skupina", + "Dynamic Group Member URL" : "Naslov URL člana dinamična skupine", "Nested Groups" : "Gnezdene skupine", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).", "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index aea9919c054..8268aebb993 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -18,19 +18,33 @@ "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", + "Please specify the port, it could not be auto-detected." : "Določiti je treba ustrezna vrata, ker jih ni mogoče samodejno zaznati.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", + " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Prišlo je do napake. Preverite osnovno enoznačno ime, nastavitve povezave in poverila.", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Brezimne vezave niso dovoljene. Navedeno mora biti uporabniško enoznačno ime (DN) in geslo.", "LDAP Operations error. Anonymous bind might not be allowed." : "Napaka opravila LDAP: brezimne povezave morda niso dovoljene.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Shranjevanje je spodletelo. Prepričajte se, da je dostop do podatkovne zbirke omogočen. Pred nadaljevanjem je treba stran osvežiti.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Preklop načina omogoči samodejne poizvedbe LDAP. Glede na velikost je lahko opravilo dolgotrajno. Ali res želite preklopiti način?", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Uporabnika ni mogoče najti. Preverite atribute prijave in uporabniško ime. Učinkovit filter (za kopiranje overitve ukazne vrstice): <br/>", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Nastavitve so overjene, najden pa je le en uporabnik. Le prvi se bo lahko prijavil. Priporočljivo je navesti ožji filter.", + "An unspecified error occurred. Please check the settings and the log." : "Prišlo je do nedoločene napake. Preveriti je treba dnevnik in nastavitve.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Filter iskanja ni veljaven. Najverjetneje je to zaradi napake skladnje, kot je neustrezno ali neskladno uporabljen oklepaj. Preverite vpis.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Prišlo je do napake povezave z LDAP / AD. Preverite podatke o gostitelju, vratih in poverilih.", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.", + "Please provide a login name to test against" : "Vpisati je treba uporabniško ime za preizkus", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Skupina je onemogočena, ker na strežniku ni omogočena podpora atributu memberOf.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -52,9 +66,11 @@ "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", + "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", + "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Test Loginname" : "Preizkusi prijavno ime", @@ -62,6 +78,8 @@ "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Add a new and blank configuration" : "In nova, privzeta nastavitev", + "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", + "Delete the current configuration" : "Izbriši trenutne nastavitve", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", @@ -72,9 +90,12 @@ "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.", "One Base DN per line" : "Eno osnovno enolično ime na vrstico", "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", + "Detect Base DN" : "Zaznava osnovnega enoznačnega imena (DN)", + "Test Base DN" : "Preizkus osnovnega enoznačnega imena (DN)", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.", + "Verify settings and count users" : "Preveri nastavitve in preštej uporabnike", "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", @@ -98,6 +119,7 @@ "Directory Settings" : "Nastavitve mape", "User Display Name Field" : "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.", + "2nd User Display Name Field" : "Polje 2. prikaznega imena uporabnika", "Base User Tree" : "Osnovno uporabniško drevo", "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico", "User Search Attributes" : "Uporabnikovi atributi iskanja", @@ -108,6 +130,7 @@ "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico", "Group Search Attributes" : "Skupinski atributi iskanja", "Group-Member association" : "Povezava član-skupina", + "Dynamic Group Member URL" : "Naslov URL člana dinamična skupine", "Nested Groups" : "Gnezdene skupine", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).", "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik", diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 36044731377..59d40ca14e2 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -178,7 +178,6 @@ class LoginController extends Controller { } if ($loginResult === false) { $this->session->set('loginMessages', [ - [], ['invalidpassword'] ]); // Read current user and append if possible diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index afd4c88e87e..a3638a471f9 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -282,6 +282,7 @@ OC.L10N.register( "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", "An internal error occurred." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", + "Username or email" : "Uživatelské jméno nebo e-mail", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", "Wrong password." : "Chybné heslo.", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 488af23b646..4cab502d7c4 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -280,6 +280,7 @@ "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", "An internal error occurred." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", + "Username or email" : "Uživatelské jméno nebo e-mail", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", "Wrong password." : "Chybné heslo.", diff --git a/core/l10n/es.js b/core/l10n/es.js index 436814523da..cbfda7179c9 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Please select a file." : "Por favor, seleccione un archivo", "File is too big" : "El archivo es demasiado grande", - "Invalid file provided" : "Archivo inválido", + "Invalid file provided" : "Archivo no válido", "No image or file provided" : "No se especificó ningún archivo o imagen", "Unknown filetype" : "Tipo de archivo desconocido", "Invalid image" : "Imagen inválida", @@ -61,10 +61,10 @@ OC.L10N.register( "Sun." : "Dom.", "Mon." : "Lun.", "Tue." : "Mar.", - "Wed." : "Mier.", + "Wed." : "Mié.", "Thu." : "Jue.", "Fri." : "Vie.", - "Sat." : "Sab.", + "Sat." : "Sáb.", "Su" : "Do", "Mo" : "Lu", "Tu" : "Ma", @@ -283,7 +283,7 @@ OC.L10N.register( "An internal error occurred." : "Ha habido un error interno.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Username or email" : "Nombre de usuario o email", - "Log in" : "Ingresar", + "Log in" : "Iniciar sesión", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", "Wrong password." : "Contraseña incorrecta.", "Stay logged in" : "Permanecer autenticado", @@ -299,7 +299,7 @@ OC.L10N.register( "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.", "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." : "Contacte con su administrador. Si usted es el administrador, configure \"trusted_domains\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.", - "Add \"%s\" as trusted domain" : "Agregar \"%s\" como dominio de confianza", + "Add \"%s\" as trusted domain" : "Añadir \"%s\" como dominio de confianza", "App update required" : "Es necesaria una actualización en la aplicación", "%s will be updated to version %s" : "%s será actualizada a la versión %s", "These apps will be updated:" : "Estas aplicaciones serán actualizadas:", diff --git a/core/l10n/es.json b/core/l10n/es.json index 4bd24d5d544..a50b095f411 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -1,7 +1,7 @@ { "translations": { "Please select a file." : "Por favor, seleccione un archivo", "File is too big" : "El archivo es demasiado grande", - "Invalid file provided" : "Archivo inválido", + "Invalid file provided" : "Archivo no válido", "No image or file provided" : "No se especificó ningún archivo o imagen", "Unknown filetype" : "Tipo de archivo desconocido", "Invalid image" : "Imagen inválida", @@ -59,10 +59,10 @@ "Sun." : "Dom.", "Mon." : "Lun.", "Tue." : "Mar.", - "Wed." : "Mier.", + "Wed." : "Mié.", "Thu." : "Jue.", "Fri." : "Vie.", - "Sat." : "Sab.", + "Sat." : "Sáb.", "Su" : "Do", "Mo" : "Lu", "Tu" : "Ma", @@ -281,7 +281,7 @@ "An internal error occurred." : "Ha habido un error interno.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Username or email" : "Nombre de usuario o email", - "Log in" : "Ingresar", + "Log in" : "Iniciar sesión", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", "Wrong password." : "Contraseña incorrecta.", "Stay logged in" : "Permanecer autenticado", @@ -297,7 +297,7 @@ "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.", "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." : "Contacte con su administrador. Si usted es el administrador, configure \"trusted_domains\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.", - "Add \"%s\" as trusted domain" : "Agregar \"%s\" como dominio de confianza", + "Add \"%s\" as trusted domain" : "Añadir \"%s\" como dominio de confianza", "App update required" : "Es necesaria una actualización en la aplicación", "%s will be updated to version %s" : "%s será actualizada a la versión %s", "These apps will be updated:" : "Estas aplicaciones serán actualizadas:", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index bb9aa702bf3..a838ef07c07 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -282,6 +282,7 @@ OC.L10N.register( "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", "An internal error occurred." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérjük, próbálja meg újra, vagy vegye fel a kapcsolatot a rendszergazdával.", + "Username or email" : "Felhasználói név vagy e-mail cím", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "Wrong password." : "Hibás jelszó.", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index 4e8ab825bd2..40c18689e4a 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -280,6 +280,7 @@ "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", "An internal error occurred." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérjük, próbálja meg újra, vagy vegye fel a kapcsolatot a rendszergazdával.", + "Username or email" : "Felhasználói név vagy e-mail cím", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "Wrong password." : "Hibás jelszó.", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index fd81ae62fc3..ae7c85e1934 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -98,9 +98,9 @@ OC.L10N.register( "Dec." : "Дек.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...", "Settings" : "Настройки", - "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повтор через 5 секунд", + "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повторная попытка через 5 секунд", "Saving..." : "Сохранение...", - "Dismiss" : "Прекратить", + "Dismiss" : "Закрыть", "seconds ago" : "несколько секунд назад", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если его там нет, то обратитесь к вашему администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?", @@ -133,10 +133,15 @@ OC.L10N.register( "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ваш веб-сервер настроен не корректно для разрешения \"{url}\". Дополнительная информация может быть найдена в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>.", "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." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.", "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробная информация в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не может быть прочитан из PHP, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP не имеет доступа на чтение к /dev/urandom, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Вы используете PHP {version}. Рекомендуется обновить версию PHP, чтобы воспользоваться <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">улучшениями производительности и безопасности, внедрёнными PHP Group</a> как только новая версия будет доступна в Вашем дистрибутиве. ", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к ownCloud осуществлён через доверенный прокси. Если ownCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит ownCloud. Дополнительная информация доступна в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached настроен на распределенный кеш, но установлен не поддерживаемый модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только модуль \"memcached\", но не \"memcache\". Больше информации на <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki странице memcached о обоих модулях</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Дополнительная информация о том, как устранить данную проблему доступна в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)", "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера", "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." : "Ваш каталог данных и ваши файлы возможно доступны из Интернета. Файл .htaccess не работает. Мы настоятельно рекомендуем Вам настроить веб сервер таким образом, чтобы каталог данных не был больше доступен или переместить каталог данных за пределы корня веб сервера.", "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}\" не настроен на значение \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен как минимум на \"{seconds}\" секунд. Для улучшения безопасности рекомендуется включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "Shared" : "Общий доступ", "Shared with {recipients}" : "Вы поделились с {recipients}", @@ -159,7 +164,7 @@ OC.L10N.register( "Send" : "Отправить", "Sending ..." : "Отправляется ...", "Email sent" : "Письмо отправлено", - "Send link via email" : "Отправить ссылку по email", + "Send link via email" : "Отправить ссылку по электронной почте", "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ", "Shared with you by {owner}" : "С вами поделился {owner} ", "group" : "группа", @@ -172,7 +177,7 @@ OC.L10N.register( "change" : "изменить", "delete" : "удалить", "access control" : "контроль доступа", - "Could not unshare" : "Не удается отменить доступ", + "Could not unshare" : "Не удалось отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", "No users found for {search}" : "Не найдено пользователей по запросу {search}", @@ -213,8 +218,8 @@ OC.L10N.register( "Updating to {version}" : "Обновляем до {version}", "An error occurred." : "Произошла ошибка.", "Please reload the page." : "Пожалуйста, обновите страницу.", - "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. За дополнительной информацией по этой проблеме <a href=\"{url}\">обратитесь к нашему форуму</a>.", - "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. Больше информации о данной проблеме можно найти <a href=\"{url}\">в сообщении на нащем форуме</a>.", + "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "При обновлении произошла ошибка. Пожалуйста сообщите об этом <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">сообществу ownCloud</a>.", "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.", "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.", "Searching other places" : "Идет поиск в других местах", @@ -247,6 +252,7 @@ OC.L10N.register( "Trace" : "Трассировка", "Security warning" : "Предупреждение безопасности", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Информацию о правильной настройке сервера можно найти в <a hrev=\"%s\"target=\"blank\">документации</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", "Username" : "Имя пользователя", "Storage & database" : "Хранилище и база данных", @@ -276,6 +282,7 @@ OC.L10N.register( "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", "An internal error occurred." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", + "Username or email" : "Имя пользователя или Email", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", "Wrong password." : "Неправильный пароль.", @@ -303,6 +310,7 @@ OC.L10N.register( "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:", "Detailed logs" : "Подбробные логи", "Update needed" : "Требуется обновление", + "Please use the command line updater because you have a big instance." : "Пожалуйста, используйте обновление через командную строку, так как данная установка имеет большой размер.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Для помощи, ознакомьтесь с <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацией</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Этот сервер %s находится в режиме технического обслуживания, которое может занять некоторое время.", "This page will refresh itself when the %s instance is available again." : "Эта страница автоматически обновится, когда сервер %s снова станет доступен." diff --git a/core/l10n/ru.json b/core/l10n/ru.json index 062231026d2..1ff9b934478 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -96,9 +96,9 @@ "Dec." : "Дек.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...", "Settings" : "Настройки", - "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повтор через 5 секунд", + "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повторная попытка через 5 секунд", "Saving..." : "Сохранение...", - "Dismiss" : "Прекратить", + "Dismiss" : "Закрыть", "seconds ago" : "несколько секунд назад", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если его там нет, то обратитесь к вашему администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?", @@ -131,10 +131,15 @@ "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ваш веб-сервер настроен не корректно для разрешения \"{url}\". Дополнительная информация может быть найдена в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>.", "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." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.", "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробная информация в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не может быть прочитан из PHP, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP не имеет доступа на чтение к /dev/urandom, что крайне нежелательно по соображениям безопасности. Дополнительную информацию можно найти в нашей <a target=\"_blank\" href=\"{docLink}\"> документации </a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Вы используете PHP {version}. Рекомендуется обновить версию PHP, чтобы воспользоваться <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">улучшениями производительности и безопасности, внедрёнными PHP Group</a> как только новая версия будет доступна в Вашем дистрибутиве. ", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к ownCloud осуществлён через доверенный прокси. Если ownCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит ownCloud. Дополнительная информация доступна в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached настроен на распределенный кеш, но установлен не поддерживаемый модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только модуль \"memcached\", но не \"memcache\". Больше информации на <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki странице memcached о обоих модулях</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Дополнительная информация о том, как устранить данную проблему доступна в нашей <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)", "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера", "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." : "Ваш каталог данных и ваши файлы возможно доступны из Интернета. Файл .htaccess не работает. Мы настоятельно рекомендуем Вам настроить веб сервер таким образом, чтобы каталог данных не был больше доступен или переместить каталог данных за пределы корня веб сервера.", "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}\" не настроен на значение \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен как минимум на \"{seconds}\" секунд. Для улучшения безопасности рекомендуется включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.", "Shared" : "Общий доступ", "Shared with {recipients}" : "Вы поделились с {recipients}", @@ -157,7 +162,7 @@ "Send" : "Отправить", "Sending ..." : "Отправляется ...", "Email sent" : "Письмо отправлено", - "Send link via email" : "Отправить ссылку по email", + "Send link via email" : "Отправить ссылку по электронной почте", "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ", "Shared with you by {owner}" : "С вами поделился {owner} ", "group" : "группа", @@ -170,7 +175,7 @@ "change" : "изменить", "delete" : "удалить", "access control" : "контроль доступа", - "Could not unshare" : "Не удается отменить доступ", + "Could not unshare" : "Не удалось отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", "No users found for {search}" : "Не найдено пользователей по запросу {search}", @@ -211,8 +216,8 @@ "Updating to {version}" : "Обновляем до {version}", "An error occurred." : "Произошла ошибка.", "Please reload the page." : "Пожалуйста, обновите страницу.", - "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. За дополнительной информацией по этой проблеме <a href=\"{url}\">обратитесь к нашему форуму</a>.", - "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. Больше информации о данной проблеме можно найти <a href=\"{url}\">в сообщении на нащем форуме</a>.", + "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "При обновлении произошла ошибка. Пожалуйста сообщите об этом <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">сообществу ownCloud</a>.", "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.", "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.", "Searching other places" : "Идет поиск в других местах", @@ -245,6 +250,7 @@ "Trace" : "Трассировка", "Security warning" : "Предупреждение безопасности", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Информацию о правильной настройке сервера можно найти в <a hrev=\"%s\"target=\"blank\">документации</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", "Username" : "Имя пользователя", "Storage & database" : "Хранилище и база данных", @@ -274,6 +280,7 @@ "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", "An internal error occurred." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", + "Username or email" : "Имя пользователя или Email", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", "Wrong password." : "Неправильный пароль.", @@ -301,6 +308,7 @@ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:", "Detailed logs" : "Подбробные логи", "Update needed" : "Требуется обновление", + "Please use the command line updater because you have a big instance." : "Пожалуйста, используйте обновление через командную строку, так как данная установка имеет большой размер.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Для помощи, ознакомьтесь с <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацией</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Этот сервер %s находится в режиме технического обслуживания, которое может занять некоторое время.", "This page will refresh itself when the %s instance is available again." : "Эта страница автоматически обновится, когда сервер %s снова станет доступен." diff --git a/core/l10n/sl.js b/core/l10n/sl.js index 1f28423ac22..a5628c91bf0 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -132,9 +132,14 @@ OC.L10N.register( "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je vmesnik WebDAV videti okvarjen.", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Spletni strežnik ni ustrezno nastavljen za razreševanje \"{url}\". Več pdorobnosti je zapisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", "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." : "Strežnik je brez vzpostavljene internetne povezave. To pomeni, da priklapljanje zunanjih diskov, opozorila za posodobitve in namestitve programske opreme iz drugih virov, niso mogoče. Za popolno delovanje OwnCloud je nujna delujoča internetna povezava.", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ni nastavljenega predpomnilnika. Za izboljšanje hitrosti delovanja je treba predpomnilnik memcache, če je na voljo, ustrezno nastaviti. Več podrobnosti je na voljo v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Iz varnostnih razlogov je priporočljivo nastaviti dovoljenja ukaza /dev/urandom za branje prek PHP. Več podrobnosti je zavedenih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno je zagnana različica PHP {version}. Priporočljivo je posodobiti sistem na najnovejšo različico in s tem namestiti <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">funkcijske in varnostne posodobitve delovanja, ki jih zagotavlja skupnost PHP</a>. Pakete je priporočljivo posodobiti takoj, ko so na voljo za nameščeno distribucijo.", + "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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Predpomnilnik memcached je nastavljen kot porazdeljen predpomnilnik, vendar pa je nameščen napačen modul PHP \"memcache\". Modul \\OC\\Memcache\\Memcached podpirao le \"memcached\", ne pa tudi \"memcache\". Več podrobnosti za oba modula je zapisanih <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">na wiki straneh</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Nekatere datoteke ne opravijo preizkusa celovitosti. Več podrobnosti o težavi je opisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neveljavnih datotek …</a> / <a href=\"{rescanEndpoint}\">Ponovni preizkus …</a>)", "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika", + "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." : "Podatkovna mapa in datoteke so najverjetneje dostopni prek Interneta, ker datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da dostop prek zunanjega omrežja ni mogoč, ali pa tako, da podatkovna mapa ni znotraj korenske mape strežnika.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Do spletišča je omogočen dostop prek protokola HTTP. Priporočljivo je omogočiti podporo za varni protokol HTTPS. Več podrobnosti je zapisanih med <a href=\"{docUrl}\">varnostnimi namigi</a>.", "Shared" : "V souporabi", "Shared with {recipients}" : "V souporabi z {recipients}", "Error" : "Napaka", @@ -227,7 +232,7 @@ OC.L10N.register( "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Internal Server Error" : "Notranja napaka strežnika", "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index 1033ae73997..022027d6156 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -130,9 +130,14 @@ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je vmesnik WebDAV videti okvarjen.", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Spletni strežnik ni ustrezno nastavljen za razreševanje \"{url}\". Več pdorobnosti je zapisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", "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." : "Strežnik je brez vzpostavljene internetne povezave. To pomeni, da priklapljanje zunanjih diskov, opozorila za posodobitve in namestitve programske opreme iz drugih virov, niso mogoče. Za popolno delovanje OwnCloud je nujna delujoča internetna povezava.", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ni nastavljenega predpomnilnika. Za izboljšanje hitrosti delovanja je treba predpomnilnik memcache, če je na voljo, ustrezno nastaviti. Več podrobnosti je na voljo v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Iz varnostnih razlogov je priporočljivo nastaviti dovoljenja ukaza /dev/urandom za branje prek PHP. Več podrobnosti je zavedenih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno je zagnana različica PHP {version}. Priporočljivo je posodobiti sistem na najnovejšo različico in s tem namestiti <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">funkcijske in varnostne posodobitve delovanja, ki jih zagotavlja skupnost PHP</a>. Pakete je priporočljivo posodobiti takoj, ko so na voljo za nameščeno distribucijo.", + "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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Predpomnilnik memcached je nastavljen kot porazdeljen predpomnilnik, vendar pa je nameščen napačen modul PHP \"memcache\". Modul \\OC\\Memcache\\Memcached podpirao le \"memcached\", ne pa tudi \"memcache\". Več podrobnosti za oba modula je zapisanih <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">na wiki straneh</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Nekatere datoteke ne opravijo preizkusa celovitosti. Več podrobnosti o težavi je opisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neveljavnih datotek …</a> / <a href=\"{rescanEndpoint}\">Ponovni preizkus …</a>)", "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika", + "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." : "Podatkovna mapa in datoteke so najverjetneje dostopni prek Interneta, ker datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da dostop prek zunanjega omrežja ni mogoč, ali pa tako, da podatkovna mapa ni znotraj korenske mape strežnika.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Do spletišča je omogočen dostop prek protokola HTTP. Priporočljivo je omogočiti podporo za varni protokol HTTPS. Več podrobnosti je zapisanih med <a href=\"{docUrl}\">varnostnimi namigi</a>.", "Shared" : "V souporabi", "Shared with {recipients}" : "V souporabi z {recipients}", "Error" : "Napaka", @@ -225,7 +230,7 @@ "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Internal Server Error" : "Notranja napaka strežnika", "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 886bf289d4c..841593a8e86 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -30,6 +30,7 @@ OC.L10N.register( "[%d / %d]: %s" : "[%d / %d]: %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", + "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用，请使用命令行更新。", "[%d / %d]: Checking table %s" : "[%d / %d]: 检查数据表 %s", "Turned on maintenance mode" : "启用维护模式", "Turned off maintenance mode" : "关闭维护模式", @@ -97,6 +98,7 @@ OC.L10N.register( "Dec." : "十二月", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>", "Settings" : "设置", + "Problem loading page, reloading in 5 seconds" : "加载页面出现问题，在 5 秒内重新载入", "Saving..." : "保存中...", "Dismiss" : "忽略", "seconds ago" : "几秒前", @@ -130,9 +132,16 @@ OC.L10N.register( "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的web服务器未正确设置以解析 \"{url}\"。您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息。", "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." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，出于安全原因，这是强烈不推荐的。请查看<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>了解详情。", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "你的 PHP 版本 ({version}) 不再被 <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 配置为分布式缓存，但是已经安装的 PHP 模块是 \"memcache\" 。 \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\"。点击 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> memcached wiki 了解两个模块的不同</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查。如何解决此问题的详细信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)", "Error occurred while checking server setup" : "当检查服务器启动时出错", "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." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。", "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." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</a>启用 HSTS。", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点，我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>配置服务器强制使用 HTTPS。", "Shared" : "已共享", "Shared with {recipients}" : "由{recipients}分享", @@ -155,6 +164,7 @@ OC.L10N.register( "Send" : "发送", "Sending ..." : "正在发送...", "Email sent" : "邮件已发送", + "Send link via email" : "通过邮件发送链接", "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组", "Shared with you by {owner}" : "{owner} 与您共享", "group" : "群组", @@ -272,6 +282,7 @@ OC.L10N.register( "Please contact your administrator." : "请联系你的管理员。", "An internal error occurred." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", + "Username or email" : "用户名或邮箱", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", "Wrong password." : "密码错误", @@ -298,6 +309,9 @@ OC.L10N.register( "Start update" : "开始更新", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为进行避免较大的安装时超时，你可以在你的安装目录下运行下面的命令：", "Detailed logs" : "详细日志", + "Update needed" : "需要更新", + "Please use the command line updater because you have a big instance." : "请使用命令行更新。", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助，请查看 <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "该 %s 实例当前处于维护模式，这将进行一些时间。", "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。" }, diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index bfb4664516a..9474967a4ce 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -28,6 +28,7 @@ "[%d / %d]: %s" : "[%d / %d]: %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", + "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用，请使用命令行更新。", "[%d / %d]: Checking table %s" : "[%d / %d]: 检查数据表 %s", "Turned on maintenance mode" : "启用维护模式", "Turned off maintenance mode" : "关闭维护模式", @@ -95,6 +96,7 @@ "Dec." : "十二月", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>", "Settings" : "设置", + "Problem loading page, reloading in 5 seconds" : "加载页面出现问题，在 5 秒内重新载入", "Saving..." : "保存中...", "Dismiss" : "忽略", "seconds ago" : "几秒前", @@ -128,9 +130,16 @@ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的web服务器未正确设置以解析 \"{url}\"。您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息。", "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." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.", + "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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，出于安全原因，这是强烈不推荐的。请查看<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>了解详情。", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "你的 PHP 版本 ({version}) 不再被 <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 配置为分布式缓存，但是已经安装的 PHP 模块是 \"memcache\" 。 \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\"。点击 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> memcached wiki 了解两个模块的不同</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查。如何解决此问题的详细信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)", "Error occurred while checking server setup" : "当检查服务器启动时出错", "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." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。", "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." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</a>启用 HSTS。", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点，我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>配置服务器强制使用 HTTPS。", "Shared" : "已共享", "Shared with {recipients}" : "由{recipients}分享", @@ -153,6 +162,7 @@ "Send" : "发送", "Sending ..." : "正在发送...", "Email sent" : "邮件已发送", + "Send link via email" : "通过邮件发送链接", "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组", "Shared with you by {owner}" : "{owner} 与您共享", "group" : "群组", @@ -270,6 +280,7 @@ "Please contact your administrator." : "请联系你的管理员。", "An internal error occurred." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", + "Username or email" : "用户名或邮箱", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", "Wrong password." : "密码错误", @@ -296,6 +307,9 @@ "Start update" : "开始更新", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为进行避免较大的安装时超时，你可以在你的安装目录下运行下面的命令：", "Detailed logs" : "详细日志", + "Update needed" : "需要更新", + "Please use the command line updater because you have a big instance." : "请使用命令行更新。", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助，请查看 <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "该 %s 实例当前处于维护模式，这将进行一些时间。", "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/db_structure.xml b/db_structure.xml index 7b4a3b53294..6e57b003fcf 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -1065,10 +1065,9 @@ <field> <name>name</name> - <type>text</type> + <type>clob</type> <default></default> <notnull>true</notnull> - <length>100</length> </field> <field> diff --git a/lib/autoloader.php b/lib/autoloader.php index 6a427848235..9cc573c0997 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -102,24 +102,6 @@ class Autoloader { } } elseif (strpos($class, 'OC_') === 0) { $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); - $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); - } elseif (strpos($class, 'OC\\') === 0) { - $split = explode('\\', $class, 3); - - if (count($split) === 3) { - $split[1] = strtolower($split[1]); - - if ($split[1] === 'core') { - // Covered by PSR-4 autoloader - } else if ($split[1] === 'settings') { - // Covered by PSR-4 autoloader - } else { - $paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; - } - - } else { - $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php'; - } } elseif (strpos($class, 'OCP\\') === 0) { $paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php'); } elseif (strpos($class, 'OCA\\') === 0) { diff --git a/lib/base.php b/lib/base.php index 25ebe8b2f48..1fdcf44f4d0 100644 --- a/lib/base.php +++ b/lib/base.php @@ -438,7 +438,7 @@ class OC { if (isset($_COOKIE[session_name()])) { setcookie(session_name(), null, -1, self::$WEBROOT ? : '/'); } - $session->clear(); + \OC::$server->getUserSession()->logout(); } $session->set('LAST_ACTIVITY', time()); @@ -620,7 +620,7 @@ class OC { } OC_User::useBackend(new \OC\User\Database()); - OC_Group::useBackend(new OC_Group_Database()); + OC_Group::useBackend(new \OC\Group\Database()); // Subscribe to the hook \OCP\Util::connectHook( diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js index 373b20f61bc..9614eeef125 100644 --- a/lib/l10n/cs_CZ.js +++ b/lib/l10n/cs_CZ.js @@ -113,6 +113,8 @@ OC.L10N.register( "Username contains whitespace at the beginning or at the end" : "Uživatelské jméno obsahuje mezery na svém začátku nebo konci", "A valid password must be provided" : "Musíte zadat platné heslo", "The username is already being used" : "Uživatelské jméno je již využíváno", + "Login canceled by app" : "Přihlášení zrušeno aplikací", + "User disabled" : "Uživatel zakázán", "Help" : "Nápověda", "Personal" : "Osobní", "Users" : "Uživatelé", diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json index 864b32086d5..50eb92efea6 100644 --- a/lib/l10n/cs_CZ.json +++ b/lib/l10n/cs_CZ.json @@ -111,6 +111,8 @@ "Username contains whitespace at the beginning or at the end" : "Uživatelské jméno obsahuje mezery na svém začátku nebo konci", "A valid password must be provided" : "Musíte zadat platné heslo", "The username is already being used" : "Uživatelské jméno je již využíváno", + "Login canceled by app" : "Přihlášení zrušeno aplikací", + "User disabled" : "Uživatel zakázán", "Help" : "Nápověda", "Personal" : "Osobní", "Users" : "Uživatelé", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index 9c4d280fbb9..9e108b52ec7 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -98,7 +98,7 @@ OC.L10N.register( "Sharing backend for %s not found" : "Motor compartido para %s no encontrado", "Sharing failed, because the user %s is the original sharer" : "Se ha fallado al compartir, ya que el usuario %s es el compartidor original", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Se ha fallado al compartir %s, ya que los permisos superan los permisos otorgados a %s", - "Sharing %s failed, because resharing is not allowed" : "Se ha fallado al compartir %s, ya que volver a compartir no está permitido", + "Sharing %s failed, because resharing is not allowed" : "Fallo al compartir %s, ya que no está permitido volverlo a compartir", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Se ha fallado al compartir %s porque el motor compartido para %s podría no encontrar su origen", "Sharing %s failed, because the file could not be found in the file cache" : "Se ha fallado al compartir %s, ya que el archivo no pudo ser encontrado en el cache de archivo", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index c5a14b77e0f..36f8a63c317 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -96,7 +96,7 @@ "Sharing backend for %s not found" : "Motor compartido para %s no encontrado", "Sharing failed, because the user %s is the original sharer" : "Se ha fallado al compartir, ya que el usuario %s es el compartidor original", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Se ha fallado al compartir %s, ya que los permisos superan los permisos otorgados a %s", - "Sharing %s failed, because resharing is not allowed" : "Se ha fallado al compartir %s, ya que volver a compartir no está permitido", + "Sharing %s failed, because resharing is not allowed" : "Fallo al compartir %s, ya que no está permitido volverlo a compartir", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Se ha fallado al compartir %s porque el motor compartido para %s podría no encontrar su origen", "Sharing %s failed, because the file could not be found in the file cache" : "Se ha fallado al compartir %s, ya que el archivo no pudo ser encontrado en el cache de archivo", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js index a26078f965e..aecd4475d52 100644 --- a/lib/l10n/ro.js +++ b/lib/l10n/ro.js @@ -2,10 +2,16 @@ OC.L10N.register( "lib", { "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!", - "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului", + "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurare al serverului Web", "See %s" : "Vezi %s", + "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aceasta se poate repara de obicei de %s prin acordarea accesului de scriere către serverul Web pentru directorul de configurare %s. ", + "Sample configuration detected" : "A fost detectată o configurație exemplu", + "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S-a detectat copierea configurației exemplu. Acest lucru poate duce la oprirea instanței tale și nu este suportat. Te rugăm să citești documentația înainte de a face modificări în fișierul config.php", "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.", "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s", + "Following databases are supported: %s" : "Următoarele baze de date sunt suportate: %s", + "The command line tool %s could not be found" : "Unealta în linie de comandă %s nu a fost găsită", + "The library %s is not available." : "Biblioteca %s nu este disponibilă.", "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s", "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.", "Unknown filetype" : "Tip fișier necunoscut", diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json index b659c19d399..e7feb458ef3 100644 --- a/lib/l10n/ro.json +++ b/lib/l10n/ro.json @@ -1,9 +1,15 @@ { "translations": { "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!", - "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului", + "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurare al serverului Web", "See %s" : "Vezi %s", + "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aceasta se poate repara de obicei de %s prin acordarea accesului de scriere către serverul Web pentru directorul de configurare %s. ", + "Sample configuration detected" : "A fost detectată o configurație exemplu", + "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S-a detectat copierea configurației exemplu. Acest lucru poate duce la oprirea instanței tale și nu este suportat. Te rugăm să citești documentația înainte de a face modificări în fișierul config.php", "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.", "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s", + "Following databases are supported: %s" : "Următoarele baze de date sunt suportate: %s", + "The command line tool %s could not be found" : "Unealta în linie de comandă %s nu a fost găsită", + "The library %s is not available." : "Biblioteca %s nu este disponibilă.", "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s", "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.", "Unknown filetype" : "Tip fișier necunoscut", diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index a7be9b2f4e9..337d3b28641 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -9,6 +9,7 @@ OC.L10N.register( "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php", "PHP %s or higher is required." : "Требуется PHP %s или выше", "PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.", + "%sbit or higher PHP required." : "%sbit или требуется новая версия PHP.", "Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s", "The command line tool %s could not be found" : "Утилита командной строки %s не найдена", "The library %s is not available." : "Библиотека %s недоступна.", @@ -45,6 +46,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Архивы %s не поддерживаются", "Failed to open archive when installing app" : "Ошибка открытия архива при установке приложения", "App does not provide an info.xml file" : "Приложение не имеет файла info.xml", + "App cannot be installed because appinfo file cannot be read." : "Приложение не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Подпись не может быть проверена. Пожалуйста, свяжитесь с разработчиком приложения и проверьте свою страницу администратора.", "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.", "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", @@ -100,6 +102,8 @@ OC.L10N.register( "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s", "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.", "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s", + "Files can't be shared with delete permissions" : "Файлы не могут иметь общий доступ с правами на удаление", + "Files can't be shared with create permissions" : "Файлы не могут иметь общий доступ с правами на создание", "Expiration date is in the past" : "Дата окончания срока действия уже прошла", "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней", "Could not find category \"%s\"" : "Категория \"%s\" не найдена", @@ -109,11 +113,14 @@ OC.L10N.register( "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце", "A valid password must be provided" : "Укажите правильный пароль", "The username is already being used" : "Имя пользователя уже используется", + "Login canceled by app" : "Вход отменен приложением", + "User disabled" : "Пользователь отключен", "Help" : "Помощь", "Personal" : "Личное", "Users" : "Пользователи", "Admin" : "Администрирование", "Recommended" : "Рекомендовано", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложение \"%s\" не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Приложение \"%s\" не может быть установлено, так как оно не совместимо с этой версией ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложение \"%s\" не может быть установлено, так как следующие зависимости не выполнены: %s", "No app name specified" : "Не указано имя приложения", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 1d5683b3a50..1cf5687aab4 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -7,6 +7,7 @@ "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php", "PHP %s or higher is required." : "Требуется PHP %s или выше", "PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.", + "%sbit or higher PHP required." : "%sbit или требуется новая версия PHP.", "Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s", "The command line tool %s could not be found" : "Утилита командной строки %s не найдена", "The library %s is not available." : "Библиотека %s недоступна.", @@ -43,6 +44,7 @@ "Archives of type %s are not supported" : "Архивы %s не поддерживаются", "Failed to open archive when installing app" : "Ошибка открытия архива при установке приложения", "App does not provide an info.xml file" : "Приложение не имеет файла info.xml", + "App cannot be installed because appinfo file cannot be read." : "Приложение не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Подпись не может быть проверена. Пожалуйста, свяжитесь с разработчиком приложения и проверьте свою страницу администратора.", "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.", "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", @@ -98,6 +100,8 @@ "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s", "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.", "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s", + "Files can't be shared with delete permissions" : "Файлы не могут иметь общий доступ с правами на удаление", + "Files can't be shared with create permissions" : "Файлы не могут иметь общий доступ с правами на создание", "Expiration date is in the past" : "Дата окончания срока действия уже прошла", "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней", "Could not find category \"%s\"" : "Категория \"%s\" не найдена", @@ -107,11 +111,14 @@ "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце", "A valid password must be provided" : "Укажите правильный пароль", "The username is already being used" : "Имя пользователя уже используется", + "Login canceled by app" : "Вход отменен приложением", + "User disabled" : "Пользователь отключен", "Help" : "Помощь", "Personal" : "Личное", "Users" : "Пользователи", "Admin" : "Администрирование", "Recommended" : "Рекомендовано", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложение \"%s\" не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Приложение \"%s\" не может быть установлено, так как оно не совместимо с этой версией ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложение \"%s\" не может быть установлено, так как следующие зависимости не выполнены: %s", "No app name specified" : "Не указано имя приложения", diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index 6e89cb7024a..cad4334f3d4 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -30,6 +30,7 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["pred %n uro","pred %n urama","pred %n urami","pred %n urami"], "_%n minute ago_::_%n minutes ago_" : ["pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"], "seconds ago" : "pred nekaj sekundami", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z id: %s ne obstaja. Omogočite ga, ali pa stopite v stik s skrbnikom sistema.", "Empty filename is not allowed" : "Prazno polje imena datoteke ni dovoljeno.", "Dot files are not allowed" : "Skrite datoteke niso dovoljene", "4-byte characters are not supported in file names" : "4-bitni znaki v imenih datotek niso podprti", @@ -45,9 +46,12 @@ OC.L10N.register( "Archives of type %s are not supported" : "Arhivi vrste %s niso podprti", "Failed to open archive when installing app" : "Odpiranje arhiva je med nameščanjem spodletelo", "App does not provide an info.xml file" : "Program je brez datoteke info.xml", + "App cannot be installed because appinfo file cannot be read." : "Programa ni mogoče namestiti, ker ni mogoče brati datoteke appinfo.", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Podpisa ni mogoče preveriti. Stopite v stik z razvijalci programa in preverite skrbniški dnevnik.", "App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.", "App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.", "%s enter the database username." : "%s - vnos uporabniškega imena podatkovne zbirke.", "%s enter the database name." : "%s - vnos imena podatkovne zbirke.", "%s you may not use dots in the database name" : "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.", @@ -60,6 +64,7 @@ OC.L10N.register( "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s v tem okolju ne bo deloval zanesljivo. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Odstraniti je treba nastavitev open_basedir v datoteki php.ini ali pa preklopiti na 64-bitno okolje PHP.", "Set an admin username." : "Nastavi uporabniško ime skrbnika.", "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", @@ -83,6 +88,7 @@ OC.L10N.register( "Setting permissions for %s failed, because the item was not found" : "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.", "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.", "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.", + "Cannot clear expiration date. Shares are required to have an expiration date." : "Ni mogoče počistiti datuma preteka. Mape ali datoteke morajo imeti dodeljen ta parameter.", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend", "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti", "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index f6ca8ffd43d..ea68052fa0d 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -28,6 +28,7 @@ "_%n hour ago_::_%n hours ago_" : ["pred %n uro","pred %n urama","pred %n urami","pred %n urami"], "_%n minute ago_::_%n minutes ago_" : ["pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"], "seconds ago" : "pred nekaj sekundami", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z id: %s ne obstaja. Omogočite ga, ali pa stopite v stik s skrbnikom sistema.", "Empty filename is not allowed" : "Prazno polje imena datoteke ni dovoljeno.", "Dot files are not allowed" : "Skrite datoteke niso dovoljene", "4-byte characters are not supported in file names" : "4-bitni znaki v imenih datotek niso podprti", @@ -43,9 +44,12 @@ "Archives of type %s are not supported" : "Arhivi vrste %s niso podprti", "Failed to open archive when installing app" : "Odpiranje arhiva je med nameščanjem spodletelo", "App does not provide an info.xml file" : "Program je brez datoteke info.xml", + "App cannot be installed because appinfo file cannot be read." : "Programa ni mogoče namestiti, ker ni mogoče brati datoteke appinfo.", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Podpisa ni mogoče preveriti. Stopite v stik z razvijalci programa in preverite skrbniški dnevnik.", "App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.", "App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.", "%s enter the database username." : "%s - vnos uporabniškega imena podatkovne zbirke.", "%s enter the database name." : "%s - vnos imena podatkovne zbirke.", "%s you may not use dots in the database name" : "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.", @@ -58,6 +62,7 @@ "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s v tem okolju ne bo deloval zanesljivo. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Odstraniti je treba nastavitev open_basedir v datoteki php.ini ali pa preklopiti na 64-bitno okolje PHP.", "Set an admin username." : "Nastavi uporabniško ime skrbnika.", "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", @@ -81,6 +86,7 @@ "Setting permissions for %s failed, because the item was not found" : "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.", "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.", "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.", + "Cannot clear expiration date. Shares are required to have an expiration date." : "Ni mogoče počistiti datuma preteka. Mape ali datoteke morajo imeti dodeljen ta parameter.", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend", "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti", "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index 49e3b3a2f41..8951d48b5c3 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -80,6 +80,7 @@ OC.L10N.register( "Recommended" : "推荐", "No app name specified" : "没有指定的 App 名称", "web services under your control" : "您控制的网络服务", + "File is currently busy, please try again later" : "文件当前正忙，请稍后再试", "Can't read file" : "无法读取文件", "Application is not enabled" : "应用程序未启用", "Authentication error" : "认证出错", diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json index 970e883acfe..c502c21ad8a 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -78,6 +78,7 @@ "Recommended" : "推荐", "No app name specified" : "没有指定的 App 名称", "web services under your control" : "您控制的网络服务", + "File is currently busy, please try again later" : "文件当前正忙，请稍后再试", "Can't read file" : "无法读取文件", "Application is not enabled" : "应用程序未启用", "Authentication error" : "认证出错", diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 2951ee536d2..439b631b50f 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -148,6 +148,10 @@ class DIContainer extends SimpleContainer implements IAppContainer { return $this->getServer()->getRootFolder(); }); + $this->registerService('OCP\\Http\\Client\\IClientService', function($c) { + return $this->getServer()->getHTTPClientService(); + }); + $this->registerService('OCP\\IGroupManager', function($c) { return $this->getServer()->getGroupManager(); }); diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php index a6641277cf9..deca5b409e8 100644 --- a/lib/private/Authentication/Token/DefaultTokenProvider.php +++ b/lib/private/Authentication/Token/DefaultTokenProvider.php @@ -148,13 +148,11 @@ class DefaultTokenProvider implements IProvider { * @return DefaultToken user UID */ public function validateToken($token) { - $this->logger->debug('validating default token <' . $token . '>'); try { $dbToken = $this->mapper->getToken($this->hashToken($token)); - $this->logger->debug('valid token for ' . $dbToken->getUID()); + $this->logger->debug('valid default token for ' . $dbToken->getUID()); return $dbToken; } catch (DoesNotExistException $ex) { - $this->logger->warning('invalid token'); throw new InvalidTokenException(); } } diff --git a/lib/private/Group/Backend.php b/lib/private/Group/Backend.php new file mode 100644 index 00000000000..6dd5bdc3507 --- /dev/null +++ b/lib/private/Group/Backend.php @@ -0,0 +1,149 @@ +<?php +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Bart Visscher <bartv@thisnet.nl> + * @author Jakob Sack <mail@jakobsack.de> + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Michael Gapczynski <GapczynskiM@gmail.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OC\Group; + +/** + * Abstract base class for user management + */ +abstract class Backend implements \OCP\GroupInterface { + /** + * error code for functions not provided by the group backend + */ + const NOT_IMPLEMENTED = -501; + + /** + * actions that user backends can define + */ + const CREATE_GROUP = 0x00000001; + const DELETE_GROUP = 0x00000010; + const ADD_TO_GROUP = 0x00000100; + const REMOVE_FROM_GOUP = 0x00001000; + //OBSOLETE const GET_DISPLAYNAME = 0x00010000; + const COUNT_USERS = 0x00100000; + + protected $possibleActions = array( + self::CREATE_GROUP => 'createGroup', + self::DELETE_GROUP => 'deleteGroup', + self::ADD_TO_GROUP => 'addToGroup', + self::REMOVE_FROM_GOUP => 'removeFromGroup', + self::COUNT_USERS => 'countUsersInGroup', + ); + + /** + * Get all supported actions + * @return int bitwise-or'ed actions + * + * Returns the supported actions as int to be + * compared with \OC\Group\Backend::CREATE_GROUP etc. + */ + public function getSupportedActions() { + $actions = 0; + foreach($this->possibleActions AS $action => $methodName) { + if(method_exists($this, $methodName)) { + $actions |= $action; + } + } + + return $actions; + } + + /** + * Check if backend implements actions + * @param int $actions bitwise-or'ed actions + * @return bool + * + * Returns the supported actions as int to be + * compared with \OC\Group\Backend::CREATE_GROUP etc. + */ + public function implementsActions($actions) { + return (bool)($this->getSupportedActions() & $actions); + } + + /** + * is user in group? + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool + * + * Checks whether the user is member of a group or not. + */ + public function inGroup($uid, $gid) { + return in_array($gid, $this->getUserGroups($uid)); + } + + /** + * Get all groups a user belongs to + * @param string $uid Name of the user + * @return array an array of group names + * + * This function fetches all groups a user belongs to. It does not check + * if the user exists at all. + */ + public function getUserGroups($uid) { + return array(); + } + + /** + * get a list of all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names + * + * Returns a list with all groups + */ + + public function getGroups($search = '', $limit = -1, $offset = 0) { + return array(); + } + + /** + * check if a group exists + * @param string $gid + * @return bool + */ + public function groupExists($gid) { + return in_array($gid, $this->getGroups($gid, 1)); + } + + /** + * get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user ids + */ + public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { + return array(); + } +} diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php new file mode 100644 index 00000000000..9fefdd77300 --- /dev/null +++ b/lib/private/Group/Database.php @@ -0,0 +1,338 @@ +<?php +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Bart Visscher <bartv@thisnet.nl> + * @author Jakob Sack <mail@jakobsack.de> + * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Michael Gapczynski <GapczynskiM@gmail.com> + * @author michag86 <micha_g@arcor.de> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ +/* + * + * The following SQL statement is just a help for developers and will not be + * executed! + * + * CREATE TABLE `groups` ( + * `gid` varchar(64) COLLATE utf8_unicode_ci NOT NULL, + * PRIMARY KEY (`gid`) + * ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + * + * CREATE TABLE `group_user` ( + * `gid` varchar(64) COLLATE utf8_unicode_ci NOT NULL, + * `uid` varchar(64) COLLATE utf8_unicode_ci NOT NULL + * ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + * + */ + +namespace OC\Group; + +/** + * Class for group management in a SQL Database (e.g. MySQL, SQLite) + */ +class Database extends \OC\Group\Backend { + + /** @var string[] */ + private $groupCache = []; + + /** @var \OCP\IDBConnection */ + private $dbConn; + + /** + * \OC\Group\Database constructor. + * + * @param \OCP\IDBConnection|null $dbConn + */ + public function __construct(\OCP\IDBConnection $dbConn = null) { + $this->dbConn = $dbConn; + } + + /** + * FIXME: This function should not be required! + */ + private function fixDI() { + if ($this->dbConn === null) { + $this->dbConn = \OC::$server->getDatabaseConnection(); + } + } + + /** + * Try to create a new group + * @param string $gid The name of the group to create + * @return bool + * + * Tries to create a new group. If the group name already exists, false will + * be returned. + */ + public function createGroup( $gid ) { + $this->fixDI(); + + // Add group + $result = $this->dbConn->insertIfNotExist('*PREFIX*groups', [ + 'gid' => $gid, + ]); + + // Add to cache + $this->groupCache[$gid] = $gid; + + return $result === 1; + } + + /** + * delete a group + * @param string $gid gid of the group to delete + * @return bool + * + * Deletes a group and removes it from the group_user-table + */ + public function deleteGroup( $gid ) { + $this->fixDI(); + + // Delete the group + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('groups') + ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->execute(); + + // Delete the group-user relation + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('group_user') + ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->execute(); + + // Delete the group-groupadmin relation + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('group_admin') + ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->execute(); + + // Delete from cache + unset($this->groupCache[$gid]); + + return true; + } + + /** + * is user in group? + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool + * + * Checks whether the user is member of a group or not. + */ + public function inGroup( $uid, $gid ) { + $this->fixDI(); + + // check + $qb = $this->dbConn->getQueryBuilder(); + $cursor = $qb->select('uid') + ->from('group_user') + ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) + ->execute(); + + $result = $cursor->fetch(); + $cursor->closeCursor(); + + return $result ? true : false; + } + + /** + * Add a user to a group + * @param string $uid Name of the user to add to group + * @param string $gid Name of the group in which add the user + * @return bool + * + * Adds a user to a group. + */ + public function addToGroup( $uid, $gid ) { + $this->fixDI(); + + // No duplicate entries! + if( !$this->inGroup( $uid, $gid )) { + $qb = $this->dbConn->getQueryBuilder(); + $qb->insert('group_user') + ->setValue('uid', $qb->createNamedParameter($uid)) + ->setValue('gid', $qb->createNamedParameter($gid)) + ->execute(); + return true; + }else{ + return false; + } + } + + /** + * Removes a user from a group + * @param string $uid Name of the user to remove from group + * @param string $gid Name of the group from which remove the user + * @return bool + * + * removes the user from a group. + */ + public function removeFromGroup( $uid, $gid ) { + $this->fixDI(); + + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('group_user') + ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) + ->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->execute(); + + return true; + } + + /** + * Get all groups a user belongs to + * @param string $uid Name of the user + * @return array an array of group names + * + * This function fetches all groups a user belongs to. It does not check + * if the user exists at all. + */ + public function getUserGroups( $uid ) { + $this->fixDI(); + + // No magic! + $qb = $this->dbConn->getQueryBuilder(); + $cursor = $qb->select('gid') + ->from('group_user') + ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) + ->execute(); + + $groups = []; + while( $row = $cursor->fetch()) { + $groups[] = $row["gid"]; + $this->groupCache[$row['gid']] = $row['gid']; + } + $cursor->closeCursor(); + + return $groups; + } + + /** + * get a list of all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names + * + * Returns a list with all groups + */ + public function getGroups($search = '', $limit = null, $offset = null) { + $parameters = []; + $searchLike = ''; + if ($search !== '') { + $parameters[] = '%' . $search . '%'; + $searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)'; + } + + $stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset); + $result = $stmt->execute($parameters); + $groups = array(); + while ($row = $result->fetchRow()) { + $groups[] = $row['gid']; + } + return $groups; + } + + /** + * check if a group exists + * @param string $gid + * @return bool + */ + public function groupExists($gid) { + $this->fixDI(); + + // Check cache first + if (isset($this->groupCache[$gid])) { + return true; + } + + $qb = $this->dbConn->getQueryBuilder(); + $cursor = $qb->select('gid') + ->from('groups') + ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) + ->execute(); + $result = $cursor->fetch(); + $cursor->closeCursor(); + + if ($result !== false) { + $this->groupCache[$gid] = $gid; + return true; + } + return false; + } + + /** + * get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user ids + */ + public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { + $parameters = [$gid]; + $searchLike = ''; + if ($search !== '') { + $parameters[] = '%' . $search . '%'; + $searchLike = ' AND `uid` LIKE ?'; + } + + $stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC', + $limit, + $offset); + $result = $stmt->execute($parameters); + $users = array(); + while ($row = $result->fetchRow()) { + $users[] = $row['uid']; + } + return $users; + } + + /** + * get the number of all users matching the search string in a group + * @param string $gid + * @param string $search + * @return int|false + * @throws \OC\DatabaseException + */ + public function countUsersInGroup($gid, $search = '') { + $parameters = [$gid]; + $searchLike = ''; + if ($search !== '') { + $parameters[] = '%' . $search . '%'; + $searchLike = ' AND `uid` LIKE ?'; + } + + $stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike); + $result = $stmt->execute($parameters); + $count = $result->fetchOne(); + if($count !== false) { + $count = intval($count); + } + return $count; + } + +} diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index 064b9f899e6..c42f53af9a6 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -46,7 +46,7 @@ class Group implements IGroup { private $usersLoaded; /** - * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend + * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend */ private $backends; @@ -62,7 +62,7 @@ class Group implements IGroup { /** * @param string $gid - * @param \OC_Group_Backend[] $backends + * @param \OC\Group\Backend[] $backends * @param \OC\User\Manager $userManager * @param \OC\Hooks\PublicEmitter $emitter */ @@ -136,7 +136,7 @@ class Group implements IGroup { $this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user)); } foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_Group_Backend::ADD_TO_GROUP)) { + if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) { $backend->addToGroup($user->getUID(), $this->gid); if ($this->users) { $this->users[$user->getUID()] = $user; @@ -160,7 +160,7 @@ class Group implements IGroup { $this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user)); } foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_Group_Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) { + if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) { $backend->removeFromGroup($user->getUID(), $this->gid); $result = true; } @@ -209,7 +209,7 @@ class Group implements IGroup { public function count($search = '') { $users = false; foreach ($this->backends as $backend) { - if($backend->implementsActions(\OC_Group_Backend::COUNT_USERS)) { + if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) { if($users === false) { //we could directly add to a bool variable, but this would //be ugly @@ -257,7 +257,7 @@ class Group implements IGroup { $this->emitter->emit('\OC\Group', 'preDelete', array($this)); } foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_Group_Backend::DELETE_GROUP)) { + if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) { $result = true; $backend->deleteGroup($this->gid); } diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index e82a1d4f2e6..22367180edd 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -190,7 +190,7 @@ class Manager extends PublicEmitter implements IGroupManager { } else { $this->emit('\OC\Group', 'preCreate', array($gid)); foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC_Group_Backend::CREATE_GROUP)) { + if ($backend->implementsActions(\OC\Group\Backend::CREATE_GROUP)) { $backend->createGroup($gid); $group = $this->getGroupObject($gid); $this->emit('\OC\Group', 'postCreate', array($group)); diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index bd9e82ddae7..3f49b224d1e 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -39,6 +39,7 @@ class Client implements IClient { private $config; /** @var ICertificateManager */ private $certificateManager; + private $configured = false; /** * @param IConfig $config @@ -51,13 +52,16 @@ class Client implements IClient { $this->config = $config; $this->client = $client; $this->certificateManager = $certificateManager; - $this->setDefaultOptions(); } /** * Sets the default options to the client */ private function setDefaultOptions() { + if ($this->configured) { + return; + } + $this->configured = true; // Either use user bundle or the system bundle if nothing is specified if ($this->certificateManager->listCertificates() !== []) { $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath()); @@ -65,7 +69,7 @@ class Client implements IClient { // If the instance is not yet setup we need to use the static path as // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate // a view - if($this->config->getSystemValue('installed', false)) { + if ($this->config->getSystemValue('installed', false)) { $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null)); } else { $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); @@ -73,13 +77,14 @@ class Client implements IClient { } $this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler'); - if($this->getProxyUri() !== '') { + if ($this->getProxyUri() !== '') { $this->client->setDefaultOption('proxy', $this->getProxyUri()); } } /** * Get the proxy URI + * * @return string */ private function getProxyUri() { @@ -87,10 +92,10 @@ class Client implements IClient { $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null); $proxyUri = ''; - if(!is_null($proxyUserPwd)) { - $proxyUri .= $proxyUserPwd.'@'; + if (!is_null($proxyUserPwd)) { + $proxyUri .= $proxyUserPwd . '@'; } - if(!is_null($proxyHost)) { + if (!is_null($proxyHost)) { $proxyUri .= $proxyHost; } @@ -99,6 +104,7 @@ class Client implements IClient { /** * Sends a GET request + * * @param string $uri * @param array $options Array such as * 'query' => [ @@ -126,6 +132,7 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function get($uri, array $options = []) { + $this->setDefaultOptions(); $response = $this->client->get($uri, $options); $isStream = isset($options['stream']) && $options['stream']; return new Response($response, $isStream); @@ -133,6 +140,7 @@ class Client implements IClient { /** * Sends a HEAD request + * * @param string $uri * @param array $options Array such as * 'headers' => [ @@ -155,12 +163,14 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function head($uri, $options = []) { + $this->setDefaultOptions(); $response = $this->client->head($uri, $options); return new Response($response); } /** * Sends a POST request + * * @param string $uri * @param array $options Array such as * 'body' => [ @@ -188,12 +198,14 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function post($uri, array $options = []) { + $this->setDefaultOptions(); $response = $this->client->post($uri, $options); return new Response($response); } /** * Sends a PUT request + * * @param string $uri * @param array $options Array such as * 'body' => [ @@ -221,12 +233,14 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function put($uri, array $options = []) { + $this->setDefaultOptions(); $response = $this->client->put($uri, $options); return new Response($response); } /** * Sends a DELETE request + * * @param string $uri * @param array $options Array such as * 'body' => [ @@ -254,6 +268,7 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function delete($uri, array $options = []) { + $this->setDefaultOptions(); $response = $this->client->delete($uri, $options); return new Response($response); } @@ -261,6 +276,7 @@ class Client implements IClient { /** * Sends a options request + * * @param string $uri * @param array $options Array such as * 'body' => [ @@ -288,6 +304,7 @@ class Client implements IClient { * @throws \Exception If the request could not get completed */ public function options($uri, array $options = []) { + $this->setDefaultOptions(); $response = $this->client->options($uri, $options); return new Response($response); } diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php index b3444a2b4e9..5b6955823c4 100644 --- a/lib/private/Memcache/Redis.php +++ b/lib/private/Memcache/Redis.php @@ -37,33 +37,7 @@ class Redis extends Cache implements IMemcacheTTL { public function __construct($prefix = '') { parent::__construct($prefix); if (is_null(self::$cache)) { - // TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays - self::$cache = new \Redis(); - $config = \OC::$server->getSystemConfig()->getValue('redis', array()); - if (isset($config['host'])) { - $host = $config['host']; - } else { - $host = '127.0.0.1'; - } - if (isset($config['port'])) { - $port = $config['port']; - } else { - $port = 6379; - } - if (isset($config['timeout'])) { - $timeout = $config['timeout']; - } else { - $timeout = 0.0; // unlimited - } - - self::$cache->connect($host, $port, $timeout); - if(isset($config['password']) && $config['password'] !== '') { - self::$cache->auth($config['password']); - } - - if (isset($config['dbindex'])) { - self::$cache->select($config['dbindex']); - } + self::$cache = \OC::$server->getGetRedisFactory()->getInstance(); } } @@ -201,8 +175,7 @@ class Redis extends Cache implements IMemcacheTTL { } static public function isAvailable() { - return extension_loaded('redis') - && version_compare(phpversion('redis'), '2.2.5', '>='); + return \OC::$server->getGetRedisFactory()->isAvailable(); } } diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php new file mode 100644 index 00000000000..d286c0167b2 --- /dev/null +++ b/lib/private/RedisFactory.php @@ -0,0 +1,85 @@ +<?php +/** + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OC; + +class RedisFactory { + /** @var \Redis */ + private $instance; + + /** @var SystemConfig */ + private $config; + + /** + * RedisFactory constructor. + * + * @param SystemConfig $config + */ + public function __construct(SystemConfig $config) { + $this->config = $config; + } + + private function create() { + $this->instance = new \Redis(); + // TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays + $config = $this->config->getValue('redis', array()); + if (isset($config['host'])) { + $host = $config['host']; + } else { + $host = '127.0.0.1'; + } + if (isset($config['port'])) { + $port = $config['port']; + } else { + $port = 6379; + } + if (isset($config['timeout'])) { + $timeout = $config['timeout']; + } else { + $timeout = 0.0; // unlimited + } + + $this->instance->connect($host, $port, $timeout); + if (isset($config['password']) && $config['password'] !== '') { + $this->instance->auth($config['password']); + } + + if (isset($config['dbindex'])) { + $this->instance->select($config['dbindex']); + } + } + + public function getInstance() { + if (!$this->isAvailable()) { + throw new \Exception('Redis support is not available'); + } + if (!$this->instance instanceof \Redis) { + $this->create(); + } + + return $this->instance; + } + + public function isAvailable() { + return extension_loaded('redis') + && version_compare(phpversion('redis'), '2.2.5', '>='); + } +} diff --git a/lib/private/Route/CachingRouter.php b/lib/private/Route/CachingRouter.php index d6270dcf2c7..063d389e98b 100644 --- a/lib/private/Route/CachingRouter.php +++ b/lib/private/Route/CachingRouter.php @@ -50,8 +50,9 @@ class CachingRouter extends Router { public function generate($name, $parameters = array(), $absolute = false) { asort($parameters); $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . intval($absolute); - if ($this->cache->hasKey($key)) { - return $this->cache->get($key); + $cachedKey = $this->cache->get($key); + if ($cachedKey) { + return $cachedKey; } else { $url = parent::generate($name, $parameters, $absolute); $this->cache->set($key, $url, 3600); diff --git a/lib/private/Server.php b/lib/private/Server.php index cbab1f09ebd..a6f1425d545 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -336,6 +336,10 @@ class Server extends ServerContainer implements IServerContainer { '\\OC\\Memcache\\ArrayCache' ); }); + $this->registerService('RedisFactory', function (Server $c) { + $systemConfig = $c->getSystemConfig(); + return new RedisFactory($systemConfig); + }); $this->registerService('ActivityManager', function (Server $c) { return new \OC\Activity\Manager( $c->getRequest(), @@ -930,6 +934,16 @@ class Server extends ServerContainer implements IServerContainer { } /** + * Returns an \OC\RedisFactory instance + * + * @return \OC\RedisFactory + */ + public function getGetRedisFactory() { + return $this->query('RedisFactory'); + } + + + /** * Returns the current session * * @return \OCP\IDBConnection diff --git a/lib/private/template/base.php b/lib/private/Template/Base.php index cfe629b5fbf..cfe629b5fbf 100644 --- a/lib/private/template/base.php +++ b/lib/private/Template/Base.php diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/Template/CSSResourceLocator.php index 6a547931ee3..6a547931ee3 100644 --- a/lib/private/template/cssresourcelocator.php +++ b/lib/private/Template/CSSResourceLocator.php diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/Template/JSResourceLocator.php index 6ea7b6291c0..6ea7b6291c0 100644 --- a/lib/private/template/jsresourcelocator.php +++ b/lib/private/Template/JSResourceLocator.php diff --git a/lib/private/template/resourcelocator.php b/lib/private/Template/ResourceLocator.php index e64fce81afc..e64fce81afc 100644 --- a/lib/private/template/resourcelocator.php +++ b/lib/private/Template/ResourceLocator.php diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/Template/ResourceNotFoundException.php index 8c7f1f14175..8c7f1f14175 100644 --- a/lib/private/template/resourcenotfoundexception.php +++ b/lib/private/Template/ResourceNotFoundException.php diff --git a/lib/private/template/templatefilelocator.php b/lib/private/Template/TemplateFileLocator.php index f8553156914..f8553156914 100644 --- a/lib/private/template/templatefilelocator.php +++ b/lib/private/Template/TemplateFileLocator.php diff --git a/lib/private/legacy/group.php b/lib/private/legacy/group.php index f1b84069a38..ceb99389942 100644 --- a/lib/private/legacy/group.php +++ b/lib/private/legacy/group.php @@ -66,7 +66,7 @@ class OC_Group { /** * set the group backend - * @param \OC_Group_Backend $backend The backend to use for user management + * @param \OC\Group\Backend $backend The backend to use for user management * @return bool */ public static function useBackend($backend) { diff --git a/lib/private/legacy/group/backend.php b/lib/private/legacy/group/backend.php index 3d8d71b1529..a5df9c339b9 100644 --- a/lib/private/legacy/group/backend.php +++ b/lib/private/legacy/group/backend.php @@ -53,117 +53,7 @@ define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); /** * Abstract base class for user management + * @deprecated Since 9.1.0 use \OC\Group\Backend */ -abstract class OC_Group_Backend implements \OCP\GroupInterface { - /** - * error code for functions not provided by the group backend - */ - const NOT_IMPLEMENTED = -501; - - /** - * actions that user backends can define - */ - const CREATE_GROUP = 0x00000001; - const DELETE_GROUP = 0x00000010; - const ADD_TO_GROUP = 0x00000100; - const REMOVE_FROM_GOUP = 0x00001000; - //OBSOLETE const GET_DISPLAYNAME = 0x00010000; - const COUNT_USERS = 0x00100000; - - protected $possibleActions = array( - self::CREATE_GROUP => 'createGroup', - self::DELETE_GROUP => 'deleteGroup', - self::ADD_TO_GROUP => 'addToGroup', - self::REMOVE_FROM_GOUP => 'removeFromGroup', - self::COUNT_USERS => 'countUsersInGroup', - ); - - /** - * Get all supported actions - * @return int bitwise-or'ed actions - * - * Returns the supported actions as int to be - * compared with \OC_Group_Backend::CREATE_GROUP etc. - */ - public function getSupportedActions() { - $actions = 0; - foreach($this->possibleActions AS $action => $methodName) { - if(method_exists($this, $methodName)) { - $actions |= $action; - } - } - - return $actions; - } - - /** - * Check if backend implements actions - * @param int $actions bitwise-or'ed actions - * @return bool - * - * Returns the supported actions as int to be - * compared with \OC_Group_Backend::CREATE_GROUP etc. - */ - public function implementsActions($actions) { - return (bool)($this->getSupportedActions() & $actions); - } - - /** - * is user in group? - * @param string $uid uid of the user - * @param string $gid gid of the group - * @return bool - * - * Checks whether the user is member of a group or not. - */ - public function inGroup($uid, $gid) { - return in_array($gid, $this->getUserGroups($uid)); - } - - /** - * Get all groups a user belongs to - * @param string $uid Name of the user - * @return array an array of group names - * - * This function fetches all groups a user belongs to. It does not check - * if the user exists at all. - */ - public function getUserGroups($uid) { - return array(); - } - - /** - * get a list of all groups - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of group names - * - * Returns a list with all groups - */ - - public function getGroups($search = '', $limit = -1, $offset = 0) { - return array(); - } - - /** - * check if a group exists - * @param string $gid - * @return bool - */ - public function groupExists($gid) { - return in_array($gid, $this->getGroups($gid, 1)); - } - - /** - * get a list of all users in a group - * @param string $gid - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of user ids - */ - public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { - return array(); - } +abstract class OC_Group_Backend extends \OC\Group\Backend { } diff --git a/lib/private/legacy/group/database.php b/lib/private/legacy/group/database.php index 9ea0bbb8242..3969b3681fe 100644 --- a/lib/private/legacy/group/database.php +++ b/lib/private/legacy/group/database.php @@ -1,17 +1,8 @@ <?php /** - * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Bart Visscher <bartv@thisnet.nl> * @author Jakob Sack <mail@jakobsack.de> - * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> - * @author Michael Gapczynski <GapczynskiM@gmail.com> - * @author michag86 <micha_g@arcor.de> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <rullzer@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 @@ -29,308 +20,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -/* - * - * The following SQL statement is just a help for developers and will not be - * executed! - * - * CREATE TABLE `groups` ( - * `gid` varchar(64) COLLATE utf8_unicode_ci NOT NULL, - * PRIMARY KEY (`gid`) - * ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - * - * CREATE TABLE `group_user` ( - * `gid` varchar(64) COLLATE utf8_unicode_ci NOT NULL, - * `uid` varchar(64) COLLATE utf8_unicode_ci NOT NULL - * ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - * - */ /** - * Class for group management in a SQL Database (e.g. MySQL, SQLite) + * Class OC_Group_Database + * @deprecated Since 9.1.0 use \OC\Group\Database */ -class OC_Group_Database extends OC_Group_Backend { - - /** @var string[] */ - private $groupCache = []; - - /** @var \OCP\IDBConnection */ - private $dbConn; - - /** - * OC_Group_Database constructor. - * - * @param \OCP\IDBConnection|null $dbConn - */ - public function __construct(\OCP\IDBConnection $dbConn = null) { - $this->dbConn = $dbConn; - } - - /** - * FIXME: This function should not be required! - */ - private function fixDI() { - if ($this->dbConn === null) { - $this->dbConn = \OC::$server->getDatabaseConnection(); - } - } - - /** - * Try to create a new group - * @param string $gid The name of the group to create - * @return bool - * - * Tries to create a new group. If the group name already exists, false will - * be returned. - */ - public function createGroup( $gid ) { - $this->fixDI(); - - // Add group - $result = $this->dbConn->insertIfNotExist('*PREFIX*groups', [ - 'gid' => $gid, - ]); - - // Add to cache - $this->groupCache[$gid] = $gid; - - return $result === 1; - } - - /** - * delete a group - * @param string $gid gid of the group to delete - * @return bool - * - * Deletes a group and removes it from the group_user-table - */ - public function deleteGroup( $gid ) { - $this->fixDI(); - - // Delete the group - $qb = $this->dbConn->getQueryBuilder(); - $qb->delete('groups') - ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->execute(); - - // Delete the group-user relation - $qb = $this->dbConn->getQueryBuilder(); - $qb->delete('group_user') - ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->execute(); - - // Delete the group-groupadmin relation - $qb = $this->dbConn->getQueryBuilder(); - $qb->delete('group_admin') - ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->execute(); - - // Delete from cache - unset($this->groupCache[$gid]); - - return true; - } - - /** - * is user in group? - * @param string $uid uid of the user - * @param string $gid gid of the group - * @return bool - * - * Checks whether the user is member of a group or not. - */ - public function inGroup( $uid, $gid ) { - $this->fixDI(); - - // check - $qb = $this->dbConn->getQueryBuilder(); - $cursor = $qb->select('uid') - ->from('group_user') - ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) - ->execute(); - - $result = $cursor->fetch(); - $cursor->closeCursor(); - - return $result ? true : false; - } - - /** - * Add a user to a group - * @param string $uid Name of the user to add to group - * @param string $gid Name of the group in which add the user - * @return bool - * - * Adds a user to a group. - */ - public function addToGroup( $uid, $gid ) { - $this->fixDI(); - - // No duplicate entries! - if( !$this->inGroup( $uid, $gid )) { - $qb = $this->dbConn->getQueryBuilder(); - $qb->insert('group_user') - ->setValue('uid', $qb->createNamedParameter($uid)) - ->setValue('gid', $qb->createNamedParameter($gid)) - ->execute(); - return true; - }else{ - return false; - } - } - - /** - * Removes a user from a group - * @param string $uid Name of the user to remove from group - * @param string $gid Name of the group from which remove the user - * @return bool - * - * removes the user from a group. - */ - public function removeFromGroup( $uid, $gid ) { - $this->fixDI(); - - $qb = $this->dbConn->getQueryBuilder(); - $qb->delete('group_user') - ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) - ->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->execute(); - - return true; - } - - /** - * Get all groups a user belongs to - * @param string $uid Name of the user - * @return array an array of group names - * - * This function fetches all groups a user belongs to. It does not check - * if the user exists at all. - */ - public function getUserGroups( $uid ) { - $this->fixDI(); - - // No magic! - $qb = $this->dbConn->getQueryBuilder(); - $cursor = $qb->select('gid') - ->from('group_user') - ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) - ->execute(); - - $groups = []; - while( $row = $cursor->fetch()) { - $groups[] = $row["gid"]; - $this->groupCache[$row['gid']] = $row['gid']; - } - $cursor->closeCursor(); - - return $groups; - } - - /** - * get a list of all groups - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of group names - * - * Returns a list with all groups - */ - public function getGroups($search = '', $limit = null, $offset = null) { - $parameters = []; - $searchLike = ''; - if ($search !== '') { - $parameters[] = '%' . $search . '%'; - $searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)'; - } - - $stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset); - $result = $stmt->execute($parameters); - $groups = array(); - while ($row = $result->fetchRow()) { - $groups[] = $row['gid']; - } - return $groups; - } - - /** - * check if a group exists - * @param string $gid - * @return bool - */ - public function groupExists($gid) { - $this->fixDI(); - - // Check cache first - if (isset($this->groupCache[$gid])) { - return true; - } - - $qb = $this->dbConn->getQueryBuilder(); - $cursor = $qb->select('gid') - ->from('groups') - ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) - ->execute(); - $result = $cursor->fetch(); - $cursor->closeCursor(); - - if ($result !== false) { - $this->groupCache[$gid] = $gid; - return true; - } - return false; - } - - /** - * get a list of all users in a group - * @param string $gid - * @param string $search - * @param int $limit - * @param int $offset - * @return array an array of user ids - */ - public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { - $parameters = [$gid]; - $searchLike = ''; - if ($search !== '') { - $parameters[] = '%' . $search . '%'; - $searchLike = ' AND `uid` LIKE ?'; - } - - $stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC', - $limit, - $offset); - $result = $stmt->execute($parameters); - $users = array(); - while ($row = $result->fetchRow()) { - $users[] = $row['uid']; - } - return $users; - } - - /** - * get the number of all users matching the search string in a group - * @param string $gid - * @param string $search - * @return int|false - * @throws \OC\DatabaseException - */ - public function countUsersInGroup($gid, $search = '') { - $parameters = [$gid]; - $searchLike = ''; - if ($search !== '') { - $parameters[] = '%' . $search . '%'; - $searchLike = ' AND `uid` LIKE ?'; - } - - $stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike); - $result = $stmt->execute($parameters); - $count = $result->fetchOne(); - if($count !== false) { - $count = intval($count); - } - return $count; - } - -} +class OC_Group_Database extends \OC\Group\Database { + +}
\ No newline at end of file diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 84b963e4ab6..73725529702 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -36,7 +36,7 @@ use OC\TemplateLayout; -require_once __DIR__.'/../template/functions.php'; +require_once __DIR__.'/template/functions.php'; /** * This class provides the templates for ownCloud. diff --git a/lib/private/template/functions.php b/lib/private/legacy/template/functions.php index a0540420e29..a0540420e29 100644 --- a/lib/private/template/functions.php +++ b/lib/private/legacy/template/functions.php diff --git a/lib/public/authentication/iapachebackend.php b/lib/public/Authentication/IApacheBackend.php index f1f408cfa6d..f1f408cfa6d 100644 --- a/lib/public/authentication/iapachebackend.php +++ b/lib/public/Authentication/IApacheBackend.php diff --git a/lib/public/console/consoleevent.php b/lib/public/Console/ConsoleEvent.php index b3f1229f0e8..b3f1229f0e8 100644 --- a/lib/public/console/consoleevent.php +++ b/lib/public/Console/ConsoleEvent.php diff --git a/lib/public/contacts/imanager.php b/lib/public/Contacts/IManager.php index c6d557eaba7..c6d557eaba7 100644 --- a/lib/public/contacts/imanager.php +++ b/lib/public/Contacts/IManager.php diff --git a/lib/public/diagnostics/ievent.php b/lib/public/Diagnostics/IEvent.php index a3e42ee137f..a3e42ee137f 100644 --- a/lib/public/diagnostics/ievent.php +++ b/lib/public/Diagnostics/IEvent.php diff --git a/lib/public/diagnostics/ieventlogger.php b/lib/public/Diagnostics/IEventLogger.php index 34e521db10c..34e521db10c 100644 --- a/lib/public/diagnostics/ieventlogger.php +++ b/lib/public/Diagnostics/IEventLogger.php diff --git a/lib/public/diagnostics/iquery.php b/lib/public/Diagnostics/IQuery.php index 3b4d1b4c965..3b4d1b4c965 100644 --- a/lib/public/diagnostics/iquery.php +++ b/lib/public/Diagnostics/IQuery.php diff --git a/lib/public/diagnostics/iquerylogger.php b/lib/public/Diagnostics/IQueryLogger.php index 285a85efde1..285a85efde1 100644 --- a/lib/public/diagnostics/iquerylogger.php +++ b/lib/public/Diagnostics/IQueryLogger.php diff --git a/lib/public/icache.php b/lib/public/icache.php index 3319013ddfa..a1ce068d819 100644 --- a/lib/public/icache.php +++ b/lib/public/icache.php @@ -60,6 +60,7 @@ interface ICache { * @param string $key * @return bool * @since 6.0.0 + * @deprecated 9.1.0 Directly read from GET to prevent race conditions */ public function hasKey($key); diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index d08a46bb017..3498172f1d3 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -78,6 +78,8 @@ "kra": ["application/x-krita"], "lwp": ["application/vnd.lotus-wordpro"], "m2t": ["video/mp2t"], + "m4a": ["audio/mp4"], + "m4b": ["audio/m4b"], "m4v": ["video/mp4"], "markdown": ["text/markdown"], "mdown": ["text/markdown"], diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 04aea9eb54a..2f8373a58d8 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -64,8 +64,8 @@ OC.L10N.register( "All" : "Todos", "No apps found for your version" : "No se han encontrado aplicaciones para su versión", "The app will be downloaded from the app store" : "La app debe ser descargada desde una app store", - "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicaciones oficiales son desarrolladas por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad central con ownCloud y están listas para su uso en producción. ", - "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", + "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ", + "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", "_You have %n app update pending_::_You have %n app updates pending_" : ["Tiene %n actualización de app pendiente","Tiene %n actualizaciones de app pendientes"], @@ -212,7 +212,7 @@ OC.L10N.register( "Experimental applications ahead" : "Aplicaciones experimentales más adelante", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.", "by %s" : "por %s", - "%s-licensed" : "%s-licenciado", + "%s-licensed" : "Licencia %s", "Documentation:" : "Documentación:", "User documentation" : "Documentación de usuario", "Admin documentation" : "Documentación de administrador", @@ -268,7 +268,7 @@ 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", - "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}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {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}." : "Desarrollado por la {communityopen}comunidad ownCloud{linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", "Show user backend" : "Mostrar motor de usuario", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 5a8966b5d8e..b75e5b0df01 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -62,8 +62,8 @@ "All" : "Todos", "No apps found for your version" : "No se han encontrado aplicaciones para su versión", "The app will be downloaded from the app store" : "La app debe ser descargada desde una app store", - "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicaciones oficiales son desarrolladas por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad central con ownCloud y están listas para su uso en producción. ", - "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", + "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ", + "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", "_You have %n app update pending_::_You have %n app updates pending_" : ["Tiene %n actualización de app pendiente","Tiene %n actualizaciones de app pendientes"], @@ -210,7 +210,7 @@ "Experimental applications ahead" : "Aplicaciones experimentales más adelante", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.", "by %s" : "por %s", - "%s-licensed" : "%s-licenciado", + "%s-licensed" : "Licencia %s", "Documentation:" : "Documentación:", "User documentation" : "Documentación de usuario", "Admin documentation" : "Documentación de administrador", @@ -266,7 +266,7 @@ "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", - "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}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {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}." : "Desarrollado por la {communityopen}comunidad ownCloud{linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", "Show user backend" : "Mostrar motor de usuario", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index fbbf5accd64..08b70d0da7d 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -198,7 +198,7 @@ OC.L10N.register( "Valid until %s" : "Veljavno do %s", "Import root certificate" : "Uvozi korensko potrdilo", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>obveščamo vas, da je račun %s pripravljen.<br><br>Uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nobveščamo vas, da je račun %s pripravljen.\n\nUporabniško ime: %s\nDostop: %s\n", "Administrator documentation" : "Skrbniška dokumentacija", "Online documentation" : "Spletna dokumentacija", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index 36883fd7d98..d92337968f6 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -196,7 +196,7 @@ "Valid until %s" : "Veljavno do %s", "Import root certificate" : "Uvozi korensko potrdilo", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>obveščamo vas, da je račun %s pripravljen.<br><br>Uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nobveščamo vas, da je račun %s pripravljen.\n\nUporabniško ime: %s\nDostop: %s\n", "Administrator documentation" : "Skrbniška dokumentacija", "Online documentation" : "Spletna dokumentacija", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index 54e6041e831..7932263b443 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -147,6 +147,7 @@ OC.L10N.register( "days" : "天", "Enforce expiration date" : "强制过期日期", "Allow resharing" : "允许再次共享", + "Allow sharing with groups" : "允许群组共享", "Restrict users to only share with users in their groups" : "限制仅与组内用户分享", "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户", "Exclude groups from sharing" : "在分享中排除组", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index b93d3d71250..c4aa102afec 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -145,6 +145,7 @@ "days" : "天", "Enforce expiration date" : "强制过期日期", "Allow resharing" : "允许再次共享", + "Allow sharing with groups" : "允许群组共享", "Restrict users to only share with users in their groups" : "限制仅与组内用户分享", "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户", "Exclude groups from sharing" : "在分享中排除组", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 521f49d708a..6cf4b43c162 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -208,22 +208,22 @@ if ($_['cronErrors']) { </p> <p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>"> - <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox" - value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> /> - <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/> - <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox" value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/> - <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" class="checkbox" - value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> /> - <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/> + <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox" + value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> /> + <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/> <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox" value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/> + <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" class="checkbox" + value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/> + </p> <p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>"> <?php p($l->t( 'Expire after ' )); ?> diff --git a/tests/lib/authentication/token/defaulttokenprovidertest.php b/tests/lib/authentication/token/defaulttokenprovidertest.php index 5ee33d0ec11..1902227a4fa 100644 --- a/tests/lib/authentication/token/defaulttokenprovidertest.php +++ b/tests/lib/authentication/token/defaulttokenprovidertest.php @@ -62,7 +62,10 @@ class DefaultTokenProviderTest extends TestCase { $token = 'token'; $uid = 'user'; $password = 'passme'; - $name = 'Some browser'; + $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'; $type = IToken::PERMANENT_TOKEN; $toInsert = new DefaultToken(); diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index f93b7c33cab..adea702eca9 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -21,20 +21,19 @@ class AutoLoader extends TestCase { public function testLeadingSlashOnClassName() { $this->assertEquals([ - \OC::$SERVERROOT . '/lib/private/files/storage/local.php', - ], $this->loader->findClass('\OC\Files\Storage\Local')); + \OC::$SERVERROOT . '/lib/public/files/storage/local.php', + ], $this->loader->findClass('\OCP\Files\Storage\Local')); } public function testNoLeadingSlashOnClassName() { $this->assertEquals([ - \OC::$SERVERROOT . '/lib/private/files/storage/local.php', - ], $this->loader->findClass('OC\Files\Storage\Local')); + \OC::$SERVERROOT . '/lib/public/files/storage/local.php', + ], $this->loader->findClass('OCP\Files\Storage\Local')); } public function testLegacyPath() { $this->assertEquals([ \OC::$SERVERROOT . '/lib/private/legacy/files.php', - \OC::$SERVERROOT . '/lib/private/files.php', ], $this->loader->findClass('OC_Files')); } @@ -50,16 +49,9 @@ class AutoLoader extends TestCase { ], $this->loader->findClass('Test_Foo_Bar')); } - public function testLoadCoreNamespace() { - $this->assertEquals([ - \OC::$SERVERROOT . '/lib/private/foo/bar.php', - ], $this->loader->findClass('OC\Foo\Bar')); - } - public function testLoadCore() { $this->assertEquals([ \OC::$SERVERROOT . '/lib/private/legacy/foo/bar.php', - \OC::$SERVERROOT . '/lib/private/foo/bar.php', ], $this->loader->findClass('OC_Foo_Bar')); } @@ -83,10 +75,4 @@ class AutoLoader extends TestCase { public function testLoadCoreNamespaceSettings() { $this->assertEquals([], $this->loader->findClass('OC\Settings\Foo\Bar')); } - - public function testLoadCoreNamespaceRepair() { - $this->assertEquals([ - \OC::$SERVERROOT . '/lib/private/repair/foo/bar.php', - ], $this->loader->findClass('OC\Repair\Foo\Bar')); - } } diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php index 238b83de5d7..3b06a3eb3a9 100644 --- a/tests/lib/group/backend.php +++ b/tests/lib/group/backend.php @@ -31,7 +31,7 @@ */ abstract class Test_Group_Backend extends \Test\TestCase { /** - * @var OC_Group_Backend $backend + * @var \OC\Group\Backend $backend */ protected $backend; diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php index b0be5774c7d..aae9f8bf1de 100644 --- a/tests/lib/group/database.php +++ b/tests/lib/group/database.php @@ -45,7 +45,7 @@ class Test_Group_Database extends Test_Group_Backend { protected function setUp() { parent::setUp(); - $this->backend = new OC_Group_Database(); + $this->backend = new \OC\Group\Database(); } protected function tearDown() { @@ -60,7 +60,7 @@ class Test_Group_Database extends Test_Group_Backend { $this->backend->createGroup($group); - $backend = new OC_Group_Database(); + $backend = new \OC\Group\Database(); $this->assertFalse($backend->createGroup($group)); } } diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index d758e5959d0..bf834ab2348 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -32,7 +32,7 @@ class Group extends \Test\TestCase { } public function testGetUsersSingleBackend() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -51,8 +51,8 @@ class Group extends \Test\TestCase { } public function testGetUsersMultipleBackends() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -78,7 +78,7 @@ class Group extends \Test\TestCase { } public function testInGroupSingleBackend() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -92,8 +92,8 @@ class Group extends \Test\TestCase { } public function testInGroupMultipleBackends() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -112,7 +112,7 @@ class Group extends \Test\TestCase { } public function testAddUser() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -133,7 +133,7 @@ class Group extends \Test\TestCase { } public function testAddUserAlreadyInGroup() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -153,7 +153,7 @@ class Group extends \Test\TestCase { } public function testRemoveUser() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -174,7 +174,7 @@ class Group extends \Test\TestCase { } public function testRemoveUserNotInGroup() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -194,8 +194,8 @@ class Group extends \Test\TestCase { } public function testRemoveUserMultipleBackends() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -228,7 +228,7 @@ class Group extends \Test\TestCase { } public function testSearchUsers() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -245,8 +245,8 @@ class Group extends \Test\TestCase { } public function testSearchUsersMultipleBackends() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -267,7 +267,7 @@ class Group extends \Test\TestCase { } public function testSearchUsersLimitAndOffset() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend), $userManager); @@ -284,8 +284,8 @@ class Group extends \Test\TestCase { } public function testSearchUsersMultipleBackendsLimitAndOffset() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -308,7 +308,7 @@ class Group extends \Test\TestCase { } public function testCountUsers() { - $backend1 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1), $userManager); @@ -327,8 +327,8 @@ class Group extends \Test\TestCase { } public function testCountUsersMultipleBackends() { - $backend1 = $this->getMock('OC_Group_Database'); - $backend2 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); + $backend2 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); @@ -354,7 +354,7 @@ class Group extends \Test\TestCase { } public function testCountUsersNoMethod() { - $backend1 = $this->getMock('OC_Group_Database'); + $backend1 = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend1), $userManager); @@ -370,7 +370,7 @@ class Group extends \Test\TestCase { } public function testDelete() { - $backend = $this->getMock('OC_Group_Database'); + $backend = $this->getMock('OC\Group\Database'); $userManager = $this->getUserManager(); $group = new \OC\Group\Group('group1', array($backend), $userManager); diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 410e11114c4..751f0d0ebd5 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -14,9 +14,9 @@ use OC\User\User; class Manager extends \Test\TestCase { public function testGet() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->any()) ->method('groupExists') ->with('group1') @@ -46,9 +46,9 @@ class Manager extends \Test\TestCase { public function testGetNotExists() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('groupExists') ->with('group1') @@ -82,18 +82,18 @@ class Manager extends \Test\TestCase { public function testGetMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend1 = $this->getMock('\OC_Group_Database'); + $backend1 = $this->getMock('\OC\Group\Database'); $backend1->expects($this->any()) ->method('groupExists') ->with('group1') ->will($this->returnValue(false)); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 */ - $backend2 = $this->getMock('\OC_Group_Database'); + $backend2 = $this->getMock('\OC\Group\Database'); $backend2->expects($this->any()) ->method('groupExists') ->with('group1') @@ -114,10 +114,10 @@ class Manager extends \Test\TestCase { public function testCreate() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ $backendGroupCreated = false; - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->any()) ->method('groupExists') ->with('group1') @@ -146,9 +146,9 @@ class Manager extends \Test\TestCase { public function testCreateExists() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->any()) ->method('groupExists') ->with('group1') @@ -169,9 +169,9 @@ class Manager extends \Test\TestCase { public function testSearch() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('getGroups') ->with('1') @@ -196,9 +196,9 @@ class Manager extends \Test\TestCase { public function testSearchMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend1 = $this->getMock('\OC_Group_Database'); + $backend1 = $this->getMock('\OC\Group\Database'); $backend1->expects($this->once()) ->method('getGroups') ->with('1') @@ -208,9 +208,9 @@ class Manager extends \Test\TestCase { ->will($this->returnValue(true)); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 */ - $backend2 = $this->getMock('\OC_Group_Database'); + $backend2 = $this->getMock('\OC\Group\Database'); $backend2->expects($this->once()) ->method('getGroups') ->with('1') @@ -237,9 +237,9 @@ class Manager extends \Test\TestCase { public function testSearchMultipleBackendsLimitAndOffset() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend1 = $this->getMock('\OC_Group_Database'); + $backend1 = $this->getMock('\OC\Group\Database'); $backend1->expects($this->once()) ->method('getGroups') ->with('1', 2, 1) @@ -249,9 +249,9 @@ class Manager extends \Test\TestCase { ->will($this->returnValue(true)); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 */ - $backend2 = $this->getMock('\OC_Group_Database'); + $backend2 = $this->getMock('\OC\Group\Database'); $backend2->expects($this->once()) ->method('getGroups') ->with('1', 2, 1) @@ -278,9 +278,9 @@ class Manager extends \Test\TestCase { public function testGetUserGroups() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -332,9 +332,9 @@ class Manager extends \Test\TestCase { public function testInGroup() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -356,9 +356,9 @@ class Manager extends \Test\TestCase { public function testIsAdmin() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -380,9 +380,9 @@ class Manager extends \Test\TestCase { public function testNotAdmin() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -404,9 +404,9 @@ class Manager extends \Test\TestCase { public function testGetUserGroupsMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend1 = $this->getMock('\OC_Group_Database'); + $backend1 = $this->getMock('\OC\Group\Database'); $backend1->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -416,9 +416,9 @@ class Manager extends \Test\TestCase { ->will($this->returnValue(true)); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 */ - $backend2 = $this->getMock('\OC_Group_Database'); + $backend2 = $this->getMock('\OC\Group\Database'); $backend2->expects($this->once()) ->method('getUserGroups') ->with('user1') @@ -446,9 +446,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackend() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -510,9 +510,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackendWithLimitSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -577,9 +577,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackendWithLimitAndOffsetSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -647,9 +647,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmpty() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -692,9 +692,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -736,9 +736,9 @@ class Manager extends \Test\TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitAndOffsetSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->exactly(1)) ->method('groupExists') ->with('testgroup') @@ -781,9 +781,9 @@ class Manager extends \Test\TestCase { public function testGetUserGroupsWithAddUser() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $expectedGroups = array(); $backend->expects($this->any()) ->method('getUserGroups') @@ -825,9 +825,9 @@ class Manager extends \Test\TestCase { public function testGetUserGroupsWithRemoveUser() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $expectedGroups = array('group1'); $backend->expects($this->any()) ->method('getUserGroups') @@ -875,9 +875,9 @@ class Manager extends \Test\TestCase { public function testGetUserIdGroups() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend */ - $backend = $this->getMock('\OC_Group_Database'); + $backend = $this->getMock('\OC\Group\Database'); $backend->expects($this->any()) ->method('getUserGroups') ->with('user1') diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index d7573337f87..7ed121d3556 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -423,7 +423,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { */ protected function assertTemplate($expectedHtml, $template, $vars = []) { - require_once __DIR__.'/../../lib/private/template/functions.php'; + require_once __DIR__.'/../../lib/private/legacy/template/functions.php'; $requestToken = 12345; $theme = new OC_Defaults(); diff --git a/tests/lib/util/group/dummy.php b/tests/lib/util/group/dummy.php index e72be827d8a..8f06316ca03 100644 --- a/tests/lib/util/group/dummy.php +++ b/tests/lib/util/group/dummy.php @@ -29,12 +29,12 @@ namespace Test\Util\Group; -use OC_Group_Backend; +use OC\Group\Backend; /** * dummy group backend, does not keep state, only for testing use */ -class Dummy extends OC_Group_Backend { +class Dummy extends Backend { private $groups=array(); /** * Try to create a new group diff --git a/version.php b/version.php index 81e0bc1b067..d9e1ca1df1c 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 1, 0, 1); +$OC_Version = array(9, 1, 0, 2); // The human readable string $OC_VersionString = '9.1.0 pre alpha'; |