diff options
270 files changed, 1494 insertions, 736 deletions
diff --git a/.htaccess b/.htaccess index 78e6255c878..cf9af3f72d1 100644 --- a/.htaccess +++ b/.htaccess @@ -13,6 +13,7 @@ php_value post_max_size 513M php_value memory_limit 512M php_value mbstring.func_overload 0 php_value always_populate_raw_post_data -1 +php_value default_charset 'UTF-8' <IfModule mod_env.c> SetEnv htaccessWorking true </IfModule> @@ -0,0 +1 @@ +$Format:%H$ diff --git a/.user.ini b/.user.ini index 09f6a05ff6c..ef440b53fe5 100644 --- a/.user.ini +++ b/.user.ini @@ -3,3 +3,4 @@ post_max_size=513M memory_limit=512M mbstring.func_overload=0 always_populate_raw_post_data=-1 +default_charset='UTF-8' diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 4aed79d70f7..b590776830a 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -5,7 +5,7 @@ OCP\JSON::checkLoggedIn(); $l = \OC::$server->getL10N('files'); // Load the files -$dir = isset($_GET['dir']) ? $_GET['dir'] : ''; +$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; $dir = \OC\Files\Filesystem::normalizePath($dir); try { diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index b864b8316d2..e4170df0ed3 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} a {files}", "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba", "%s could not be renamed as it has been deleted" : "%s nelze přejmenovat, protože byl smazán", "%s could not be renamed" : "%s nemůže být přejmenován", "Upload (max. %s)" : "Nahrát (max. %s)", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index ecff8b31757..facc6476356 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} a {files}", "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba", "%s could not be renamed as it has been deleted" : "%s nelze přejmenovat, protože byl smazán", "%s could not be renamed" : "%s nemůže být přejmenován", "Upload (max. %s)" : "Nahrát (max. %s)", diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 80ca71ef04d..fa85be4e7c8 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} og {files}", "Favorited" : "Gjort til foretrukken", "Favorite" : "Foretrukken", + "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne", "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet", "%s could not be renamed" : "%s kunne ikke omdøbes", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 27a70fa59c3..0209c2cb9ab 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} og {files}", "Favorited" : "Gjort til foretrukken", "Favorite" : "Foretrukken", + "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne", "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet", "%s could not be renamed" : "%s kunne ikke omdøbes", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 7fa9cd9af28..de4af2e168e 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} und {files}", "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten", "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde", "%s could not be renamed" : "%s konnte nicht umbenannt werden", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index e37d96abd2e..9d5c5419edc 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} und {files}", "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten", "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde", "%s could not be renamed" : "%s konnte nicht umbenannt werden", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 9d864bf3626..f27d579efec 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} und {files}", "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten", "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde", "%s could not be renamed" : "%s konnte nicht umbenannt werden", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index bc2fd5acddd..2c80e6f2b9c 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} und {files}", "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten", "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde", "%s could not be renamed" : "%s konnte nicht umbenannt werden", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index 664c8cf9010..a0083e4e77d 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} and {files}", "Favorited" : "Favourited", "Favorite" : "Favourite", + "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags", "%s could not be renamed as it has been deleted" : "%s could not be renamed as it has been deleted", "%s could not be renamed" : "%s could not be renamed", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index fdc0b587386..16c8cdbc824 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} and {files}", "Favorited" : "Favourited", "Favorite" : "Favourite", + "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags", "%s could not be renamed as it has been deleted" : "%s could not be renamed as it has been deleted", "%s could not be renamed" : "%s could not be renamed", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index f1bbb505832..f1e670581be 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} y {files}", "Favorited" : "Agregado a favoritos", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas", "%s could not be renamed as it has been deleted" : "%s no se pudo renombrar pues ha sido eliminado", "%s could not be renamed" : "%s no pudo ser renombrado", "Upload (max. %s)" : "Subida (máx. %s)", @@ -102,8 +103,8 @@ OC.L10N.register( "No entries found in this folder" : "No hay entradas en esta carpeta", "Select all" : "Seleccionar todo", "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.", - "Files are being scanned, please wait." : "Los archivos están siendo escaneados, por favor espere.", + "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.", + "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.", "Currently scanning" : "Escaneando en este momento", "No favorites" : "No hay favoritos", "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos" diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 019c52d1310..8884b736f6f 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} y {files}", "Favorited" : "Agregado a favoritos", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas", "%s could not be renamed as it has been deleted" : "%s no se pudo renombrar pues ha sido eliminado", "%s could not be renamed" : "%s no pudo ser renombrado", "Upload (max. %s)" : "Subida (máx. %s)", @@ -100,8 +101,8 @@ "No entries found in this folder" : "No hay entradas en esta carpeta", "Select all" : "Seleccionar todo", "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.", - "Files are being scanned, please wait." : "Los archivos están siendo escaneados, por favor espere.", + "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.", + "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.", "Currently scanning" : "Escaneando en este momento", "No favorites" : "No hay favoritos", "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos" diff --git a/apps/files/l10n/es_CR.js b/apps/files/l10n/es_CR.js index 7988332fa91..6b2234ae636 100644 --- a/apps/files/l10n/es_CR.js +++ b/apps/files/l10n/es_CR.js @@ -1,6 +1,7 @@ OC.L10N.register( "files", { + "Files" : "Archivos", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], diff --git a/apps/files/l10n/es_CR.json b/apps/files/l10n/es_CR.json index ef5fc586755..3fcc4aefc43 100644 --- a/apps/files/l10n/es_CR.json +++ b/apps/files/l10n/es_CR.json @@ -1,4 +1,5 @@ { "translations": { + "Files" : "Archivos", "_%n folder_::_%n folders_" : ["",""], "_%n file_::_%n files_" : ["",""], "_Uploading %n file_::_Uploading %n files_" : ["",""], diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index cd15c95ffa5..6bf4484abc3 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} ja {files}", "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", + "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe", "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu", "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui", "Upload (max. %s)" : "Lähetys (enintään %s)", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index a3677691bd0..29dd4d462dd 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} ja {files}", "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", + "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe", "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu", "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui", "Upload (max. %s)" : "Lähetys (enintään %s)", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 4f1efe478b7..eab3108b510 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} et {files}", "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", + "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes", "%s could not be renamed as it has been deleted" : "%s ne peut être renommé car il a été supprimé ", "%s could not be renamed" : "%s ne peut être renommé", "Upload (max. %s)" : "Envoi (max. %s)", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index f083369381c..ada9eb38e18 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} et {files}", "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", + "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes", "%s could not be renamed as it has been deleted" : "%s ne peut être renommé car il a été supprimé ", "%s could not be renamed" : "%s ne peut être renommé", "Upload (max. %s)" : "Envoi (max. %s)", diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index 98c71ef207c..6d4a863f7df 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Marcado como favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas", "%s could not be renamed as it has been deleted" : "Non é posíbel renomear %s xa que foi eliminado", "%s could not be renamed" : "%s non pode cambiar de nome", "Upload (max. %s)" : "Envío (máx. %s)", diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 0d0ba4a269c..6cfaf9f39d0 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Marcado como favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas", "%s could not be renamed as it has been deleted" : "Non é posíbel renomear %s xa que foi eliminado", "%s could not be renamed" : "%s non pode cambiar de nome", "Upload (max. %s)" : "Envío (máx. %s)", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 8ec7c4c3478..d0a186ad2e9 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Preferiti", "Favorite" : "Preferito", + "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette", "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato", "%s could not be renamed" : "%s non può essere rinominato", "Upload (max. %s)" : "Carica (massimo %s)", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 44dcc27c8a9..0632884914d 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Preferiti", "Favorite" : "Preferito", + "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette", "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato", "%s could not be renamed" : "%s non può essere rinominato", "Upload (max. %s)" : "Carica (massimo %s)", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index 0cb3193c61d..1d8026e2139 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} と {files}", "Favorited" : "お気に入り済", "Favorite" : "お気に入り", + "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました", "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません", "%s could not be renamed" : "%sの名前を変更できませんでした", "Upload (max. %s)" : "アップロード ( 最大 %s )", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 570b63ab5f7..8d758fb5037 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} と {files}", "Favorited" : "お気に入り済", "Favorite" : "お気に入り", + "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました", "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません", "%s could not be renamed" : "%sの名前を変更できませんでした", "Upload (max. %s)" : "アップロード ( 最大 %s )", diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index d352bacc5ed..22dab10bd36 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} 그리고 {files}", "Favorited" : "책갈피에 추가됨", "Favorite" : "즐겨찾기", + "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생", "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", "Upload (max. %s)" : "업로드(최대 %s)", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index f12256b681a..3dbddd90263 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} 그리고 {files}", "Favorited" : "책갈피에 추가됨", "Favorite" : "즐겨찾기", + "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생", "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", "Upload (max. %s)" : "업로드(최대 %s)", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index d6c654608db..c630cf93127 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} en {files}", "Favorited" : "Favoriet", "Favorite" : "Favoriet", + "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken", "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is", "%s could not be renamed" : "%s kon niet worden hernoemd", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index d3e22bbdaa1..34bf8e2ae29 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} en {files}", "Favorited" : "Favoriet", "Favorite" : "Favoriet", + "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken", "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is", "%s could not be renamed" : "%s kon niet worden hernoemd", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 156d8555baf..bd7df2569fa 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas", "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado", "%s could not be renamed" : "%s não pode ser renomeado", "Upload (max. %s)" : "Envio (max. %s)", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index caabd009e16..04f60e2c1dd 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas", "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado", "%s could not be renamed" : "%s não pode ser renomeado", "Upload (max. %s)" : "Envio (max. %s)", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index 57c37495e4e..08126e0d97f 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags", "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado", "%s could not be renamed" : "%s não pode ser renomeada", "Upload (max. %s)" : "Enviar (max. %s)", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index bd168dfb4b1..2622ae07f3e 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} e {files}", "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags", "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado", "%s could not be renamed" : "%s não pode ser renomeada", "Upload (max. %s)" : "Enviar (max. %s)", diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index 853cb02112d..2dd30d57eeb 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} и {files}", "Favorited" : "Избранное", "Favorite" : "Избранное", + "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка", "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.", "%s could not be renamed" : "%s не может быть переименован", "Upload (max. %s)" : "Загрузка (максимум %s)", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index 4852a8aebcd..08730639b6d 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} и {files}", "Favorited" : "Избранное", "Favorite" : "Избранное", + "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка", "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.", "%s could not be renamed" : "%s не может быть переименован", "Upload (max. %s)" : "Загрузка (максимум %s)", diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js index 3dd7dd1b27a..77c381261ba 100644 --- a/apps/files/l10n/sk_SK.js +++ b/apps/files/l10n/sk_SK.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} a {files}", "Favorited" : "Pridané k obľúbeným", "Favorite" : "Obľúbené", + "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe", "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný", "%s could not be renamed" : "%s nemohol byť premenovaný", "Upload (max. %s)" : "Nahrať (max. %s)", diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json index ab2cf57be75..953123dc576 100644 --- a/apps/files/l10n/sk_SK.json +++ b/apps/files/l10n/sk_SK.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} a {files}", "Favorited" : "Pridané k obľúbeným", "Favorite" : "Obľúbené", + "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe", "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný", "%s could not be renamed" : "%s nemohol byť premenovaný", "Upload (max. %s)" : "Nahrať (max. %s)", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index 73ed91ee7e3..46ce8b63ae2 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -43,6 +43,7 @@ OC.L10N.register( "WebDAV" : "WebDAV", "New" : "Нова", "Text file" : "текстуална датотека", + "New folder" : "Нова фасцикла", "Folder" : "фасцикла", "From link" : "Са везе", "Upload" : "Отпреми", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index e0529d980fc..e931c8e27c8 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -41,6 +41,7 @@ "WebDAV" : "WebDAV", "New" : "Нова", "Text file" : "текстуална датотека", + "New folder" : "Нова фасцикла", "Folder" : "фасцикла", "From link" : "Са везе", "Upload" : "Отпреми", diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index 6a497a4b3c1..f4dfcb87a2c 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} ve {files}", "Favorited" : "Sık kullanılanlara eklendi", "Favorite" : "Sık kullanılan", + "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu", "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı", "%s could not be renamed" : "%s yeniden adlandırılamadı", "Upload (max. %s)" : "Yükle (azami: %s)", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 7f23744c96a..ba8312a1eb8 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} ve {files}", "Favorited" : "Sık kullanılanlara eklendi", "Favorite" : "Sık kullanılan", + "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu", "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı", "%s could not be renamed" : "%s yeniden adlandırılamadı", "Upload (max. %s)" : "Yükle (azami: %s)", diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 83ac40ff889..2b7eab5cf39 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -79,6 +79,7 @@ OC.L10N.register( "{dirs} and {files}" : "{dirs} і {files}", "Favorited" : "Улюблений", "Favorite" : "Улюблений", + "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки", "%s could not be renamed as it has been deleted" : "%s не може бути перейменований, оскільки він видалений", "%s could not be renamed" : "%s не може бути перейменований", "Upload (max. %s)" : "Завантаження (макс. %s)", diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index 67c13571dd7..c756d224352 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -77,6 +77,7 @@ "{dirs} and {files}" : "{dirs} і {files}", "Favorited" : "Улюблений", "Favorite" : "Улюблений", + "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки", "%s could not be renamed as it has been deleted" : "%s не може бути перейменований, оскільки він видалений", "%s could not be renamed" : "%s не може бути перейменований", "Upload (max. %s)" : "Завантаження (макс. %s)", diff --git a/apps/files/settings.php b/apps/files/settings.php deleted file mode 100644 index 8687f013137..00000000000 --- a/apps/files/settings.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php - -/** -* ownCloud - ajax frontend -* -* @author Robin Appelman -* @copyright 2010 Robin Appelman icewind1991@gmail.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library 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 along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -// Check if we are a user -OCP\User::checkLoggedIn(); - -// Load the files we need -OCP\Util::addStyle( "files", "files" ); -OCP\Util::addscript( "files", "files" ); - -// Load the files -$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; - -$files = array(); -foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) { - $i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] ); - $files[] = $i; -} - -// Make breadcrumb -$breadcrumb = array(); -$pathtohere = "/"; -foreach( explode( "/", $dir ) as $i ) { - if( $i != "" ) { - $pathtohere .= "$i/"; - $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i ); - } -} - -// return template -$tmpl = new OCP\Template( "files", "index", "user" ); -$tmpl->assign( 'files', $files ); -$tmpl->assign( "breadcrumb", $breadcrumb ); -$tmpl->printPage(); diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js index e589640bbfb..544d7630833 100644 --- a/apps/files_encryption/l10n/de.js +++ b/apps/files_encryption/l10n/de.js @@ -23,7 +23,7 @@ OC.L10N.register( "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator", - "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", + "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet… Dies kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Missing requirements." : "Fehlende Vorraussetzungen", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json index 99646e4a76a..7ba97e39ac5 100644 --- a/apps/files_encryption/l10n/de.json +++ b/apps/files_encryption/l10n/de.json @@ -21,7 +21,7 @@ "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.", "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator", - "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", + "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet… Dies kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.", "Missing requirements." : "Fehlende Vorraussetzungen", "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.", diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js index 0ca865538eb..40d01773017 100644 --- a/apps/files_encryption/l10n/es.js +++ b/apps/files_encryption/l10n/es.js @@ -6,7 +6,7 @@ OC.L10N.register( "Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación", "Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada.", "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos", - "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!", + "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!", "Recovery key successfully disabled" : "Clave de recuperación deshabilitada", "Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación", "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación", @@ -19,7 +19,7 @@ OC.L10N.register( "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", - "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", + "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá se restableció durante su sesión. Por favor intente cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.", "Unknown error. Please check your system settings or contact your administrator" : "Error desconocido. Revise la configuración de su sistema o contacte a su administrador", @@ -46,7 +46,7 @@ OC.L10N.register( " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.", "Old log-in password" : "Contraseña de acceso antigua", "Current log-in password" : "Contraseña de acceso actual", - "Update Private Key Password" : "Actualizar Contraseña de Clave Privada", + "Update Private Key Password" : "Actualizar contraseña de clave privada", "Enable password recovery:" : "Habilitar la recuperación de contraseña:", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña" }, diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json index 29d109dcd89..d2fc38f135a 100644 --- a/apps/files_encryption/l10n/es.json +++ b/apps/files_encryption/l10n/es.json @@ -4,7 +4,7 @@ "Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación", "Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada.", "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos", - "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!", + "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!", "Recovery key successfully disabled" : "Clave de recuperación deshabilitada", "Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación", "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación", @@ -17,7 +17,7 @@ "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", - "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", + "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá se restableció durante su sesión. Por favor intente cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.", "Unknown error. Please check your system settings or contact your administrator" : "Error desconocido. Revise la configuración de su sistema o contacte a su administrador", @@ -44,7 +44,7 @@ " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.", "Old log-in password" : "Contraseña de acceso antigua", "Current log-in password" : "Contraseña de acceso actual", - "Update Private Key Password" : "Actualizar Contraseña de Clave Privada", + "Update Private Key Password" : "Actualizar contraseña de clave privada", "Enable password recovery:" : "Habilitar la recuperación de contraseña:", "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js index 6e9983159fd..b9654e5b25e 100644 --- a/apps/files_encryption/l10n/gl.js +++ b/apps/files_encryption/l10n/gl.js @@ -10,7 +10,7 @@ OC.L10N.register( "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación", "Please provide the old recovery password" : "Introduza a chave de recuperación antiga", "Please provide a new recovery password" : "Introduza a nova chave de recuperación", - "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación", + "Please repeat the new recovery password" : "Repita a nova chave de recuperación", "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente", "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.", "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.", diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json index 6295f339253..6c484fad83a 100644 --- a/apps/files_encryption/l10n/gl.json +++ b/apps/files_encryption/l10n/gl.json @@ -8,7 +8,7 @@ "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación", "Please provide the old recovery password" : "Introduza a chave de recuperación antiga", "Please provide a new recovery password" : "Introduza a nova chave de recuperación", - "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación", + "Please repeat the new recovery password" : "Repita a nova chave de recuperación", "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente", "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.", "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.", diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js index 3d6e8a50749..7d392923094 100644 --- a/apps/files_encryption/l10n/pt_PT.js +++ b/apps/files_encryption/l10n/pt_PT.js @@ -11,7 +11,7 @@ OC.L10N.register( "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga", "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação", "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", - "Password successfully changed." : "Senha alterada com sucesso.", + "Password successfully changed." : "Palavra-passe alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.", "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.", diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json index d2a34ec9d01..5f7d0a22f34 100644 --- a/apps/files_encryption/l10n/pt_PT.json +++ b/apps/files_encryption/l10n/pt_PT.json @@ -9,7 +9,7 @@ "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga", "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação", "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", - "Password successfully changed." : "Senha alterada com sucesso.", + "Password successfully changed." : "Palavra-passe alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.", "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.", diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js index e01a79f23c5..a5f70cf8589 100644 --- a/apps/files_encryption/l10n/uk.js +++ b/apps/files_encryption/l10n/uk.js @@ -29,6 +29,7 @@ OC.L10N.register( "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, переконайтеся, що OpenSSL разом з розширенням PHP включена і налаштована належним чином. В даний час, шифрування додатку було відключено.", "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.", + "Server-side Encryption" : "Серверне шіфрування", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):", "Recovery key password" : "Пароль ключа відновлення", diff --git a/apps/files_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json index 51dd3c26335..69c44021eae 100644 --- a/apps/files_encryption/l10n/uk.json +++ b/apps/files_encryption/l10n/uk.json @@ -27,6 +27,7 @@ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, переконайтеся, що OpenSSL разом з розширенням PHP включена і налаштована належним чином. В даний час, шифрування додатку було відключено.", "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:", "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.", + "Server-side Encryption" : "Серверне шіфрування", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):", "Recovery key password" : "Пароль ключа відновлення", diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index cb882463a1a..70f6b0159a6 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -18,6 +18,7 @@ OC::$CLASSPATH['OC\Files\Storage\SMB_OC'] = 'files_external/lib/smb_oc.php'; OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php'; OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php'; OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php'; +OC::$CLASSPATH['OC\Files\Storage\SFTP_Key'] = 'files_external/lib/sftp_key.php'; OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php'; @@ -196,5 +197,17 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', [ ], ]); +OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [ + 'backend' => 'SFTP with secret key login', + 'priority' => 100, + 'configuration' => array( + 'host' => (string)$l->t('Host'), + 'user' => (string)$l->t('Username'), + 'public_key' => (string)$l->t('Public key'), + 'private_key' => '#private_key', + 'root' => '&'.$l->t('Remote subfolder')), + 'custom' => 'sftp_key', + ] +); $mountProvider = new \OCA\Files_External\Config\ConfigAdapter(); \OC::$server->getMountProviderCollection()->registerProvider($mountProvider); diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php new file mode 100644 index 00000000000..b1605bb98a8 --- /dev/null +++ b/apps/files_external/appinfo/application.php @@ -0,0 +1,33 @@ +<?php +/** + * Copyright (c) 2015 University of Edinburgh <Ross.Nicoll@ed.ac.uk> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCA\Files_External\Appinfo; + +use \OCA\Files_External\Controller\AjaxController; +use \OCP\AppFramework\App; +use \OCP\IContainer; + + /** + * @package OCA\Files_External\Appinfo + */ +class Application extends App { + public function __construct(array $urlParams=array()) { + parent::__construct('files_external', $urlParams); + $container = $this->getContainer(); + + /** + * Controllers + */ + $container->registerService('AjaxController', function (IContainer $c) { + return new AjaxController( + $c->query('AppName'), + $c->query('Request') + ); + }); + } +} diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php index b852b34c5d3..5c7c4eca909 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -20,6 +20,23 @@ * */ +namespace OCA\Files_External\Appinfo; + +$application = new Application(); +$application->registerRoutes( + $this, + array( + 'routes' => array( + array( + 'name' => 'Ajax#getSshKeys', + 'url' => '/ajax/sftp_key.php', + 'verb' => 'POST', + 'requirements' => array() + ) + ) + ) +); + /** @var $this OC\Route\Router */ $this->create('files_external_add_mountpoint', 'ajax/addMountPoint.php') @@ -37,10 +54,11 @@ $this->create('files_external_dropbox', 'ajax/dropbox.php') $this->create('files_external_google', 'ajax/google.php') ->actionInclude('files_external/ajax/google.php'); + $this->create('files_external_list_applicable', '/applicable') ->actionInclude('files_external/ajax/applicable.php'); -OC_API::register('get', +\OC_API::register('get', '/apps/files_external/api/v1/mounts', array('\OCA\Files\External\Api', 'getUserMounts'), 'files_external'); diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php new file mode 100644 index 00000000000..141fc7817d2 --- /dev/null +++ b/apps/files_external/controller/ajaxcontroller.php @@ -0,0 +1,48 @@ +<?php +/** + * Copyright (c) 2015 University of Edinburgh <Ross.Nicoll@ed.ac.uk> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCA\Files_External\Controller; + +use OCP\AppFramework\Controller; +use OCP\IRequest; +use OCP\AppFramework\Http\JSONResponse; + +class AjaxController extends Controller { + public function __construct($appName, IRequest $request) { + parent::__construct($appName, $request); + } + + private function generateSshKeys() { + $rsa = new \Crypt_RSA(); + $rsa->setPublicKeyFormat(CRYPT_RSA_PUBLIC_FORMAT_OPENSSH); + $rsa->setPassword(\OC::$server->getConfig()->getSystemValue('secret', '')); + + $key = $rsa->createKey(); + // Replace the placeholder label with a more meaningful one + $key['publicKey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']); + + return $key; + } + + /** + * Generates an SSH public/private key pair. + * + * @NoAdminRequired + */ + public function getSshKeys() { + $key = $this->generateSshKeys(); + return new JSONResponse( + array('data' => array( + 'private_key' => $key['privatekey'], + 'public_key' => $key['publickey'] + ), + 'status' => 'success' + )); + } + +} diff --git a/apps/files_external/js/sftp_key.js b/apps/files_external/js/sftp_key.js new file mode 100644 index 00000000000..2b39628247c --- /dev/null +++ b/apps/files_external/js/sftp_key.js @@ -0,0 +1,53 @@ +$(document).ready(function() { + + $('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key').each(function() { + var tr = $(this); + var config = $(tr).find('.configuration'); + if ($(config).find('.sftp_key').length === 0) { + setupTableRow(tr, config); + } + }); + + // We can't catch the DOM elements being added, but we can pick up when + // they receive focus + $('#externalStorage').on('focus', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key', function() { + var tr = $(this); + var config = $(tr).find('.configuration'); + + if ($(config).find('.sftp_key').length === 0) { + setupTableRow(tr, config); + } + }); + + $('#externalStorage').on('click', '.sftp_key', function(event) { + event.preventDefault(); + var tr = $(this).parent().parent(); + generateKeys(tr); + }); + + function setupTableRow(tr, config) { + $(config).append($(document.createElement('input')).addClass('button sftp_key') + .attr('type', 'button') + .attr('value', t('files_external', 'Generate keys'))); + // If there's no private key, build one + if (0 === $(config).find('[data-parameter="private_key"]').val().length) { + generateKeys(tr); + } + } + + function generateKeys(tr) { + var config = $(tr).find('.configuration'); + + $.post(OC.filePath('files_external', 'ajax', 'sftp_key.php'), {}, function(result) { + if (result && result.status === 'success') { + $(config).find('[data-parameter="public_key"]').val(result.data.public_key); + $(config).find('[data-parameter="private_key"]').val(result.data.private_key); + OC.MountConfig.saveStorage(tr, function() { + // Nothing to do + }); + } else { + OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') ); + } + }); + } +}); diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index 561dbc3d29e..b89623a1673 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Uživatelské jméno jako sdílený adresář", "URL" : "URL", "Secure https://" : "Zabezpečené https://", + "Public key" : "Veřejný klíč", "Access granted" : "Přístup povolen", "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox", "Grant access" : "Povolit přístup", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.", "(group)" : "(skupina)", "Saved" : "Uloženo", + "Generate keys" : "Vytvořit klíče", + "Error generating key pair" : "Chyba při vytváření párů klíče", "<b>Note:</b> " : "<b>Poznámka:</b>", "and" : "a", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index 1af24e3c410..ceade182add 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -41,6 +41,7 @@ "Username as share" : "Uživatelské jméno jako sdílený adresář", "URL" : "URL", "Secure https://" : "Zabezpečené https://", + "Public key" : "Veřejný klíč", "Access granted" : "Přístup povolen", "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox", "Grant access" : "Povolit přístup", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.", "(group)" : "(skupina)", "Saved" : "Uloženo", + "Generate keys" : "Vytvořit klíče", + "Error generating key pair" : "Chyba při vytváření párů klíče", "<b>Note:</b> " : "<b>Poznámka:</b>", "and" : "a", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.", diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js index 00ccc703ffc..964fd4333c5 100644 --- a/apps/files_external/l10n/da.js +++ b/apps/files_external/l10n/da.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Brugernavn som deling", "URL" : "URL", "Secure https://" : "Sikker https://", + "Public key" : "Offentlig nøgle", "Access granted" : "Adgang godkendt", "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads", "Grant access" : "Godkend adgang", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", "Saved" : "Gemt", + "Generate keys" : "Opret nøgler.", + "Error generating key pair" : "Fejl under oprettelse af nøglepar", "<b>Note:</b> " : "<b>Note:</b> ", "and" : "og", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b> cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.", diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json index 60ca2a33c97..33c487caa3e 100644 --- a/apps/files_external/l10n/da.json +++ b/apps/files_external/l10n/da.json @@ -41,6 +41,7 @@ "Username as share" : "Brugernavn som deling", "URL" : "URL", "Secure https://" : "Sikker https://", + "Public key" : "Offentlig nøgle", "Access granted" : "Adgang godkendt", "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads", "Grant access" : "Godkend adgang", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", "Saved" : "Gemt", + "Generate keys" : "Opret nøgler.", + "Error generating key pair" : "Fejl under oprettelse af nøglepar", "<b>Note:</b> " : "<b>Note:</b> ", "and" : "og", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b> cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index b5775a0b0ef..f840bbbd0b5 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Benutzername als Freigabe", "URL" : "URL", "Secure https://" : "Sicherer HTTPS://", + "Public key" : "Öffentlicher Schlüssel", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Generate keys" : "Schlüssel erzeugen", + "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "<b>Note:</b> " : "<b>Hinweis:</b> ", "and" : "und", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index e6501b57a7d..7382a19fe1e 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -41,6 +41,7 @@ "Username as share" : "Benutzername als Freigabe", "URL" : "URL", "Secure https://" : "Sicherer HTTPS://", + "Public key" : "Öffentlicher Schlüssel", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Generate keys" : "Schlüssel erzeugen", + "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "<b>Note:</b> " : "<b>Hinweis:</b> ", "and" : "und", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 9122a8caa0a..422ce3df5d2 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Benutzername als Freigabe", "URL" : "Adresse", "Secure https://" : "Sicheres https://", + "Public key" : "Öffentlicher Schlüssel", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Generate keys" : "Schlüssel erzeugen", + "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "<b>Note:</b> " : "<b>Hinweis:</b> ", "and" : "und", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 5c8ba8a89ee..c783b0ab78f 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -41,6 +41,7 @@ "Username as share" : "Benutzername als Freigabe", "URL" : "Adresse", "Secure https://" : "Sicheres https://", + "Public key" : "Öffentlicher Schlüssel", "Access granted" : "Zugriff gestattet", "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", "Grant access" : "Zugriff gestatten", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Generate keys" : "Schlüssel erzeugen", + "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "<b>Note:</b> " : "<b>Hinweis:</b> ", "and" : "und", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index 1000a6d9303..c48830d9bc6 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος", "URL" : "URL", "Secure https://" : "Ασφαλής σύνδεση https://", + "Public key" : "Δημόσιο κλειδί", "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ", "Grant access" : "Παροχή πρόσβασης", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index b38b81c86d2..89019fca587 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -41,6 +41,7 @@ "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος", "URL" : "URL", "Secure https://" : "Ασφαλής σύνδεση https://", + "Public key" : "Δημόσιο κλειδί", "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ", "Grant access" : "Παροχή πρόσβασης", diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index a3772abdfd5..2ccf775f0be 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Username as share", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Public key", "Access granted" : "Access granted", "Error configuring Dropbox storage" : "Error configuring Dropbox storage", "Grant access" : "Grant access", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Saved" : "Saved", + "Generate keys" : "Generate keys", + "Error generating key pair" : "Error generating key pair", "<b>Note:</b> " : "<b>Note:</b> ", "and" : "and", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index 21a5881c94e..7e4415dbf7f 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -41,6 +41,7 @@ "Username as share" : "Username as share", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Public key", "Access granted" : "Access granted", "Error configuring Dropbox storage" : "Error configuring Dropbox storage", "Grant access" : "Grant access", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Saved" : "Saved", + "Generate keys" : "Generate keys", + "Error generating key pair" : "Error generating key pair", "<b>Note:</b> " : "<b>Note:</b> ", "and" : "and", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index bb1631d7ead..6c5a8f90217 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -43,15 +43,18 @@ OC.L10N.register( "Username as share" : "Nombre de usuario como compartir", "URL" : "URL", "Secure https://" : "—Seguro— https://", + "Public key" : "Clave pública", "Access granted" : "Acceso concedido", - "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox", + "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox", "Grant access" : "Conceder acceso", - "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive", + "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive", "Personal" : "Personal", "System" : "Sistema", "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.", "(group)" : "(grupo)", "Saved" : "Guardado", + "Generate keys" : "Generar claves", + "Error generating key pair" : "Error al generar el par de claves", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "y", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 7c86b244c32..dadfd7b983c 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -41,15 +41,18 @@ "Username as share" : "Nombre de usuario como compartir", "URL" : "URL", "Secure https://" : "—Seguro— https://", + "Public key" : "Clave pública", "Access granted" : "Acceso concedido", - "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox", + "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox", "Grant access" : "Conceder acceso", - "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive", + "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive", "Personal" : "Personal", "System" : "Sistema", "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.", "(group)" : "(grupo)", "Saved" : "Guardado", + "Generate keys" : "Generar claves", + "Error generating key pair" : "Error al generar el par de claves", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "y", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.", diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js index 0127452f697..d3e664e7b82 100644 --- a/apps/files_external/l10n/eu.js +++ b/apps/files_external/l10n/eu.js @@ -42,6 +42,7 @@ OC.L10N.register( "Username as share" : "Erabiltzaile izena elkarbanaketa bezala", "URL" : "URL", "Secure https://" : "https:// segurua", + "Public key" : "Gako publikoa", "Access granted" : "Sarrera baimendua", "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean", "Grant access" : "Baimendu sarrera", diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json index af7f8e4016b..3b817cebd97 100644 --- a/apps/files_external/l10n/eu.json +++ b/apps/files_external/l10n/eu.json @@ -40,6 +40,7 @@ "Username as share" : "Erabiltzaile izena elkarbanaketa bezala", "URL" : "URL", "Secure https://" : "https:// segurua", + "Public key" : "Gako publikoa", "Access granted" : "Sarrera baimendua", "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean", "Grant access" : "Baimendu sarrera", diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index c446c50b41c..291077b3533 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -37,6 +37,7 @@ OC.L10N.register( "Username as share" : "Käyttäjänimi jakona", "URL" : "Verkko-osoite", "Secure https://" : "Salattu https://", + "Public key" : "Julkinen avain", "Access granted" : "Pääsy sallittu", "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä", "Grant access" : "Salli pääsy", @@ -46,6 +47,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.", "(group)" : "(ryhmä)", "Saved" : "Tallennettu", + "Generate keys" : "Luo avaimet", + "Error generating key pair" : "Virhe luotaessa avainparia", "<b>Note:</b> " : "<b>Huomio:</b> ", "and" : "ja", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index c09b8bda1ba..2b8ba851f37 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -35,6 +35,7 @@ "Username as share" : "Käyttäjänimi jakona", "URL" : "Verkko-osoite", "Secure https://" : "Salattu https://", + "Public key" : "Julkinen avain", "Access granted" : "Pääsy sallittu", "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä", "Grant access" : "Salli pääsy", @@ -44,6 +45,8 @@ "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.", "(group)" : "(ryhmä)", "Saved" : "Tallennettu", + "Generate keys" : "Luo avaimet", + "Error generating key pair" : "Virhe luotaessa avainparia", "<b>Note:</b> " : "<b>Huomio:</b> ", "and" : "ja", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index cec7d16d752..09231d6aebc 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Nom d'utilisateur comme nom de partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", + "Public key" : "Clef publique", "Access granted" : "Accès autorisé", "Error configuring Dropbox storage" : "Erreur lors de la configuration du support de stockage Dropbox", "Grant access" : "Autoriser l'accès", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Saved" : "Sauvegarder", + "Generate keys" : "Génération des clés", + "Error generating key pair" : "Erreur lors de la génération des clés", "<b>Note:</b> " : "<b>Attention :</b>", "and" : " et ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index af1e7c22cd3..01a68810e03 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -41,6 +41,7 @@ "Username as share" : "Nom d'utilisateur comme nom de partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", + "Public key" : "Clef publique", "Access granted" : "Accès autorisé", "Error configuring Dropbox storage" : "Erreur lors de la configuration du support de stockage Dropbox", "Grant access" : "Autoriser l'accès", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Saved" : "Sauvegarder", + "Generate keys" : "Génération des clés", + "Error generating key pair" : "Erreur lors de la génération des clés", "<b>Note:</b> " : "<b>Attention :</b>", "and" : " et ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 8cfb4c39da3..b2a4770a389 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -43,15 +43,18 @@ OC.L10N.register( "Username as share" : "Nome de usuario como compartición", "URL" : "URL", "Secure https://" : "https:// seguro", + "Public key" : "Chave pública", "Access granted" : "Concedeuse acceso", "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox", "Grant access" : "Permitir o acceso", "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive", "Personal" : "Persoal", "System" : "Sistema", - "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.", + "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", "(group)" : "(grupo)", "Saved" : "Gardado", + "Generate keys" : "Xerar chaves", + "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index b58107282f9..08d1c457168 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -41,15 +41,18 @@ "Username as share" : "Nome de usuario como compartición", "URL" : "URL", "Secure https://" : "https:// seguro", + "Public key" : "Chave pública", "Access granted" : "Concedeuse acceso", "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox", "Grant access" : "Permitir o acceso", "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive", "Personal" : "Persoal", "System" : "Sistema", - "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.", + "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", "(group)" : "(grupo)", "Saved" : "Gardado", + "Generate keys" : "Xerar chaves", + "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index 590bc3b34d5..c4b262945ea 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Nama pengguna berbagi", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Kunci Public", "Access granted" : "Akses diberikan", "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox", "Grant access" : "Berikan hak akses", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index f77d87cacb2..da9f676d772 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -41,6 +41,7 @@ "Username as share" : "Nama pengguna berbagi", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Kunci Public", "Access granted" : "Akses diberikan", "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox", "Grant access" : "Berikan hak akses", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index af26cabed76..b80378b31ea 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Nome utente come condivisione", "URL" : "URL", "Secure https://" : "Sicuro https://", + "Public key" : "Chiave pubblica", "Access granted" : "Accesso consentito", "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox", "Grant access" : "Concedi l'accesso", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.", "(group)" : "(gruppo)", "Saved" : "Salvato", + "Generate keys" : "Genera la chiavi", + "Error generating key pair" : "Errore durante la generazione della coppia di chiavi", "<b>Note:</b> " : "<b>Nota:</b>", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index 678eb4c4b10..721a2a31d72 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -41,6 +41,7 @@ "Username as share" : "Nome utente come condivisione", "URL" : "URL", "Secure https://" : "Sicuro https://", + "Public key" : "Chiave pubblica", "Access granted" : "Accesso consentito", "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox", "Grant access" : "Concedi l'accesso", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.", "(group)" : "(gruppo)", "Saved" : "Salvato", + "Generate keys" : "Genera la chiavi", + "Error generating key pair" : "Errore durante la generazione della coppia di chiavi", "<b>Note:</b> " : "<b>Nota:</b>", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index f981ff6535f..17990d68e08 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "共有名", "URL" : "URL", "Secure https://" : "セキュア https://", + "Public key" : "公開鍵", "Access granted" : "アクセスは許可されました", "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー", "Grant access" : "アクセスを許可", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加", "(group)" : "(グループ)", "Saved" : "保存されました", + "Generate keys" : "キーを生成", + "Error generating key pair" : "キーペアの生成エラー", "<b>Note:</b> " : "<b>注意:</b> ", "and" : "と", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index d2cb64ad528..af817743f27 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -41,6 +41,7 @@ "Username as share" : "共有名", "URL" : "URL", "Secure https://" : "セキュア https://", + "Public key" : "公開鍵", "Access granted" : "アクセスは許可されました", "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー", "Grant access" : "アクセスを許可", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加", "(group)" : "(グループ)", "Saved" : "保存されました", + "Generate keys" : "キーを生成", + "Error generating key pair" : "キーペアの生成エラー", "<b>Note:</b> " : "<b>注意:</b> ", "and" : "と", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index f51456a099c..52c6eae4d66 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "사용자 이름으로 공유", "URL" : "URL", "Secure https://" : "보안 https://", + "Public key" : "공개 키", "Access granted" : "접근 허가됨", "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류", "Grant access" : "접근 권한 부여", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 7e1797cffc3..56192997590 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -41,6 +41,7 @@ "Username as share" : "사용자 이름으로 공유", "URL" : "URL", "Secure https://" : "보안 https://", + "Public key" : "공개 키", "Access granted" : "접근 허가됨", "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류", "Grant access" : "접근 권한 부여", diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index 1fa2f9a8c6e..a54327c8bfd 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Brukernavn som share", "URL" : "URL", "Secure https://" : "Sikker https://", + "Public key" : "Offentlig nøkkel", "Access granted" : "Tilgang innvilget", "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring", "Grant access" : "Gi tilgang", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 6ff246ee2ef..3af5e7a6320 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -41,6 +41,7 @@ "Username as share" : "Brukernavn som share", "URL" : "URL", "Secure https://" : "Sikker https://", + "Public key" : "Offentlig nøkkel", "Access granted" : "Tilgang innvilget", "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring", "Grant access" : "Gi tilgang", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index e50b5eb5a39..fc155288f1e 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Gebruikersnaam als share", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Publieke sleutel", "Access granted" : "Toegang toegestaan", "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag", "Grant access" : "Sta toegang toe", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Saved" : "Bewaard", + "Generate keys" : "Genereer sleutels", + "Error generating key pair" : "Fout bij genereren sleutelpaar", "<b>Note:</b> " : "<b>Let op:</b> ", "and" : "en", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index d6851215c59..ece7db68987 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -41,6 +41,7 @@ "Username as share" : "Gebruikersnaam als share", "URL" : "URL", "Secure https://" : "Secure https://", + "Public key" : "Publieke sleutel", "Access granted" : "Toegang toegestaan", "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag", "Grant access" : "Sta toegang toe", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Saved" : "Bewaard", + "Generate keys" : "Genereer sleutels", + "Error generating key pair" : "Fout bij genereren sleutelpaar", "<b>Note:</b> " : "<b>Let op:</b> ", "and" : "en", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index d1e330912cc..6aa5491fd8f 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Użytkownik jako zasób", "URL" : "URL", "Secure https://" : "Bezpieczny https://", + "Public key" : "Klucz publiczny", "Access granted" : "Dostęp do", "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox", "Grant access" : "Udziel dostępu", @@ -52,11 +53,14 @@ OC.L10N.register( "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", "(group)" : "(grupa)", "Saved" : "Zapisano", + "Generate keys" : "Wygeneruj klucze", + "Error generating key pair" : "Błąd podczas generowania pary kluczy", "<b>Note:</b> " : "<b>Uwaga:</b> ", "and" : "i", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", + "No external storage configured" : "Nie skonfigurowano żadnego zewnętrznego nośnika", "You can configure external storages in the personal settings" : "Możesz skonfigurować zewnętrzne zasoby w ustawieniach personalnych", "Name" : "Nazwa", "Storage type" : "Typ magazynu", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index 41800919db8..8d3c5502a63 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -41,6 +41,7 @@ "Username as share" : "Użytkownik jako zasób", "URL" : "URL", "Secure https://" : "Bezpieczny https://", + "Public key" : "Klucz publiczny", "Access granted" : "Dostęp do", "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox", "Grant access" : "Udziel dostępu", @@ -50,11 +51,14 @@ "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", "(group)" : "(grupa)", "Saved" : "Zapisano", + "Generate keys" : "Wygeneruj klucze", + "Error generating key pair" : "Błąd podczas generowania pary kluczy", "<b>Note:</b> " : "<b>Uwaga:</b> ", "and" : "i", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.", + "No external storage configured" : "Nie skonfigurowano żadnego zewnętrznego nośnika", "You can configure external storages in the personal settings" : "Możesz skonfigurować zewnętrzne zasoby w ustawieniach personalnych", "Name" : "Nazwa", "Storage type" : "Typ magazynu", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 6a46c8778d6..d4d7e582849 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Nome de usuário como compartilhado", "URL" : "URL", "Secure https://" : "https:// segura", + "Public key" : "Chave pública", "Access granted" : "Acesso concedido", "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox", "Grant access" : "Permitir acesso", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", "(group)" : "(grupo)", "Saved" : "Salvo", + "Generate keys" : "Gerar chaves", + "Error generating key pair" : "Erro ao gerar um par de chaves", "<b>Note:</b> " : "<b>Nota:</b>", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index 52b1827e1e7..006314eb034 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -41,6 +41,7 @@ "Username as share" : "Nome de usuário como compartilhado", "URL" : "URL", "Secure https://" : "https:// segura", + "Public key" : "Chave pública", "Access granted" : "Acesso concedido", "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox", "Grant access" : "Permitir acesso", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", "(group)" : "(grupo)", "Saved" : "Salvo", + "Generate keys" : "Gerar chaves", + "Error generating key pair" : "Erro ao gerar um par de chaves", "<b>Note:</b> " : "<b>Nota:</b>", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.", diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index 05c41ad4c7e..fe1472741db 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Utilizar nome de utilizador como partilha", "URL" : "URL", "Secure https://" : "https:// Seguro", + "Public key" : "Chave pública", "Access granted" : "Acesso autorizado", "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox", "Grant access" : "Conceder acesso", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", "Saved" : "Guardado", + "Generate keys" : "Gerar chaves", + "Error generating key pair" : "Erro ao gerar chave par", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.", diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index 12ea0ce4655..b5a08ccd654 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -41,6 +41,7 @@ "Username as share" : "Utilizar nome de utilizador como partilha", "URL" : "URL", "Secure https://" : "https:// Seguro", + "Public key" : "Chave pública", "Access granted" : "Acesso autorizado", "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox", "Grant access" : "Conceder acesso", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", "Saved" : "Guardado", + "Generate keys" : "Gerar chaves", + "Error generating key pair" : "Erro ao gerar chave par", "<b>Note:</b> " : "<b>Nota:</b> ", "and" : "e", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 0d35cb81dc7..483aa71e708 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Имя пользователя в качестве имени общего ресурса", "URL" : "Ссылка", "Secure https://" : "Безопасный https://", + "Public key" : "Открытый ключ", "Access granted" : "Доступ предоставлен", "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox", "Grant access" : "Предоставить доступ", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Saved" : "Сохранено", + "Generate keys" : "Создать ключи", + "Error generating key pair" : "Ошибка создания ключевой пары", "<b>Note:</b> " : "<b>Примечание:</b> ", "and" : "и", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 537a178853a..75705093a6e 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -41,6 +41,7 @@ "Username as share" : "Имя пользователя в качестве имени общего ресурса", "URL" : "Ссылка", "Secure https://" : "Безопасный https://", + "Public key" : "Открытый ключ", "Access granted" : "Доступ предоставлен", "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox", "Grant access" : "Предоставить доступ", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Saved" : "Сохранено", + "Generate keys" : "Создать ключи", + "Error generating key pair" : "Ошибка создания ключевой пары", "<b>Note:</b> " : "<b>Примечание:</b> ", "and" : "и", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.", diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js index e48c31008b7..e87d5d2a01c 100644 --- a/apps/files_external/l10n/sk_SK.js +++ b/apps/files_external/l10n/sk_SK.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Používateľské meno ako zdieľaný priečinok", "URL" : "URL", "Secure https://" : "Zabezpečené https://", + "Public key" : "Verejný kľúč", "Access granted" : "Prístup povolený", "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox", "Grant access" : "Povoliť prístup", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", "(group)" : "(skupina)", "Saved" : "Uložené", + "Generate keys" : "Vytvoriť kľúče", + "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", "<b>Note:</b> " : "<b>Poznámka:</b> ", "and" : "a", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.", diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json index e0d6c41b066..dc562373323 100644 --- a/apps/files_external/l10n/sk_SK.json +++ b/apps/files_external/l10n/sk_SK.json @@ -41,6 +41,7 @@ "Username as share" : "Používateľské meno ako zdieľaný priečinok", "URL" : "URL", "Secure https://" : "Zabezpečené https://", + "Public key" : "Verejný kľúč", "Access granted" : "Prístup povolený", "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox", "Grant access" : "Povoliť prístup", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", "(group)" : "(skupina)", "Saved" : "Uložené", + "Generate keys" : "Vytvoriť kľúče", + "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", "<b>Note:</b> " : "<b>Poznámka:</b> ", "and" : "a", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.", diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js index a4cbdd5b7a0..ea1dfe20c78 100644 --- a/apps/files_external/l10n/sv.js +++ b/apps/files_external/l10n/sv.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Användarnamn till utdelning", "URL" : "URL", "Secure https://" : "Säker https://", + "Public key" : "Publik nyckel", "Access granted" : "Åtkomst beviljad", "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox", "Grant access" : "Bevilja åtkomst", diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json index c2bc9e07305..42cd0251a3e 100644 --- a/apps/files_external/l10n/sv.json +++ b/apps/files_external/l10n/sv.json @@ -41,6 +41,7 @@ "Username as share" : "Användarnamn till utdelning", "URL" : "URL", "Secure https://" : "Säker https://", + "Public key" : "Publik nyckel", "Access granted" : "Åtkomst beviljad", "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox", "Grant access" : "Bevilja åtkomst", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index 012e0651f8a..1a6ad558570 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Paylaşım olarak kullanıcı adı", "URL" : "URL", "Secure https://" : "Güvenli https://", + "Public key" : "Ortak anahtar", "Access granted" : "Giriş kabul edildi", "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası", "Grant access" : "Erişimi sağla", @@ -52,6 +53,8 @@ OC.L10N.register( "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.", "(group)" : "(grup)", "Saved" : "Kaydedildi", + "Generate keys" : "Anahtarlar üret", + "Error generating key pair" : "Anahtar çifti üretirken hata", "<b>Note:</b> " : "<b>Not:</b> ", "and" : "ve", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 68aed802f7e..a790ae3a113 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -41,6 +41,7 @@ "Username as share" : "Paylaşım olarak kullanıcı adı", "URL" : "URL", "Secure https://" : "Güvenli https://", + "Public key" : "Ortak anahtar", "Access granted" : "Giriş kabul edildi", "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası", "Grant access" : "Erişimi sağla", @@ -50,6 +51,8 @@ "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.", "(group)" : "(grup)", "Saved" : "Kaydedildi", + "Generate keys" : "Anahtarlar üret", + "Error generating key pair" : "Anahtar çifti üretirken hata", "<b>Note:</b> " : "<b>Not:</b> ", "and" : "ve", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js index 2b1cf3e0ee3..438359cd979 100644 --- a/apps/files_external/l10n/uk.js +++ b/apps/files_external/l10n/uk.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Ім'я для відкритого доступу", "URL" : "URL", "Secure https://" : "Захищений https://", + "Public key" : "Відкритий ключ", "Access granted" : "Доступ дозволено", "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox", "Grant access" : "Дозволити доступ", diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json index 55469685ac9..2df70501365 100644 --- a/apps/files_external/l10n/uk.json +++ b/apps/files_external/l10n/uk.json @@ -41,6 +41,7 @@ "Username as share" : "Ім'я для відкритого доступу", "URL" : "URL", "Secure https://" : "Захищений https://", + "Public key" : "Відкритий ключ", "Access granted" : "Доступ дозволено", "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox", "Grant access" : "Дозволити доступ", diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index f6c56669734..2a762ad068f 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -20,7 +20,7 @@ class SFTP extends \OC\Files\Storage\Common { /** * @var \Net_SFTP */ - private $client; + protected $client; private static $tempFiles = array(); @@ -42,7 +42,8 @@ class SFTP extends \OC\Files\Storage\Common { $this->host = substr($this->host, $proto+3); } $this->user = $params['user']; - $this->password = $params['password']; + $this->password + = isset($params['password']) ? $params['password'] : ''; $this->root = isset($params['root']) ? $this->cleanPath($params['root']) : '/'; @@ -101,6 +102,18 @@ class SFTP extends \OC\Files\Storage\Common { return 'sftp::' . $this->user . '@' . $this->host . '/' . $this->root; } + public function getHost() { + return $this->host; + } + + public function getRoot() { + return $this->root; + } + + public function getUser() { + return $this->user; + } + /** * @param string $path */ @@ -121,7 +134,7 @@ class SFTP extends \OC\Files\Storage\Common { return false; } - private function writeHostKeys($keys) { + protected function writeHostKeys($keys) { try { $keyPath = $this->hostKeysPath(); if ($keyPath && file_exists($keyPath)) { @@ -137,7 +150,7 @@ class SFTP extends \OC\Files\Storage\Common { return false; } - private function readHostKeys() { + protected function readHostKeys() { try { $keyPath = $this->hostKeysPath(); if (file_exists($keyPath)) { diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php new file mode 100644 index 00000000000..6113f88a8ff --- /dev/null +++ b/apps/files_external/lib/sftp_key.php @@ -0,0 +1,194 @@ +<?php +/** + * Copyright (c) 2014, 2015 University of Edinburgh <Ross.Nicoll@ed.ac.uk> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ +namespace OC\Files\Storage; + +/** +* Uses phpseclib's Net_SFTP class and the Net_SFTP_Stream stream wrapper to +* provide access to SFTP servers. +*/ +class SFTP_Key extends \OC\Files\Storage\SFTP { + private $publicKey; + private $privateKey; + + public function __construct($params) { + parent::__construct($params); + $this->publicKey = $params['public_key']; + $this->privateKey = $params['private_key']; + } + + /** + * Returns the connection. + * + * @return \Net_SFTP connected client instance + * @throws \Exception when the connection failed + */ + public function getConnection() { + if (!is_null($this->client)) { + return $this->client; + } + + $hostKeys = $this->readHostKeys(); + $this->client = new \Net_SFTP($this->getHost()); + + // The SSH Host Key MUST be verified before login(). + $currentHostKey = $this->client->getServerPublicHostKey(); + if (array_key_exists($this->getHost(), $hostKeys)) { + if ($hostKeys[$this->getHost()] !== $currentHostKey) { + throw new \Exception('Host public key does not match known key'); + } + } else { + $hostKeys[$this->getHost()] = $currentHostKey; + $this->writeHostKeys($hostKeys); + } + + $key = $this->getPrivateKey(); + if (is_null($key)) { + throw new \Exception('Secret key could not be loaded'); + } + if (!$this->client->login($this->getUser(), $key)) { + throw new \Exception('Login failed'); + } + return $this->client; + } + + /** + * Returns the private key to be used for authentication to the remote server. + * + * @return \Crypt_RSA instance or null in case of a failure to load the key. + */ + private function getPrivateKey() { + $key = new \Crypt_RSA(); + $key->setPassword(\OC::$server->getConfig()->getSystemValue('secret', '')); + if (!$key->loadKey($this->privateKey)) { + // Should this exception rather than return null? + return null; + } + return $key; + } + + /** + * Throws an exception if the provided host name/address is invalid (cannot be resolved + * and is not an IPv4 address). + * + * @return true; never returns in case of a problem, this return value is used just to + * make unit tests happy. + */ + public function assertHostAddressValid($hostname) { + // TODO: Should handle IPv6 addresses too + if (!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $hostname) && gethostbyname($hostname) === $hostname) { + // Hostname is not an IPv4 address and cannot be resolved via DNS + throw new \InvalidArgumentException('Cannot resolve hostname.'); + } + return true; + } + + /** + * Throws an exception if the provided port number is invalid (cannot be resolved + * and is not an IPv4 address). + * + * @return true; never returns in case of a problem, this return value is used just to + * make unit tests happy. + */ + public function assertPortNumberValid($port) { + if (!preg_match('/^\d+$/', $port)) { + throw new \InvalidArgumentException('Port number must be a number.'); + } + if ($port < 0 || $port > 65535) { + throw new \InvalidArgumentException('Port number must be between 0 and 65535 inclusive.'); + } + return true; + } + + /** + * Replaces anything that's not an alphanumeric character or "." in a hostname + * with "_", to make it safe for use as part of a file name. + */ + protected function sanitizeHostName($name) { + return preg_replace('/[^\d\w\._]/', '_', $name); + } + + /** + * Replaces anything that's not an alphanumeric character or "_" in a username + * with "_", to make it safe for use as part of a file name. + */ + protected function sanitizeUserName($name) { + return preg_replace('/[^\d\w_]/', '_', $name); + } + + public function test() { + if (empty($this->getHost())) { + \OC::$server->getLogger()->warning('Hostname has not been specified'); + return false; + } + if (empty($this->getUser())) { + \OC::$server->getLogger()->warning('Username has not been specified'); + return false; + } + if (!isset($this->privateKey)) { + \OC::$server->getLogger()->warning('Private key was missing from the request'); + return false; + } + + // Sanity check the host + $hostParts = explode(':', $this->getHost()); + try { + if (count($hostParts) == 1) { + $hostname = $hostParts[0]; + $this->assertHostAddressValid($hostname); + } else if (count($hostParts) == 2) { + $hostname = $hostParts[0]; + $this->assertHostAddressValid($hostname); + $this->assertPortNumberValid($hostParts[1]); + } else { + throw new \Exception('Host connection string is invalid.'); + } + } catch(\Exception $e) { + \OC::$server->getLogger()->warning($e->getMessage()); + return false; + } + + // Validate the key + $key = $this->getPrivateKey(); + if (is_null($key)) { + \OC::$server->getLogger()->warning('Secret key could not be loaded'); + return false; + } + + try { + if ($this->getConnection()->nlist() === false) { + return false; + } + } catch(\Exception $e) { + // We should be throwing a more specific error, so we're not just catching + // Exception here + \OC::$server->getLogger()->warning($e->getMessage()); + return false; + } + + // Save the key somewhere it can easily be extracted later + if (\OC::$server->getUserSession()->getUser()) { + $view = new \OC\Files\View('/'.\OC::$server->getUserSession()->getUser()->getUId().'/files_external/sftp_keys'); + if (!$view->is_dir('')) { + if (!$view->mkdir('')) { + \OC::$server->getLogger()->warning('Could not create secret key directory.'); + return false; + } + } + $key_filename = $this->sanitizeUserName($this->getUser()).'@'.$this->sanitizeHostName($hostname).'.pub'; + $key_file = $view->fopen($key_filename, "w"); + if ($key_file) { + fwrite($key_file, $this->publicKey); + fclose($key_file); + } else { + \OC::$server->getLogger()->warning('Could not write secret key file.'); + } + } + + return true; + } +} diff --git a/apps/files_external/tests/README.md b/apps/files_external/tests/README.md new file mode 100644 index 00000000000..35a0232434e --- /dev/null +++ b/apps/files_external/tests/README.md @@ -0,0 +1,58 @@ +# How to run the files external unit tests + +## Components + +The files_external relies - as the name already says - on external file system +providers. To test easily against such a provider we use some scripts to setup +a provider (and of course also cleanup that provider). Those scripts can be +found in the `tests/env` folder of the files_external app. + +### Naming Conventions + +The current implementation supports a script that starts with `start-` for the +setup step which is executed before the PHPUnit run and an optional script +starting with `stop-` (and have the same ending as the start script) to cleanup +the provider. For example: `start-webdav-ownCloud.sh` and +`stop-webdav-ownCloud.sh`. As a second requirement after this prefix there has +to be the name of the backend test suite. In the above example the test suite +`tests/backends/webdav.php` is used. The last part is a name that can be chosen +freely. + +## Hands-on way of unit test execution + +Run all files_external unit tests by invoking the following in the ownCloud +core root folder: + + ./autotest-external.sh + +This script supports to get passed a database as first argument: + + ./autotest-external.sh sqlite + +You can also pass the name of the external file system provider as a second +argument that should be executed. This is the name of the script without the +prefix `start-` (or `stop-`) and without the extension `.sh` from the above +mentioned components in `test/env`. So if you want to start the WebDAV backend +tests against an ownCloud instance you can run following: + + ./autotest-external.sh sqlite webdav-ownCloud + +This runs the script `start-webdav-ownCloud.sh` from the `tests/env` folder, +then runs the unit test suite from `backends/webdav.php` (because the middle part of +the name of the script is `webdav`) and finally tries to call +`stop-webdav-ownCloud.sh` for cleanup purposes. + +## The more manual way of unit test execution + +If you want to debug your external storage provider, you maybe don't want to +fire it up, execute the unit tests and clean everything up for each debugging +step. In this case you can simply start the external storage provider instance +and run the unit test multiple times against the instance for debugging purposes. +To do this you just need to follow these steps (from within +`apps/files_external/tests`): + + 1. run the start step (`env/start-BACKEND-NAME.sh`) or start the environment by + hand (i.e. setting up an instance manually in a virtual box) + 2. run the unit tests with following command (you can repeat that step multiple times): + `phpunit --configuration ../../../tests/phpunit-autotest-external.xml backends/BACKEND.php` + 3. call the cleanup script (`env/stop-BACKEND-NAME.sh`) or cleanup by hand diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php new file mode 100644 index 00000000000..4e55cc37ca3 --- /dev/null +++ b/apps/files_external/tests/backends/sftp_key.php @@ -0,0 +1,85 @@ +<?php + +/** + * ownCloud + * + * @author Henrik Kjölhede + * @copyright 2013 Henrik Kjölhede hkjolhede@gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library 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 along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +namespace Test\Files\Storage; + +class SFTP_Key extends Storage { + private $config; + + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); + $this->config = include('files_external/tests/config.php'); + if ( ! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) { + $this->markTestSkipped('SFTP with key backend not configured'); + } + $this->config['sftp_key']['root'] .= '/' . $id; //make sure we have an new empty folder to work in + $this->instance = new \OC\Files\Storage\SFTP_Key($this->config['sftp_key']); + $this->instance->mkdir('/'); + } + + protected function tearDown() { + if ($this->instance) { + $this->instance->rmdir('/'); + } + + parent::tearDown(); + } + + /** + * @expectedException InvalidArgumentException + */ + public function testInvalidAddressShouldThrowException() { + # I'd use example.com for this, but someone decided to break the spec and make it resolve + $this->instance->assertHostAddressValid('notarealaddress...'); + } + + public function testValidAddressShouldPass() { + $this->assertTrue($this->instance->assertHostAddressValid('localhost')); + } + + /** + * @expectedException InvalidArgumentException + */ + public function testNegativePortNumberShouldThrowException() { + $this->instance->assertPortNumberValid('-1'); + } + + /** + * @expectedException InvalidArgumentException + */ + public function testNonNumericalPortNumberShouldThrowException() { + $this->instance->assertPortNumberValid('a'); + } + + /** + * @expectedException InvalidArgumentException + */ + public function testHighPortNumberShouldThrowException() { + $this->instance->assertPortNumberValid('65536'); + } + + public function testValidPortNumberShouldPass() { + $this->assertTrue($this->instance->assertPortNumberValid('22222')); + } +} diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index 62aff4d1bc1..cf9cdfeead8 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -88,5 +88,13 @@ return array( 'user'=>'test', 'password'=>'test', 'root'=>'/test' - ) + ), + 'sftp_key' => array ( + 'run'=>false, + 'host'=>'localhost', + 'user'=>'test', + 'public_key'=>'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDJPTvz3OLonF2KSGEKP/nd4CPmRYvemG2T4rIiNYjDj0U5y+2sKEWbjiUlQl2bsqYuVoJ+/UNJlGQbbZ08kQirFeo1GoWBzqioaTjUJfbLN6TzVVKXxR9YIVmH7Ajg2iEeGCndGgbmnPfj+kF9TR9IH8vMVvtubQwf7uEwB0ALhw== phpseclib-generated-key', + 'private_key'=>'test', + 'root'=>'/test' + ), ); diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index b107bc7f3e1..4404d46ea16 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -33,7 +33,7 @@ OC.L10N.register( "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti", "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s", "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s", - "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", + "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 02f7e2ab24a..4bc6d936c78 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -31,7 +31,7 @@ "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti", "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s", "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s", - "This share is password-protected" : "Este elemento compartido esta protegido por contraseña", + "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 36967ee11dd..ada524f78cd 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -2,10 +2,10 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor", - "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.", + "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres incorrectos", "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel", - "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo", - "Storage not valid" : "Almacenamento non válido", + "Could not authenticate to remote share, password might be wrong" : "Non foi pisíbel autenticar na compartición remota, o contrasinal podería ser erróneo", + "Storage not valid" : "Almacenamento incorrecto", "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota", "Shared with you" : "Compartido con vostede", "Shared with others" : "Compartido con outros", @@ -50,7 +50,7 @@ OC.L10N.register( "Download %s" : "Descargar %s", "Direct link" : "Ligazón directa", "Federated Cloud Sharing" : "Compartición de nube federada", - "Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores" + "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index 81d97bfdcec..59355f44acf 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -1,9 +1,9 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor", - "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.", + "The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres incorrectos", "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel", - "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo", - "Storage not valid" : "Almacenamento non válido", + "Could not authenticate to remote share, password might be wrong" : "Non foi pisíbel autenticar na compartición remota, o contrasinal podería ser erróneo", + "Storage not valid" : "Almacenamento incorrecto", "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota", "Shared with you" : "Compartido con vostede", "Shared with others" : "Compartido con outros", @@ -48,7 +48,7 @@ "Download %s" : "Descargar %s", "Direct link" : "Ligazón directa", "Federated Cloud Sharing" : "Compartición de nube federada", - "Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores" + "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 8608d02f617..ad9481917c7 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -4,6 +4,7 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません", "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。", "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書", + "Could not authenticate to remote share, password might be wrong" : "リモート共有が認証できませんでした，パスワードが間違っているかもしれません", "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", "Shared with you" : "他ユーザーがあなたと共有中", @@ -27,6 +28,9 @@ OC.L10N.register( "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき", "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき", "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。", + "%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 がダウンロードされました", "This share is password-protected" : "この共有はパスワードで保護されています", diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 017596b2172..44f376b4899 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -2,6 +2,7 @@ "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません", "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。", "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書", + "Could not authenticate to remote share, password might be wrong" : "リモート共有が認証できませんでした，パスワードが間違っているかもしれません", "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", "Shared with you" : "他ユーザーがあなたと共有中", @@ -25,6 +26,9 @@ "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき", "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき", "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。", + "%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 がダウンロードされました", "This share is password-protected" : "この共有はパスワードで保護されています", diff --git a/apps/files_versions/l10n/de.js b/apps/files_versions/l10n/de.js index 71905567b34..012167a7329 100644 --- a/apps/files_versions/l10n/de.js +++ b/apps/files_versions/l10n/de.js @@ -4,7 +4,7 @@ OC.L10N.register( "Could not revert: %s" : "Konnte %s nicht zurücksetzen", "Versions" : "Versionen", "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", - "More versions..." : "Weitere Versionen...", + "More versions..." : "Weitere Versionen…", "No other versions available" : "Keine anderen Versionen verfügbar", "Restore" : "Wiederherstellen" }, diff --git a/apps/files_versions/l10n/de.json b/apps/files_versions/l10n/de.json index f6feac199e2..74d7f066df8 100644 --- a/apps/files_versions/l10n/de.json +++ b/apps/files_versions/l10n/de.json @@ -2,7 +2,7 @@ "Could not revert: %s" : "Konnte %s nicht zurücksetzen", "Versions" : "Versionen", "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", - "More versions..." : "Weitere Versionen...", + "More versions..." : "Weitere Versionen…", "No other versions available" : "Keine anderen Versionen verfügbar", "Restore" : "Wiederherstellen" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_versions/l10n/de_DE.js b/apps/files_versions/l10n/de_DE.js index 0b8e5cdeac7..012167a7329 100644 --- a/apps/files_versions/l10n/de_DE.js +++ b/apps/files_versions/l10n/de_DE.js @@ -4,7 +4,7 @@ OC.L10N.register( "Could not revert: %s" : "Konnte %s nicht zurücksetzen", "Versions" : "Versionen", "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", - "More versions..." : "Mehrere Versionen...", + "More versions..." : "Weitere Versionen…", "No other versions available" : "Keine anderen Versionen verfügbar", "Restore" : "Wiederherstellen" }, diff --git a/apps/files_versions/l10n/de_DE.json b/apps/files_versions/l10n/de_DE.json index 6e5a8ec3bdb..74d7f066df8 100644 --- a/apps/files_versions/l10n/de_DE.json +++ b/apps/files_versions/l10n/de_DE.json @@ -2,7 +2,7 @@ "Could not revert: %s" : "Konnte %s nicht zurücksetzen", "Versions" : "Versionen", "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", - "More versions..." : "Mehrere Versionen...", + "More versions..." : "Weitere Versionen…", "No other versions available" : "Keine anderen Versionen verfügbar", "Restore" : "Wiederherstellen" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index a007f589ef6..692751d0451 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -4,7 +4,7 @@ OC.L10N.register( "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.", "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig, aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details können Sie in den Logdateien nachlesen.", "No action specified" : "Keine Aktion spezifiziert", "No configuration specified" : "Keine Konfiguration spezifiziert", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 5fdb285a863..1b8b3d4cea2 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -2,7 +2,7 @@ "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.", "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig, aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details können Sie in den Logdateien nachlesen.", "No action specified" : "Keine Aktion spezifiziert", "No configuration specified" : "Keine Konfiguration spezifiziert", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index 731213be81c..ccf40aa2ade 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -4,8 +4,8 @@ OC.L10N.register( "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.", "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor", "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.", - "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, busque en el log para más detalles.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.", + "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.", "No action specified" : "No se ha especificado la acción", "No configuration specified" : "No se ha especificado la configuración", "No data specified" : "No se han especificado los datos", @@ -21,7 +21,7 @@ OC.L10N.register( "Please specify a Base DN" : "Especifique un DN base", "Could not determine Base DN" : "No se pudo determinar un DN base", "Please specify the port" : "Especifique el puerto", - "Configuration OK" : "Configuración Correcta", + "Configuration OK" : "Configuración correcta", "Configuration incorrect" : "Configuración Incorrecta", "Configuration incomplete" : "Configuración incompleta", "Select groups" : "Seleccionar grupos", @@ -80,19 +80,19 @@ OC.L10N.register( "LDAP" : "LDAP", "Expert" : "Experto", "Advanced" : "Avanzado", - "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", + "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pídale a su administrador del sistema que desactive uno de ellos.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.", "Connection Settings" : "Configuración de conexión", "Configuration Active" : "Configuracion activa", - "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.", - "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)", + "When unchecked, this configuration will be skipped." : "Cuando esté desmarcado, esta configuración se omitirá", + "Backup (Replica) Host" : "Servidor de copia de seguridad (Réplica)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.", "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)", "Disable Main Server" : "Deshabilitar servidor principal", "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.", "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", + "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilícelo únicamente para pruebas! Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s.", "Cache Time-To-Live" : "Cache TTL", "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.", "Directory Settings" : "Configuracion de directorio", @@ -106,7 +106,7 @@ OC.L10N.register( "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.", "Base Group Tree" : "Árbol base de grupo", "One Group Base DN per line" : "Un DN Base de Grupo por línea", - "Group Search Attributes" : "Atributos de busqueda de grupo", + "Group Search Attributes" : "Atributos de búsqueda de grupo", "Group-Member association" : "Asociación Grupo-Miembro", "Nested Groups" : "Grupos anidados", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se active, se permitirán grupos que contengan otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).", @@ -121,7 +121,7 @@ OC.L10N.register( "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.", "Internal Username" : "Nombre de usuario interno", "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.", - "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:", + "Internal Username Attribute:" : "Atributo de nombre de usuario interno:", "Override UUID detection" : "Sobrescribir la detección UUID", "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.", "UUID Attribute for Users:" : "Atributo UUID para usuarios:", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index b5a07d210a4..410a139075d 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -2,8 +2,8 @@ "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.", "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor", "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.", - "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, busque en el log para más detalles.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.", + "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.", "No action specified" : "No se ha especificado la acción", "No configuration specified" : "No se ha especificado la configuración", "No data specified" : "No se han especificado los datos", @@ -19,7 +19,7 @@ "Please specify a Base DN" : "Especifique un DN base", "Could not determine Base DN" : "No se pudo determinar un DN base", "Please specify the port" : "Especifique el puerto", - "Configuration OK" : "Configuración Correcta", + "Configuration OK" : "Configuración correcta", "Configuration incorrect" : "Configuración Incorrecta", "Configuration incomplete" : "Configuración incompleta", "Select groups" : "Seleccionar grupos", @@ -78,19 +78,19 @@ "LDAP" : "LDAP", "Expert" : "Experto", "Advanced" : "Avanzado", - "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", + "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pídale a su administrador del sistema que desactive uno de ellos.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.", "Connection Settings" : "Configuración de conexión", "Configuration Active" : "Configuracion activa", - "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.", - "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)", + "When unchecked, this configuration will be skipped." : "Cuando esté desmarcado, esta configuración se omitirá", + "Backup (Replica) Host" : "Servidor de copia de seguridad (Réplica)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.", "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)", "Disable Main Server" : "Deshabilitar servidor principal", "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.", "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", + "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilícelo únicamente para pruebas! Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s.", "Cache Time-To-Live" : "Cache TTL", "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.", "Directory Settings" : "Configuracion de directorio", @@ -104,7 +104,7 @@ "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.", "Base Group Tree" : "Árbol base de grupo", "One Group Base DN per line" : "Un DN Base de Grupo por línea", - "Group Search Attributes" : "Atributos de busqueda de grupo", + "Group Search Attributes" : "Atributos de búsqueda de grupo", "Group-Member association" : "Asociación Grupo-Miembro", "Nested Groups" : "Grupos anidados", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se active, se permitirán grupos que contengan otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).", @@ -119,7 +119,7 @@ "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.", "Internal Username" : "Nombre de usuario interno", "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.", - "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:", + "Internal Username Attribute:" : "Atributo de nombre de usuario interno:", "Override UUID detection" : "Sobrescribir la detección UUID", "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.", "UUID Attribute for Users:" : "Atributo UUID para usuarios:", diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js index a2359d41ebc..246e9950b3d 100644 --- a/apps/user_ldap/l10n/gl.js +++ b/apps/user_ldap/l10n/gl.js @@ -20,7 +20,7 @@ OC.L10N.register( "Error" : "Erro", "Please specify a Base DN" : "Por favor indique un DN base", "Could not determine Base DN" : "Non se puido determinar o DN base", - "Please specify the port" : "Por favor indique un porto", + "Please specify the port" : "Especifique un porto", "Configuration OK" : "Configuración correcta", "Configuration incorrect" : "Configuración incorrecta", "Configuration incomplete" : "Configuración incompleta", diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json index 0f6d4e00cdf..9e8fceaa250 100644 --- a/apps/user_ldap/l10n/gl.json +++ b/apps/user_ldap/l10n/gl.json @@ -18,7 +18,7 @@ "Error" : "Erro", "Please specify a Base DN" : "Por favor indique un DN base", "Could not determine Base DN" : "Non se puido determinar o DN base", - "Please specify the port" : "Por favor indique un porto", + "Please specify the port" : "Especifique un porto", "Configuration OK" : "Configuración correcta", "Configuration incorrect" : "Configuración incorrecta", "Configuration incomplete" : "Configuración incompleta", diff --git a/config/config.sample.php b/config/config.sample.php index 0f8abb5d5e5..090e8f1f9fa 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -669,6 +669,10 @@ $CONFIG = array( * - OC\Preview\StarOffice * - OC\Preview\SVG * - OC\Preview\TIFF + * + * .. note:: Troubleshooting steps for the MS Word previews are available + * at the :doc:`collaborative_documents_configuration` section + * of the Administrators Manual. * * The following providers are not available in Microsoft Windows: * diff --git a/core/js/js.js b/core/js/js.js index 234cc328dfb..7ff010eca0a 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -117,7 +117,7 @@ var OC={ /** * Generates the absolute url for the given relative url, which can contain parameters. * @param {string} url - * @param params + * @param [params] params * @return {string} Absolute URL for the given relative URL */ generateUrl: function(url, params) { @@ -1213,7 +1213,7 @@ $.fn.filterAttr = function(attr_name, attr_value) { function humanFileSize(size, skipSmallSizes) { var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order - var order = size?Math.floor(Math.log(size) / Math.log(1024)):0; + var order = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0; // Stay in range of the byte sizes that are defined order = Math.min(humanList.length - 1, order); var readableFormat = humanList[order]; diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index d283839d7e7..159c3743662 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -465,6 +465,8 @@ describe('Core base tests', function() { it('renders file sizes with the correct unit', function() { var data = [ [0, '0 B'], + ["0", '0 B'], + ["A", 'NaN B'], [125, '125 B'], [128000, '125 kB'], [128000000, '122.1 MB'], diff --git a/core/l10n/de.js b/core/l10n/de.js index 78e9f741de5..cb44f33648c 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -34,7 +34,7 @@ OC.L10N.register( "November" : "November", "December" : "Dezember", "Settings" : "Einstellungen", - "Saving..." : "Speichern...", + "Saving..." : "Speichern…", "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.", "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." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse vesandt worden. Wenn Du ihn innerhalb eines annehmbaren Zeitraums nicht empfängst, prüfe Deine Spam-Ordner.<br>Sollte er sich nicht darin befinden, frage bei Deinem lokalen Administrator nach.", "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?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?", @@ -76,7 +76,7 @@ OC.L10N.register( "Error while changing permissions" : "Fehler beim Ändern der Rechte", "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt", "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt", - "Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....", + "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…", "Share link" : "Link teilen", "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen", "Link" : "Link", @@ -89,7 +89,7 @@ OC.L10N.register( "Set expiration date" : "Setze ein Ablaufdatum", "Expiration" : "Ablaufdatum", "Expiration date" : "Ablaufdatum", - "Adding user..." : "Benutzer wird hinzugefügt …", + "Adding user..." : "Benutzer wird hinzugefügt…", "group" : "Gruppe", "remote" : "Entfernte Freigabe", "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt", @@ -105,7 +105,7 @@ OC.L10N.register( "Password protected" : "Durch ein Passwort geschützt", "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", + "Sending ..." : "Senden…", "Email sent" : "E-Mail wurde verschickt", "Warning" : "Warnung", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", @@ -194,7 +194,7 @@ OC.L10N.register( "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", "Finish setup" : "Installation abschließen", - "Finishing …" : "Abschließen ...", + "Finishing …" : "Abschließen…", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.", "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.", "Log out" : "Abmelden", diff --git a/core/l10n/de.json b/core/l10n/de.json index 0aa0bfd50e0..ea95e9737bb 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -32,7 +32,7 @@ "November" : "November", "December" : "Dezember", "Settings" : "Einstellungen", - "Saving..." : "Speichern...", + "Saving..." : "Speichern…", "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.", "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." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse vesandt worden. Wenn Du ihn innerhalb eines annehmbaren Zeitraums nicht empfängst, prüfe Deine Spam-Ordner.<br>Sollte er sich nicht darin befinden, frage bei Deinem lokalen Administrator nach.", "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?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?", @@ -74,7 +74,7 @@ "Error while changing permissions" : "Fehler beim Ändern der Rechte", "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt", "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt", - "Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....", + "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…", "Share link" : "Link teilen", "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen", "Link" : "Link", @@ -87,7 +87,7 @@ "Set expiration date" : "Setze ein Ablaufdatum", "Expiration" : "Ablaufdatum", "Expiration date" : "Ablaufdatum", - "Adding user..." : "Benutzer wird hinzugefügt …", + "Adding user..." : "Benutzer wird hinzugefügt…", "group" : "Gruppe", "remote" : "Entfernte Freigabe", "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt", @@ -103,7 +103,7 @@ "Password protected" : "Durch ein Passwort geschützt", "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", + "Sending ..." : "Senden…", "Email sent" : "E-Mail wurde verschickt", "Warning" : "Warnung", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", @@ -192,7 +192,7 @@ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", "Finish setup" : "Installation abschließen", - "Finishing …" : "Abschließen ...", + "Finishing …" : "Abschließen…", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.", "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.", "Log out" : "Abmelden", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 21d4775fdb0..847c9d80ac5 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -105,7 +105,7 @@ OC.L10N.register( "Password protected" : "Passwortgeschützt", "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", + "Sending ..." : "Senden…", "Email sent" : "Email gesendet", "Warning" : "Warnung", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", @@ -194,7 +194,7 @@ OC.L10N.register( "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", "Finish setup" : "Installation abschließen", - "Finishing …" : "Abschließen ...", + "Finishing …" : "Abschließen…", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.", "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" : "Abmelden", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 79d2e494085..2c19f56c115 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -103,7 +103,7 @@ "Password protected" : "Passwortgeschützt", "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", + "Sending ..." : "Senden…", "Email sent" : "Email gesendet", "Warning" : "Warnung", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", @@ -192,7 +192,7 @@ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", "Finish setup" : "Installation abschließen", - "Finishing …" : "Abschließen ...", + "Finishing …" : "Abschließen…", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.", "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" : "Abmelden", diff --git a/core/l10n/es.js b/core/l10n/es.js index 2d4d8cdf659..d2be52b08be 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -35,23 +35,23 @@ OC.L10N.register( "December" : "Diciembre", "Settings" : "Ajustes", "Saving..." : "Guardando...", - "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse un correo de reinicio. Por favor, contacte con su administrador.", - "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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.", - "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos despues de que su contraseña será restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?", + "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.", + "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." : "Un enlace para restablecer su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su administrador local.", + "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?", "I know what I'm doing" : "Sé lo que estoy haciendo", "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.", "No" : "No", "Yes" : "Sí", "Choose" : "Seleccionar", - "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}", + "Error loading file picker template: {error}" : "Error al cargar plantilla del seleccionador de archivos: {error}", "Ok" : "Aceptar", - "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}", + "Error loading message template: {error}" : "Error al cargar plantilla del mensaje: {error}", "read-only" : "solo lectura", "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"], - "One file conflict" : "On conflicto de archivo", - "New Files" : "Nuevos Archivos", + "One file conflict" : "Un conflicto de archivo", + "New Files" : "Nuevos archivos", "Already existing files" : "Archivos ya existentes", - "Which files do you want to keep?" : "¿Que archivos deseas mantener?", + "Which files do you want to keep?" : "¿Cuáles archivos desea mantener?", "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.", "Cancel" : "Cancelar", "Continue" : "Continuar", @@ -65,7 +65,7 @@ OC.L10N.register( "Strong password" : "Contraseña muy buena", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos; ya que la interfaz WebDAV parece no estar funcionando.", "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.", - "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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.", + "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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Probablemente su directorio de datos y/o sus archivos son accesibles desde Internet, pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.", "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor", "Shared" : "Compartido", "Shared with {recipients}" : "Compartido con {recipients}", @@ -78,7 +78,7 @@ OC.L10N.register( "Shared with you by {owner}" : "Compartido contigo por {owner}", "Share with user or group …" : "Compartido con el usuario o con el grupo ...", "Share link" : "Enlace compartido", - "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado", + "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó", "Link" : "Enlace", "Password protect" : "Protección con contraseña", "Password" : "Contraseña", @@ -113,7 +113,7 @@ OC.L10N.register( "Delete" : "Eliminar", "Add" : "Agregar", "Edit tags" : "Editar etiquetas", - "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}", + "Error loading dialog template: {error}" : "Error al cargar plantilla de diálogo: {error}", "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.", "unknown text" : "texto desconocido", "Hello world!" : "¡Hola mundo!", @@ -126,8 +126,8 @@ OC.L10N.register( "The update was unsuccessful. " : "La actualización ha fallado.", "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.", - "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. Por favor, asegúrese de que su nombre de usuario es el correcto.", - "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", + "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.", + "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", "New password" : "Nueva contraseña", @@ -137,19 +137,19 @@ OC.L10N.register( "No search result in other places" : "No hay resultados de búsqueda en otros lugares", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de búsqueda en otros lugares","{count} resultados de búsqueda en otros lugares"], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ", - "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.", - "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y el open_basedir se ha configurado en php.ini. Esto acarreará problemas con arhivos superiores a 4GB y resulta altamente desaconsejado.", + "For the best results, please consider using a GNU/Linux server instead." : "Para resultados óptimos, considere utilizar un servidor GNU/Linux.", + "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y el open_basedir se ha configurado en php.ini. Esto acarreará problemas con archivos superiores a 4GB y se desaconseja encarecidamente.", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, quite el ajuste de open_basedir —dentro de su php.ini— o pásese a PHP 64-bits.", - "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y cURL no está instalado. Esto acarreará problemas con arhivos superiores a 4GB y resulta altamente desaconsejado.", + "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y cURL no está instalado. Esto acarreará problemas con archivos superiores a 4GB y se desaconseja encarecidamente.", "Please install the cURL extension and restart your webserver." : "Por favor, instale la extensión cURL y reinicie su servidor web.", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Aplicaciones", "Admin" : "Administración", "Help" : "Ayuda", - "Error loading tags" : "Error cargando etiquetas.", + "Error loading tags" : "Error al cargar las etiquetas.", "Tag already exists" : "La etiqueta ya existe", - "Error deleting tag(s)" : "Error borrando etiqueta(s)", + "Error deleting tag(s)" : "Error al borrar etiqueta(s)", "Error tagging" : "Error al etiquetar", "Error untagging" : "Error al quitar etiqueta", "Error favoriting" : "Error al marcar como favorito", @@ -163,7 +163,7 @@ OC.L10N.register( "Cheers!" : "¡Saludos!", "Internal Server Error" : "Error interno del servidor", "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor, contacte con el administrador del servidor si este error reaparece múltiples veces. Incluya asimismo los detalles técnicos que se muestran acontinuación.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor, contacte con el administrador del servidor si este error reaparece múltiples veces. Incluya asimismo los detalles técnicos que se muestran a continuación.", "More details can be found in the server log." : "Pueden verse más detalles en el registro del servidor.", "Technical details" : "Detalles técnicos", "Remote Address: %s" : "Dirección remota: %s", @@ -201,7 +201,7 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézquela!", + "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézcala!", "remember" : "recordar", "Log in" : "Entrar", "Alternative Logins" : "Inicios de sesión alternativos", diff --git a/core/l10n/es.json b/core/l10n/es.json index e0c5f18a5d3..ba4ece1bce7 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -33,23 +33,23 @@ "December" : "Diciembre", "Settings" : "Ajustes", "Saving..." : "Guardando...", - "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse un correo de reinicio. Por favor, contacte con su administrador.", - "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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.", - "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos despues de que su contraseña será restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?", + "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.", + "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." : "Un enlace para restablecer su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su administrador local.", + "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?", "I know what I'm doing" : "Sé lo que estoy haciendo", "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.", "No" : "No", "Yes" : "Sí", "Choose" : "Seleccionar", - "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}", + "Error loading file picker template: {error}" : "Error al cargar plantilla del seleccionador de archivos: {error}", "Ok" : "Aceptar", - "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}", + "Error loading message template: {error}" : "Error al cargar plantilla del mensaje: {error}", "read-only" : "solo lectura", "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"], - "One file conflict" : "On conflicto de archivo", - "New Files" : "Nuevos Archivos", + "One file conflict" : "Un conflicto de archivo", + "New Files" : "Nuevos archivos", "Already existing files" : "Archivos ya existentes", - "Which files do you want to keep?" : "¿Que archivos deseas mantener?", + "Which files do you want to keep?" : "¿Cuáles archivos desea mantener?", "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.", "Cancel" : "Cancelar", "Continue" : "Continuar", @@ -63,7 +63,7 @@ "Strong password" : "Contraseña muy buena", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos; ya que la interfaz WebDAV parece no estar funcionando.", "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.", - "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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.", + "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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Probablemente su directorio de datos y/o sus archivos son accesibles desde Internet, pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.", "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor", "Shared" : "Compartido", "Shared with {recipients}" : "Compartido con {recipients}", @@ -76,7 +76,7 @@ "Shared with you by {owner}" : "Compartido contigo por {owner}", "Share with user or group …" : "Compartido con el usuario o con el grupo ...", "Share link" : "Enlace compartido", - "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado", + "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó", "Link" : "Enlace", "Password protect" : "Protección con contraseña", "Password" : "Contraseña", @@ -111,7 +111,7 @@ "Delete" : "Eliminar", "Add" : "Agregar", "Edit tags" : "Editar etiquetas", - "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}", + "Error loading dialog template: {error}" : "Error al cargar plantilla de diálogo: {error}", "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.", "unknown text" : "texto desconocido", "Hello world!" : "¡Hola mundo!", @@ -124,8 +124,8 @@ "The update was unsuccessful. " : "La actualización ha fallado.", "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.", - "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. Por favor, asegúrese de que su nombre de usuario es el correcto.", - "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", + "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.", + "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", "New password" : "Nueva contraseña", @@ -135,19 +135,19 @@ "No search result in other places" : "No hay resultados de búsqueda en otros lugares", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de búsqueda en otros lugares","{count} resultados de búsqueda en otros lugares"], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ", - "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.", - "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y el open_basedir se ha configurado en php.ini. Esto acarreará problemas con arhivos superiores a 4GB y resulta altamente desaconsejado.", + "For the best results, please consider using a GNU/Linux server instead." : "Para resultados óptimos, considere utilizar un servidor GNU/Linux.", + "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y el open_basedir se ha configurado en php.ini. Esto acarreará problemas con archivos superiores a 4GB y se desaconseja encarecidamente.", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, quite el ajuste de open_basedir —dentro de su php.ini— o pásese a PHP 64-bits.", - "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y cURL no está instalado. Esto acarreará problemas con arhivos superiores a 4GB y resulta altamente desaconsejado.", + "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que esta instalación %s está funcionando en un entorno de PHP 32-bits y cURL no está instalado. Esto acarreará problemas con archivos superiores a 4GB y se desaconseja encarecidamente.", "Please install the cURL extension and restart your webserver." : "Por favor, instale la extensión cURL y reinicie su servidor web.", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Aplicaciones", "Admin" : "Administración", "Help" : "Ayuda", - "Error loading tags" : "Error cargando etiquetas.", + "Error loading tags" : "Error al cargar las etiquetas.", "Tag already exists" : "La etiqueta ya existe", - "Error deleting tag(s)" : "Error borrando etiqueta(s)", + "Error deleting tag(s)" : "Error al borrar etiqueta(s)", "Error tagging" : "Error al etiquetar", "Error untagging" : "Error al quitar etiqueta", "Error favoriting" : "Error al marcar como favorito", @@ -161,7 +161,7 @@ "Cheers!" : "¡Saludos!", "Internal Server Error" : "Error interno del servidor", "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor, contacte con el administrador del servidor si este error reaparece múltiples veces. Incluya asimismo los detalles técnicos que se muestran acontinuación.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor, contacte con el administrador del servidor si este error reaparece múltiples veces. Incluya asimismo los detalles técnicos que se muestran a continuación.", "More details can be found in the server log." : "Pueden verse más detalles en el registro del servidor.", "Technical details" : "Detalles técnicos", "Remote Address: %s" : "Dirección remota: %s", @@ -199,7 +199,7 @@ "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézquela!", + "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézcala!", "remember" : "recordar", "Log in" : "Entrar", "Alternative Logins" : "Inicios de sesión alternativos", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index a7304207e99..a7d9635902b 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -6,8 +6,8 @@ OC.L10N.register( "Turned off maintenance mode" : "Modo de mantemento desactivado", "Updated database" : "Base de datos actualizada", "Checked database schema update" : "Comprobada a actualización do esquema da base de datos", - "Checked database schema update for apps" : "Comprobada a base de datos para actualización de aplicativos", - "Updated \"%s\" to %s" : "Actualizado \"%s\" a %s", + "Checked database schema update for apps" : "Comprobada a actualización do esquema da base de datos para aplicacións", + "Updated \"%s\" to %s" : "Actualizado «%s» a %s", "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s", "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro", "Unknown filetype" : "Tipo de ficheiro descoñecido", @@ -116,9 +116,9 @@ OC.L10N.register( "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}", "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.", "unknown text" : "texto descoñecido", - "Hello world!" : "Hola mundo!", + "Hello world!" : "Ola xente!", "sunny" : "soleado", - "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo é {weather}", + "Hello {name}, the weather is {weather}" : "Ola {name}, o tempo é {weather}", "Hello {name}" : "Ola {name}", "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"], "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.", @@ -133,13 +133,13 @@ OC.L10N.register( "New password" : "Novo contrasinal", "New Password" : "Novo contrasinal", "Reset password" : "Restabelecer o contrasinal", - "Searching other places" : "Buscando en outros lugares", - "No search result in other places" : "Sen resultados na busca en outros lugares", - "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca en outros lugares","{count} resultados na busca en outros lugares"], + "Searching other places" : "Buscando noutros lugares", + "No search result in other places" : "Sen resultados na busca noutros lugares", + "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca en outros lugares","{count} resultados na busca noutros lugares"], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Semella que está a executarse esta instancia de %s nun entorno de PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto dará lugar a problemas con ficheiros de máis de 4GB o que é moi desalentador.", - "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor elimine a preferencia de open_basedir dentro de php.ini ou cambie a un entorno 64-bit PHP.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Retire o axuste open_basedir dentro de php.ini ou cambie a PHP de 64-bit PHP.", "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Semella que esta instancia %s execútase nun entorno 32-bit PHP e cURL non está instalado. Esto causará problemas con ficheiros maiores de 4GB o que é moi desalentador.", "Please install the cURL extension and restart your webserver." : "Instale a extensión cURL e reinicie o servidor web.", "Personal" : "Persoal", @@ -157,13 +157,13 @@ OC.L10N.register( "Access forbidden" : "Acceso denegado", "File not found" : "Ficheiro non atopado", "The specified document has not been found on the server." : "Non se atopou no servidor o documento indicado.", - "You can click here to return to %s." : "Pode pulsar aquí para voltar a %s.", + "You can click here to return to %s." : "Pode premer aquí para volver a %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n", "The share will expire on %s." : "Esta compartición caduca o %s.", "Cheers!" : "Saúdos!", - "Internal Server Error" : "Erro interno do servidor", + "Internal Server Error" : "Produciuse un erro interno do servidor", "The server encountered an internal error and was unable to complete your request." : "O servidor atopou un erro interno e non foi quen de completar a súa petición.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte co administrador se este erro acontece repetidamente, por favor inclúa os detalles técnicos indicados abaixo no seu informe.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contacte co administrador se este erro acontece repetidamente, favor inclúa os detalles técnicos indicados embaixo no seu informe.", "More details can be found in the server log." : "Atopará máis detalles no rexistro do servidor.", "Technical details" : "Detalles técnicos", "Remote Address: %s" : "Enderezo remoto: %s", @@ -195,7 +195,7 @@ OC.L10N.register( "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.", "Finish setup" : "Rematar a configuración", "Finishing …" : "Rematando ...", - "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.", + "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicación precisa de JavaScript para funcionar. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Active o JavaScript</a> e recargue a páxina.", "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.", "Log out" : "Desconectar", "Search" : "Buscar", @@ -212,8 +212,8 @@ OC.L10N.register( "Thank you for your patience." : "Grazas pola súa paciencia.", "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.", - "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utiizar o botón de abaixo para confiar en este dominio.", - "Add \"%s\" as trusted domain" : "Engadir \"%s\" como dominio de confianza", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utilizar o botón de embaixo para confiar neste dominio.", + "Add \"%s\" as trusted domain" : "Engadir «%s» como dominio de confianza", "%s will be updated to version %s." : "%s actualizarase á versión %s.", "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:", "The theme %s has been disabled." : "O tema %s foi desactivado.", @@ -221,6 +221,6 @@ OC.L10N.register( "Start update" : "Iniciar a actualización", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:", "This %s instance is currently being updated, which may take a while." : "Esta instancia de %s está sendo actualizada e pode tardar un anaco.", - "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automáticamente cando a instancia de %s esté dispoñible de novo." + "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automaticamente cando a instancia de %s estea dispoñíbel de novo." }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 017e478591d..0413cbdebbd 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -4,8 +4,8 @@ "Turned off maintenance mode" : "Modo de mantemento desactivado", "Updated database" : "Base de datos actualizada", "Checked database schema update" : "Comprobada a actualización do esquema da base de datos", - "Checked database schema update for apps" : "Comprobada a base de datos para actualización de aplicativos", - "Updated \"%s\" to %s" : "Actualizado \"%s\" a %s", + "Checked database schema update for apps" : "Comprobada a actualización do esquema da base de datos para aplicacións", + "Updated \"%s\" to %s" : "Actualizado «%s» a %s", "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s", "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro", "Unknown filetype" : "Tipo de ficheiro descoñecido", @@ -114,9 +114,9 @@ "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}", "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.", "unknown text" : "texto descoñecido", - "Hello world!" : "Hola mundo!", + "Hello world!" : "Ola xente!", "sunny" : "soleado", - "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo é {weather}", + "Hello {name}, the weather is {weather}" : "Ola {name}, o tempo é {weather}", "Hello {name}" : "Ola {name}", "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"], "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.", @@ -131,13 +131,13 @@ "New password" : "Novo contrasinal", "New Password" : "Novo contrasinal", "Reset password" : "Restabelecer o contrasinal", - "Searching other places" : "Buscando en outros lugares", - "No search result in other places" : "Sen resultados na busca en outros lugares", - "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca en outros lugares","{count} resultados na busca en outros lugares"], + "Searching other places" : "Buscando noutros lugares", + "No search result in other places" : "Sen resultados na busca noutros lugares", + "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca en outros lugares","{count} resultados na busca noutros lugares"], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Semella que está a executarse esta instancia de %s nun entorno de PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto dará lugar a problemas con ficheiros de máis de 4GB o que é moi desalentador.", - "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor elimine a preferencia de open_basedir dentro de php.ini ou cambie a un entorno 64-bit PHP.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Retire o axuste open_basedir dentro de php.ini ou cambie a PHP de 64-bit PHP.", "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Semella que esta instancia %s execútase nun entorno 32-bit PHP e cURL non está instalado. Esto causará problemas con ficheiros maiores de 4GB o que é moi desalentador.", "Please install the cURL extension and restart your webserver." : "Instale a extensión cURL e reinicie o servidor web.", "Personal" : "Persoal", @@ -155,13 +155,13 @@ "Access forbidden" : "Acceso denegado", "File not found" : "Ficheiro non atopado", "The specified document has not been found on the server." : "Non se atopou no servidor o documento indicado.", - "You can click here to return to %s." : "Pode pulsar aquí para voltar a %s.", + "You can click here to return to %s." : "Pode premer aquí para volver a %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n", "The share will expire on %s." : "Esta compartición caduca o %s.", "Cheers!" : "Saúdos!", - "Internal Server Error" : "Erro interno do servidor", + "Internal Server Error" : "Produciuse un erro interno do servidor", "The server encountered an internal error and was unable to complete your request." : "O servidor atopou un erro interno e non foi quen de completar a súa petición.", - "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte co administrador se este erro acontece repetidamente, por favor inclúa os detalles técnicos indicados abaixo no seu informe.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contacte co administrador se este erro acontece repetidamente, favor inclúa os detalles técnicos indicados embaixo no seu informe.", "More details can be found in the server log." : "Atopará máis detalles no rexistro do servidor.", "Technical details" : "Detalles técnicos", "Remote Address: %s" : "Enderezo remoto: %s", @@ -193,7 +193,7 @@ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.", "Finish setup" : "Rematar a configuración", "Finishing …" : "Rematando ...", - "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.", + "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicación precisa de JavaScript para funcionar. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Active o JavaScript</a> e recargue a páxina.", "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.", "Log out" : "Desconectar", "Search" : "Buscar", @@ -210,8 +210,8 @@ "Thank you for your patience." : "Grazas pola súa paciencia.", "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.", - "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utiizar o botón de abaixo para confiar en este dominio.", - "Add \"%s\" as trusted domain" : "Engadir \"%s\" como dominio de confianza", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utilizar o botón de embaixo para confiar neste dominio.", + "Add \"%s\" as trusted domain" : "Engadir «%s» como dominio de confianza", "%s will be updated to version %s." : "%s actualizarase á versión %s.", "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:", "The theme %s has been disabled." : "O tema %s foi desactivado.", @@ -219,6 +219,6 @@ "Start update" : "Iniciar a actualización", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:", "This %s instance is currently being updated, which may take a while." : "Esta instancia de %s está sendo actualizada e pode tardar un anaco.", - "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automáticamente cando a instancia de %s esté dispoñible de novo." + "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automaticamente cando a instancia de %s estea dispoñíbel de novo." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/ja.js b/core/l10n/ja.js index caad1b3b675..7d57052cbde 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -191,6 +191,8 @@ OC.L10N.register( "Database host" : "データベースのホスト名", "Performance Warning" : "パフォーマンス警告", "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。", + "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です.", "Finish setup" : "セットアップを完了します", "Finishing …" : "作業を完了しています ...", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用するため、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index aeebdb903b0..559cbcef8e7 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -189,6 +189,8 @@ "Database host" : "データベースのホスト名", "Performance Warning" : "パフォーマンス警告", "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。", + "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です.", "Finish setup" : "セットアップを完了します", "Finishing …" : "作業を完了しています ...", "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用するため、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index 43e72d8d8a2..db513ec9798 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -133,6 +133,8 @@ OC.L10N.register( "New password" : "Nowe hasło", "New Password" : "Nowe hasło", "Reset password" : "Zresetuj hasło", + "Searching other places" : "Przeszukaj inne miejsca", + "No search result in other places" : "Brak wyników wyszukiwania w innych miejscach", "_{count} search result in other places_::_{count} search results in other places_" : ["","",""], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 06426c7c484..f33b9b65527 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -131,6 +131,8 @@ "New password" : "Nowe hasło", "New Password" : "Nowe hasło", "Reset password" : "Zresetuj hasło", + "Searching other places" : "Przeszukaj inne miejsca", + "No search result in other places" : "Brak wyników wyszukiwania w innych miejscach", "_{count} search result in other places_::_{count} search results in other places_" : ["","",""], "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.", diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index aeebc2d6439..96229fd370a 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -13,8 +13,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c1a75447210..c799205b7cf 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -14,8 +14,8 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/lib/l10n/es.js b/lib/l10n/es.js index 39631f01c05..d4a41b9e542 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -45,9 +45,9 @@ OC.L10N.register( "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s", "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación", "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación", - "No path specified when installing app from local file" : "Sin path especificado cuando se ha instalado la aplicación desde el fichero local", - "Archives of type %s are not supported" : "Ficheros de tipo %s no son soportados", - "Failed to open archive when installing app" : "Fallo de apertura de fichero mientras se instala la aplicación", + "No path specified when installing app from local file" : "Ninguna ruta especificada al instalar la aplicación desde el fichero local", + "Archives of type %s are not supported" : "Los ficheros de tipo %s no son soportados", + "Failed to open archive when installing app" : "Falló la apertura ded fichero mientras se instalaba la aplicación", "App does not provide an info.xml file" : "La aplicación no suministra un fichero info.xml", "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación", "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud", @@ -55,7 +55,7 @@ OC.L10N.register( "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store", "Application is not enabled" : "La aplicación no está habilitada", "Authentication error" : "Error de autenticación", - "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.", + "Token expired. Please reload page." : "Token expirado. Por favor, recarge la página.", "Unknown user" : "Usuario desconocido", "%s enter the database username." : "%s ingresar el usuario de la base de datos.", "%s enter the database name." : "%s ingresar el nombre de la base de datos", @@ -102,7 +102,7 @@ OC.L10N.register( "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 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", - "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"", + "Could not find category \"%s\"" : "No puede encontrar la categoría \"%s\"", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 5b08223b093..9ee46db45aa 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -43,9 +43,9 @@ "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s", "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación", "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación", - "No path specified when installing app from local file" : "Sin path especificado cuando se ha instalado la aplicación desde el fichero local", - "Archives of type %s are not supported" : "Ficheros de tipo %s no son soportados", - "Failed to open archive when installing app" : "Fallo de apertura de fichero mientras se instala la aplicación", + "No path specified when installing app from local file" : "Ninguna ruta especificada al instalar la aplicación desde el fichero local", + "Archives of type %s are not supported" : "Los ficheros de tipo %s no son soportados", + "Failed to open archive when installing app" : "Falló la apertura ded fichero mientras se instalaba la aplicación", "App does not provide an info.xml file" : "La aplicación no suministra un fichero info.xml", "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación", "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud", @@ -53,7 +53,7 @@ "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store", "Application is not enabled" : "La aplicación no está habilitada", "Authentication error" : "Error de autenticación", - "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.", + "Token expired. Please reload page." : "Token expirado. Por favor, recarge la página.", "Unknown user" : "Usuario desconocido", "%s enter the database username." : "%s ingresar el usuario de la base de datos.", "%s enter the database name." : "%s ingresar el nombre de la base de datos", @@ -100,7 +100,7 @@ "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 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", - "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"", + "Could not find category \"%s\"" : "No puede encontrar la categoría \"%s\"", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 6e86a0fb4fb..c2c5556ed18 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -93,7 +93,7 @@ OC.L10N.register( "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s", "Setting permissions for %s failed, because the item was not found" : "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé", "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création", - "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.", + "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration : elle est dans le passé.", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Le service de partage %s doit implémenter l'interface OCP\\Share_Backend", "Sharing backend %s not found" : "Service de partage %s non trouvé", "Sharing backend for %s not found" : "Le service de partage pour %s est introuvable", @@ -108,12 +108,12 @@ OC.L10N.register( "A valid password must be provided" : "Un mot de passe valide doit être saisi", "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé", "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s", "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"", "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.", "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s", "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué", "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'un de ces paramètres régionaux sur votre système et redémarrer votre serveur web.", "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 46384b46402..4be87a0d4df 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -91,7 +91,7 @@ "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s", "Setting permissions for %s failed, because the item was not found" : "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé", "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création", - "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.", + "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration : elle est dans le passé.", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Le service de partage %s doit implémenter l'interface OCP\\Share_Backend", "Sharing backend %s not found" : "Service de partage %s non trouvé", "Sharing backend for %s not found" : "Le service de partage pour %s est introuvable", @@ -106,12 +106,12 @@ "A valid password must be provided" : "Un mot de passe valide doit être saisi", "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé", "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s", "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"", "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.", "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s", "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué", "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'un de ces paramètres régionaux sur votre système et redémarrer votre serveur web.", "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index 6a6704799ff..8fa89bae6b4 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -108,19 +108,19 @@ OC.L10N.register( "A valid password must be provided" : "Debe fornecer un contrasinal", "The username is already being used" : "Este nome de usuario xa está a ser usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «root»%s.", "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»", "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «apps»", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.", "Cannot create \"data\" directory (%s)" : "Non é posíbel crear o directorio «data» (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura ao directorio «root»</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «root»%s.", "Setting locale to %s failed" : "Fallou o axuste da configuración local a %s", "Please install one of these locales on your system and restart your webserver." : "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.", "Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.", "PHP module %s not installed." : "O módulo PHP %s non está instalado.", "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.", - "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para surtir datos de código en bruto. Desde PHP 5.6 esto levará a que PHP proporcione avisos con código perfectamente válido.", - "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este asunto estableza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini", + "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para encher datos de código en bruto. Desde PHP 5.6 isto levará a que PHP forneza avisos con código perfectamente correcto.", + "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este problema estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index c9feefa2f53..9c8992ddeac 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -106,19 +106,19 @@ "A valid password must be provided" : "Debe fornecer un contrasinal", "The username is already being used" : "Este nome de usuario xa está a ser usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «root»%s.", "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»", "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «apps»", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.", "Cannot create \"data\" directory (%s)" : "Non é posíbel crear o directorio «data» (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura ao directorio «root»</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura ao directorio «root»%s.", "Setting locale to %s failed" : "Fallou o axuste da configuración local a %s", "Please install one of these locales on your system and restart your webserver." : "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.", "Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.", "PHP module %s not installed." : "O módulo PHP %s non está instalado.", "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.", - "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para surtir datos de código en bruto. Desde PHP 5.6 esto levará a que PHP proporcione avisos con código perfectamente válido.", - "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este asunto estableza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini", + "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para encher datos de código en bruto. Desde PHP 5.6 isto levará a que PHP forneza avisos con código perfectamente correcto.", + "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este problema estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index b2cd33fed40..ee35acd8dab 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -7,6 +7,7 @@ OC.L10N.register( "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.", "Sample configuration detected" : "Виявлено приклад конфігурації", "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 або вище", "Help" : "Допомога", "Personal" : "Особисте", "Settings" : "Налаштування", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 1a9c42d7d4e..2969c10ea97 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -5,6 +5,7 @@ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.", "Sample configuration detected" : "Виявлено приклад конфігурації", "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 або вище", "Help" : "Допомога", "Personal" : "Особисте", "Settings" : "Налаштування", diff --git a/lib/private/config.php b/lib/private/config.php index 31e536221dd..5c8cc89f0f0 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -236,8 +236,11 @@ class Config { flock($filePointer, LOCK_UN); fclose($filePointer); - // Clear the opcode cache - \OC_Util::clearOpcodeCache(); + // Try invalidating the opcache just for the file we wrote... + if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) { + // But if that doesn't work, clear the whole cache. + \OC_Util::clearOpcodeCache(); + } } } diff --git a/lib/private/defaults.php b/lib/private/defaults.php index c16ebdbe24c..dfcd97aedd6 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -1,9 +1,5 @@ <?php -if (file_exists(OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php')) { - require_once 'themes/' . OC_Util::getTheme() . '/defaults.php'; -} - /** * Default strings and values which differ between the enterprise and the * community edition. Use the get methods to always get the right strings. @@ -45,8 +41,15 @@ class OC_Defaults { $this->defaultLogoClaim = ''; $this->defaultMailHeaderColor = '#1d2d44'; /* header color of mail notifications */ - if (class_exists('OC_Theme')) { - $this->theme = new OC_Theme(); + $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php'; + if (file_exists($themePath)) { + // prevent defaults.php from printing output + ob_start(); + require_once $themePath; + ob_end_clean(); + if (class_exists('OC_Theme')) { + $this->theme = new OC_Theme(); + } } } diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index 06a884072e0..48b2b5c024b 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -193,6 +193,9 @@ class Cache { $file['size'] = $file['unencrypted_size']; } $file['permissions'] = (int)$file['permissions']; + $file['mtime'] = (int)$file['mtime']; + $file['storage_mtime'] = (int)$file['storage_mtime']; + $file['size'] = 0 + $file['size']; } return $files; } else { diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 4778a6803ba..d369398af1c 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -80,7 +80,8 @@ class Scanner extends BasicEmitter { * @return array an array of metadata of the file */ public function getData($path) { - if (!$this->storage->isReadable($path)) { + $permissions = $this->storage->getPermissions($path); + if (!$permissions & \OCP\PERMISSION_READ) { //cant read, nothing we can do \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not accessible or present !!!", \OCP\Util::DEBUG); return null; @@ -95,7 +96,7 @@ class Scanner extends BasicEmitter { } $data['etag'] = $this->storage->getETag($path); $data['storage_mtime'] = $data['mtime']; - $data['permissions'] = $this->storage->getPermissions($path); + $data['permissions'] = $permissions; return $data; } @@ -104,9 +105,11 @@ class Scanner extends BasicEmitter { * * @param string $file * @param int $reuseExisting + * @param int $parentId + * @param array | null $cacheData existing data in the cache for the file to be scanned * @return array an array of metadata of the scanned file */ - public function scanFile($file, $reuseExisting = 0) { + public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null) { if (!self::isPartialFile($file) and !Filesystem::isFileBlacklisted($file) ) { @@ -118,7 +121,9 @@ class Scanner extends BasicEmitter { if ($parent === '.' or $parent === '/') { $parent = ''; } - $parentId = $this->cache->getId($parent); + if ($parentId === -1) { + $parentId = $this->cache->getId($parent); + } // scan the parent if it's not in the cache (id -1) and the current file is not the root folder if ($file and $parentId === -1) { @@ -128,14 +133,18 @@ class Scanner extends BasicEmitter { if ($parent) { $data['parent'] = $parentId; } - $cacheData = $this->cache->get($file); - if ($cacheData and $reuseExisting) { + if (is_null($cacheData)) { + $cacheData = $this->cache->get($file); + } + if ($cacheData and $reuseExisting and isset($cacheData['fileid'])) { // prevent empty etag if (empty($cacheData['etag'])) { $etag = $data['etag']; } else { $etag = $cacheData['etag']; } + $fileId = $cacheData['fileid']; + $data['fileid'] = $fileId; // only reuse data if the file hasn't explicitly changed if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) { $data['mtime'] = $cacheData['mtime']; @@ -150,9 +159,10 @@ class Scanner extends BasicEmitter { $newData = array_diff_assoc($data, $cacheData); } else { $newData = $data; + $fileId = -1; } if (!empty($newData)) { - $data['fileid'] = $this->addToCache($file, $newData); + $data['fileid'] = $this->addToCache($file, $newData, $fileId); $this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId)); \OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId)); } @@ -175,13 +185,19 @@ class Scanner extends BasicEmitter { /** * @param string $path * @param array $data + * @param int $fileId * @return int the id of the added file */ - protected function addToCache($path, $data) { + protected function addToCache($path, $data, $fileId = -1) { \OC_Hook::emit('Scanner', 'addToCache', array('file' => $path, 'data' => $data)); $this->emit('\OC\Files\Cache\Scanner', 'addToCache', array($path, $this->storageId, $data)); if ($this->cacheActive) { - return $this->cache->put($path, $data); + if ($fileId !== -1) { + $this->cache->update($fileId, $data); + return $fileId; + } else { + return $this->cache->put($path, $data); + } } else { return -1; } @@ -190,12 +206,17 @@ class Scanner extends BasicEmitter { /** * @param string $path * @param array $data + * @param int $fileId */ - protected function updateCache($path, $data) { + protected function updateCache($path, $data, $fileId = -1) { \OC_Hook::emit('Scanner', 'addToCache', array('file' => $path, 'data' => $data)); $this->emit('\OC\Files\Cache\Scanner', 'updateCache', array($path, $this->storageId, $data)); if ($this->cacheActive) { - $this->cache->put($path, $data); + if ($fileId !== -1) { + $this->cache->update($fileId, $data); + } else { + $this->cache->put($path, $data); + } } } @@ -212,97 +233,124 @@ class Scanner extends BasicEmitter { $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } $data = $this->scanFile($path, $reuse); - if ($data !== null) { - $size = $this->scanChildren($path, $recursive, $reuse); + if ($data and $data['mimetype'] === 'httpd/unix-directory') { + $size = $this->scanChildren($path, $recursive, $reuse, $data); $data['size'] = $size; } return $data; } - protected function getExistingChildren($path) { + /** + * Get the children currently in the cache + * + * @param int $folderId + * @return array[] + */ + protected function getExistingChildren($folderId) { $existingChildren = array(); - if ($this->cache->inCache($path)) { - $children = $this->cache->getFolderContents($path); - foreach ($children as $child) { - $existingChildren[] = $child['name']; - } + $children = $this->cache->getFolderContentsById($folderId); + foreach ($children as $child) { + $existingChildren[$child['name']] = $child; } return $existingChildren; } /** + * Get the children from the storage + * + * @param string $folder + * @return string[] + */ + protected function getNewChildren($folder) { + $children = array(); + if ($dh = $this->storage->opendir($folder)) { + if (is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if (!Filesystem::isIgnoredDir($file)) { + $children[] = $file; + } + } + } + } + return $children; + } + + /** * scan all the files and folders in a folder * * @param string $path * @param bool $recursive * @param int $reuse + * @param array $folderData existing cache data for the folder to be scanned * @return int the size of the scanned folder or -1 if the size is unknown at this stage */ - public function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { + protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderData = null) { if ($reuse === -1) { $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } $this->emit('\OC\Files\Cache\Scanner', 'scanFolder', array($path, $this->storageId)); $size = 0; $childQueue = array(); - $existingChildren = $this->getExistingChildren($path); - $newChildren = array(); - if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) { - $exceptionOccurred = false; - if ($this->useTransactions) { - \OC_DB::beginTransaction(); - } - if (is_resource($dh)) { - while (($file = readdir($dh)) !== false) { - $child = ($path) ? $path . '/' . $file : $file; - if (!Filesystem::isIgnoredDir($file)) { - $newChildren[] = $file; - try { - $data = $this->scanFile($child, $reuse); - if ($data) { - if ($data['mimetype'] === 'httpd/unix-directory' and $recursive === self::SCAN_RECURSIVE) { - $childQueue[] = $child; - } else if ($data['size'] === -1) { - $size = -1; - } else if ($size !== -1) { - $size += $data['size']; - } - } - } catch (\Doctrine\DBAL\DBALException $ex) { - // might happen if inserting duplicate while a scanning - // process is running in parallel - // log and ignore - \OC_Log::write('core', 'Exception while scanning file "' . $child . '": ' . $ex->getMessage(), \OC_Log::DEBUG); - $exceptionOccurred = true; - } + if (is_array($folderData) and isset($folderData['fileid'])) { + $folderId = $folderData['fileid']; + } else { + $folderId = $this->cache->getId($path); + } + $existingChildren = $this->getExistingChildren($folderId); + $newChildren = $this->getNewChildren($path); + + if ($this->useTransactions) { + \OC_DB::beginTransaction(); + } + $exceptionOccurred = false; + foreach ($newChildren as $file) { + $child = ($path) ? $path . '/' . $file : $file; + try { + $existingData = isset($existingChildren[$file]) ? $existingChildren[$file] : null; + $data = $this->scanFile($child, $reuse, $folderId, $existingData); + if ($data) { + if ($data['mimetype'] === 'httpd/unix-directory' and $recursive === self::SCAN_RECURSIVE) { + $childQueue[$child] = $data; + } else if ($data['size'] === -1) { + $size = -1; + } else if ($size !== -1) { + $size += $data['size']; } } + } catch (\Doctrine\DBAL\DBALException $ex) { + // might happen if inserting duplicate while a scanning + // process is running in parallel + // log and ignore + \OC_Log::write('core', 'Exception while scanning file "' . $child . '": ' . $ex->getMessage(), \OC_Log::DEBUG); + $exceptionOccurred = true; } - $removedChildren = \array_diff($existingChildren, $newChildren); - foreach ($removedChildren as $childName) { - $child = ($path) ? $path . '/' . $childName : $childName; - $this->removeFromCache($child); - } - if ($this->useTransactions) { - \OC_DB::commit(); - } - if ($exceptionOccurred) { - // It might happen that the parallel scan process has already - // inserted mimetypes but those weren't available yet inside the transaction - // To make sure to have the updated mime types in such cases, - // we reload them here - $this->cache->loadMimetypes(); - } + } + $removedChildren = \array_diff(array_keys($existingChildren), $newChildren); + foreach ($removedChildren as $childName) { + $child = ($path) ? $path . '/' . $childName : $childName; + $this->removeFromCache($child); + } + if ($this->useTransactions) { + \OC_DB::commit(); + } + if ($exceptionOccurred) { + // It might happen that the parallel scan process has already + // inserted mimetypes but those weren't available yet inside the transaction + // To make sure to have the updated mime types in such cases, + // we reload them here + $this->cache->loadMimetypes(); + } - foreach ($childQueue as $child) { - $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse); - if ($childSize === -1) { - $size = -1; - } else if ($size !== -1) { - $size += $childSize; - } + foreach ($childQueue as $child => $childData) { + $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse, $childData); + if ($childSize === -1) { + $size = -1; + } else if ($size !== -1) { + $size += $childSize; } - $this->updateCache($path, array('size' => $size)); + } + if (!is_array($folderData) or !isset($folderData['size']) or $folderData['size'] !== $size) { + $this->updateCache($path, array('size' => $size), $folderId); } $this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', array($path, $this->storageId)); return $size; diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index e933782ce2f..04f82d88cd1 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -723,9 +723,18 @@ class Filesystem { * Fix common problems with a file path * @param string $path * @param bool $stripTrailingSlash + * @param bool $isAbsolutePath * @return string */ public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) { + /** + * FIXME: This is a workaround for existing classes and files which call + * this function with another type than a valid string. This + * conversion should get removed as soon as all existing + * function calls have been fixed. + */ + $path = (string)$path; + $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]); if(isset(self::$normalizedPathCache[$cacheKey])) { diff --git a/lib/private/httphelper.php b/lib/private/httphelper.php index 1f3482b3514..08c35e4ae08 100644 --- a/lib/private/httphelper.php +++ b/lib/private/httphelper.php @@ -214,7 +214,8 @@ class HTTPHelper { curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POST, count($fields)); - curl_setopt($ch, CURLOPT_POSTFIELDS, $fieldsString); + curl_setopt($ch, CURLOPT_POSTFIELDS, (string)$fieldsString); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); if (is_readable($certBundle)) { curl_setopt($ch, CURLOPT_CAINFO, $certBundle); } diff --git a/lib/private/image.php b/lib/private/image.php index f5f9a04facc..317b6fde160 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -391,7 +391,7 @@ class OC_Image { $rotate = 90; break; } - if($flip) { + if($flip && function_exists('imageflip')) { imageflip($this->resource, IMG_FLIP_HORIZONTAL); } if ($rotate) { diff --git a/lib/private/installer.php b/lib/private/installer.php index b4fbe527b4f..db8f27aeeab 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -241,7 +241,7 @@ class OC_Installer{ if(!isset($data['href'])) { throw new \Exception($l->t("No href specified when installing app from http")); } - copy($data['href'], $path); + file_put_contents($path, \OC_Util::getUrlContent($data['href'])); }else{ if(!isset($data['path'])) { throw new \Exception($l->t("No path specified when installing app from local file")); diff --git a/lib/private/json.php b/lib/private/json.php index f2719dd2bc7..9117abf7fb9 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -6,10 +6,15 @@ * See the COPYING-README file. */ +/** + * Class OC_JSON + * @deprecated Use a AppFramework JSONResponse instead + */ class OC_JSON{ static protected $send_content_type_header = false; /** * set Content-Type header to jsonrequest + * @deprecated Use a AppFramework JSONResponse instead */ public static function setContentTypeHeader($type='application/json') { if (!self::$send_content_type_header) { @@ -20,9 +25,10 @@ class OC_JSON{ } /** - * Check if the app is enabled, send json error msg if not - * @param string $app - */ + * Check if the app is enabled, send json error msg if not + * @param string $app + * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled. + */ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { $l = \OC::$server->getL10N('lib'); @@ -32,8 +38,9 @@ class OC_JSON{ } /** - * Check if the user is logged in, send json error msg if not - */ + * Check if the user is logged in, send json error msg if not + * @deprecated Use annotation based ACLs from the AppFramework instead + */ public static function checkLoggedIn() { if( !OC_User::isLoggedIn()) { $l = \OC::$server->getL10N('lib'); @@ -44,6 +51,7 @@ class OC_JSON{ /** * Check an ajax get/post call if the request token is valid, send json error msg if not. + * @deprecated Use annotation based CSRF checks from the AppFramework instead */ public static function callCheck() { if( !OC_Util::isCallRegistered()) { @@ -54,8 +62,9 @@ class OC_JSON{ } /** - * Check if the user is a admin, send json error msg if not. - */ + * Check if the user is a admin, send json error msg if not. + * @deprecated Use annotation based ACLs from the AppFramework instead + */ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { $l = \OC::$server->getL10N('lib'); @@ -67,6 +76,7 @@ class OC_JSON{ /** * Check is a given user exists - send json error msg if not * @param string $user + * @deprecated Use a AppFramework JSONResponse instead */ public static function checkUserExists($user) { if (!OCP\User::userExists($user)) { @@ -77,10 +87,10 @@ class OC_JSON{ } - /** - * Check if the user is a subadmin, send json error msg if not - */ + * Check if the user is a subadmin, send json error msg if not + * @deprecated Use annotation based ACLs from the AppFramework instead + */ public static function checkSubAdminUser() { if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) { $l = \OC::$server->getL10N('lib'); @@ -90,16 +100,18 @@ class OC_JSON{ } /** - * Send json error msg - */ + * Send json error msg + * @deprecated Use a AppFramework JSONResponse instead + */ public static function error($data = array()) { $data['status'] = 'error'; self::encodedPrint($data); } /** - * Send json success msg - */ + * Send json success msg + * @deprecated Use a AppFramework JSONResponse instead + */ public static function success($data = array()) { $data['status'] = 'success'; self::encodedPrint($data); @@ -115,8 +127,9 @@ class OC_JSON{ } /** - * Encode and print $data in json format - */ + * Encode and print $data in json format + * @deprecated Use a AppFramework JSONResponse instead + */ public static function encodedPrint($data, $setContentType=true) { if($setContentType) { self::setContentTypeHeader(); @@ -126,6 +139,7 @@ class OC_JSON{ /** * Encode JSON + * @deprecated Use a AppFramework JSONResponse instead */ public static function encode($data) { if (is_array($data)) { diff --git a/lib/private/repair.php b/lib/private/repair.php index c74283896fd..d9fd99707e8 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -13,7 +13,6 @@ use OC\Hooks\Emitter; use OC\Repair\AssetCache; use OC\Repair\CleanTags; use OC\Repair\Collation; -use OC\Repair\EnableFilesApp; use OC\Repair\FillETags; use OC\Repair\InnoDB; use OC\Repair\RepairConfig; @@ -85,7 +84,6 @@ class Repair extends BasicEmitter { new AssetCache(), new FillETags(\OC_DB::getConnection()), new CleanTags(\OC_DB::getConnection()), - new EnableFilesApp(\OC::$server->getConfig()), ); } diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 53479ad7144..4753f6ecbfa 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1857,7 +1857,7 @@ class Share extends \OC\Share\Constants { $sourceId = ($itemType === 'file' || $itemType === 'folder') ? $fileSource : $itemSource; $sourceExists = self::getItemSharedWithBySource($itemType, $sourceId, self::FORMAT_NONE, null, true, $user); - $shareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType; + $userShareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType; if ($sourceExists) { $fileTarget = $sourceExists['file_target']; @@ -1870,12 +1870,12 @@ class Share extends \OC\Share\Constants { } elseif(!$sourceExists && !$isGroupShare) { - $itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $user, + $itemTarget = Helper::generateTarget($itemType, $itemSource, $userShareType, $user, $uidOwner, $suggestedItemTarget, $parent); if (isset($fileSource)) { if ($parentFolder) { if ($parentFolder === true) { - $fileTarget = Helper::generateTarget('file', $filePath, $shareType, $user, + $fileTarget = Helper::generateTarget('file', $filePath, $userShareType, $user, $uidOwner, $suggestedFileTarget, $parent); if ($fileTarget != $groupFileTarget) { $parentFolders[$user]['folder'] = $fileTarget; @@ -1885,7 +1885,7 @@ class Share extends \OC\Share\Constants { $parent = $parentFolder[$user]['id']; } } else { - $fileTarget = Helper::generateTarget('file', $filePath, $shareType, + $fileTarget = Helper::generateTarget('file', $filePath, $userShareType, $user, $uidOwner, $suggestedFileTarget, $parent); } } else { @@ -1916,7 +1916,7 @@ class Share extends \OC\Share\Constants { 'itemType' => $itemType, 'itemSource' => $itemSource, 'itemTarget' => $itemTarget, - 'shareType' => $shareType, + 'shareType' => $userShareType, 'shareWith' => $user, 'uidOwner' => $uidOwner, 'permissions' => $permissions, diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index d263d25aeef..0bf8ce22998 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -32,8 +32,7 @@ class URLGenerator implements IURLGenerator { /** * Creates an url using a defined route * @param string $route - * @param array $parameters - * @internal param array $args with param=>value, will be appended to the returned url + * @param array $parameters args with param=>value, will be appended to the returned url * @return string the url * * Returns a url to the given route. @@ -45,9 +44,8 @@ class URLGenerator implements IURLGenerator { /** * Creates an absolute url using a defined route - * @param string $route - * @param array $parameters - * @internal param array $args with param=>value, will be appended to the returned url + * @param string $routeName + * @param array $arguments args with param=>value, will be appended to the returned url * @return string the url * * Returns an absolute url to the given route. diff --git a/lib/private/util.php b/lib/private/util.php index 9a01ca3ac95..2be7e8eb293 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -504,11 +504,6 @@ class OC_Util { $webServerRestart = true; } - //common hint for all file permissions error messages - $permissionsHint = $l->t('Permissions can usually be fixed by ' - . '%sgiving the webserver write access to the root directory%s.', - array('<a href="' . \OC_Helper::linkToDocs('admin-dir_permissions') . '" target="_blank">', '</a>')); - // Check if config folder is writable. if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) { $errors[] = array( @@ -549,6 +544,10 @@ class OC_Util { ); } } else if (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { + //common hint for all file permissions error messages + $permissionsHint = $l->t('Permissions can usually be fixed by ' + . '%sgiving the webserver write access to the root directory%s.', + array('<a href="' . \OC_Helper::linkToDocs('admin-dir_permissions') . '" target="_blank">', '</a>')); $errors[] = array( 'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable by ownCloud', 'hint' => $permissionsHint @@ -1272,6 +1271,32 @@ class OC_Util { } /** + * Clear a single file from the opcode cache + * This is useful for writing to the config file + * in case the opcode cache does not re-validate files + * Returns true if successful, false if unsuccessful: + * caller should fall back on clearing the entire cache + * with clearOpcodeCache() if unsuccessful + * + * @param string $path the path of the file to clear from the cache + * @return bool true if underlying function returns true, otherwise false + */ + public static function deleteFromOpcodeCache($path) { + $ret = false; + if ($path) { + // APC >= 3.1.1 + if (function_exists('apc_delete_file')) { + $ret = @apc_delete_file($path); + } + // Zend OpCache >= 7.0.0, PHP >= 5.5.0 + if (function_exists('opcache_invalidate')) { + $ret = opcache_invalidate($path); + } + } + return $ret; + } + + /** * Clear the opcode cache if one exists * This is necessary for writing to the config file * in case the opcode cache does not re-validate files @@ -1399,10 +1424,12 @@ class OC_Util { } /** + * Check if PhpCharset config is UTF-8 + * * @return string */ public static function isPhpCharSetUtf8() { - return ini_get('default_charset') === 'UTF-8'; + return strtoupper(ini_get('default_charset')) === 'UTF-8'; } } diff --git a/lib/public/json.php b/lib/public/json.php index e7371ad63f3..5d9675e5ba4 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -23,7 +23,6 @@ /** * Public interface of ownCloud for apps to use. * JSON Class - * */ // use OCP namespace for all classes that are considered public. @@ -31,141 +30,142 @@ namespace OCP; /** - * This class provides convinient functions to generate and send JSON data. Usefull for Ajax calls + * This class provides convenient functions to generate and send JSON data. Useful for Ajax calls + * @deprecated Use a AppFramework JSONResponse instead */ class JSON { /** - * Encode and print $data in JSON format - * @param array $data The data to use - * @param string $setContentType the optional content type - * @return string json formatted string. - */ + * Encode and print $data in JSON format + * @param array $data The data to use + * @param bool $setContentType the optional content type + * @deprecated Use a AppFramework JSONResponse instead + */ public static function encodedPrint( $data, $setContentType=true ) { - return(\OC_JSON::encodedPrint( $data, $setContentType )); + \OC_JSON::encodedPrint($data, $setContentType); } /** - * Check if the user is logged in, send json error msg if not. - * - * This method checks if a user is logged in. If not, a json error - * response will be return and the method will exit from execution - * of the script. - * The returned json will be in the format: - * - * {"status":"error","data":{"message":"Authentication error."}} - * - * Add this call to the start of all ajax method files that requires - * an authenticated user. - * - * @return string json formatted error string if not authenticated. - */ + * Check if the user is logged in, send json error msg if not. + * + * This method checks if a user is logged in. If not, a json error + * response will be return and the method will exit from execution + * of the script. + * The returned json will be in the format: + * + * {"status":"error","data":{"message":"Authentication error."}} + * + * Add this call to the start of all ajax method files that requires + * an authenticated user. + * @deprecated Use annotation based ACLs from the AppFramework instead + */ public static function checkLoggedIn() { - return(\OC_JSON::checkLoggedIn()); + \OC_JSON::checkLoggedIn(); } /** - * Check an ajax get/post call if the request token is valid. - * - * This method checks for a valid variable 'requesttoken' in $_GET, - * $_POST and $_SERVER. If a valid token is not found, a json error - * response will be return and the method will exit from execution - * of the script. - * The returned json will be in the format: - * - * {"status":"error","data":{"message":"Token expired. Please reload page."}} - * - * Add this call to the start of all ajax method files that creates, - * updates or deletes anything. - * In cases where you e.g. use an ajax call to load a dialog containing - * a submittable form, you will need to add the requesttoken first as a - * parameter to the ajax call, then assign it to the template and finally - * add a hidden input field also named 'requesttoken' containing the value. - * - * @return \json|null json formatted error string if not valid. - */ + * Check an ajax get/post call if the request token is valid. + * + * This method checks for a valid variable 'requesttoken' in $_GET, + * $_POST and $_SERVER. If a valid token is not found, a json error + * response will be return and the method will exit from execution + * of the script. + * The returned json will be in the format: + * + * {"status":"error","data":{"message":"Token expired. Please reload page."}} + * + * Add this call to the start of all ajax method files that creates, + * updates or deletes anything. + * In cases where you e.g. use an ajax call to load a dialog containing + * a submittable form, you will need to add the requesttoken first as a + * parameter to the ajax call, then assign it to the template and finally + * add a hidden input field also named 'requesttoken' containing the value. + * @deprecated Use annotation based CSRF checks from the AppFramework instead + */ public static function callCheck() { - return(\OC_JSON::callCheck()); + \OC_JSON::callCheck(); } /** - * Send json success msg - * - * Return a json success message with optional extra data. - * @see OCP\JSON::error() for the format to use. - * - * @param array $data The data to use - * @return string json formatted string. - */ + * Send json success msg + * + * Return a json success message with optional extra data. + * @see OCP\JSON::error() for the format to use. + * + * @param array $data The data to use + * @return string json formatted string. + * @deprecated Use a AppFramework JSONResponse instead + */ public static function success( $data = array() ) { - return(\OC_JSON::success( $data )); + \OC_JSON::success($data); } /** - * Send json error msg - * - * Return a json error message with optional extra data for - * error message or app specific data. - * - * Example use: - * - * $id = [some value] - * OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id))); - * - * Will return the json formatted string: - * - * {"status":"error","data":{"message":"An error happened", "id":[some value]}} - * - * @param array $data The data to use - * @return string json formatted error string. - */ + * Send json error msg + * + * Return a json error message with optional extra data for + * error message or app specific data. + * + * Example use: + * + * $id = [some value] + * OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id))); + * + * Will return the json formatted string: + * + * {"status":"error","data":{"message":"An error happened", "id":[some value]}} + * + * @param array $data The data to use + * @return string json formatted error string. + * @deprecated Use a AppFramework JSONResponse instead + */ public static function error( $data = array() ) { - return(\OC_JSON::error( $data )); + \OC_JSON::error( $data ); } /** - * Set Content-Type header to jsonrequest - * @param array $type The contwnt type header - * @return string json formatted string. - */ + * Set Content-Type header to jsonrequest + * @param string $type The content type header + * @deprecated Use a AppFramework JSONResponse instead + */ public static function setContentTypeHeader( $type='application/json' ) { - return(\OC_JSON::setContentTypeHeader( $type )); + \OC_JSON::setContentTypeHeader($type); } /** - * Check if the App is enabled and send JSON error message instead - * - * This method checks if a specific app is enabled. If not, a json error - * response will be return and the method will exit from execution - * of the script. - * The returned json will be in the format: - * - * {"status":"error","data":{"message":"Application is not enabled."}} - * - * Add this call to the start of all ajax method files that requires - * a specific app to be enabled. - * - * @param string $app The app to check - * @return string json formatted string if not enabled. - */ + * Check if the App is enabled and send JSON error message instead + * + * This method checks if a specific app is enabled. If not, a json error + * response will be return and the method will exit from execution + * of the script. + * The returned json will be in the format: + * + * {"status":"error","data":{"message":"Application is not enabled."}} + * + * Add this call to the start of all ajax method files that requires + * a specific app to be enabled. + * + * @param string $app The app to check + * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled. + */ public static function checkAppEnabled( $app ) { - return(\OC_JSON::checkAppEnabled( $app )); + \OC_JSON::checkAppEnabled($app); } /** - * Check if the user is a admin, send json error msg if not - * - * This method checks if the current user has admin rights. If not, a json error - * response will be return and the method will exit from execution - * of the script. - * The returned json will be in the format: - * - * {"status":"error","data":{"message":"Authentication error."}} - * - * Add this call to the start of all ajax method files that requires - * administrative rights. - * - * @return string json formatted string if not admin user. - */ + * Check if the user is a admin, send json error msg if not + * + * This method checks if the current user has admin rights. If not, a json error + * response will be return and the method will exit from execution + * of the script. + * The returned json will be in the format: + * + * {"status":"error","data":{"message":"Authentication error."}} + * + * Add this call to the start of all ajax method files that requires + * administrative rights. + * + * @deprecated Use annotation based ACLs from the AppFramework instead + */ public static function checkAdminUser() { \OC_JSON::checkAdminUser(); } @@ -173,14 +173,17 @@ class JSON { /** * Encode JSON * @param array $data + * @return string + * @deprecated Use a AppFramework JSONResponse instead */ public static function encode($data) { - return(\OC_JSON::encode($data)); + return \OC_JSON::encode($data); } /** * Check is a given user exists - send json error msg if not * @param string $user + * @deprecated Use a AppFramework JSONResponse instead */ public static function checkUserExists($user) { \OC_JSON::checkUserExists($user); diff --git a/lib/repair/enablefilesapp.php b/lib/repair/enablefilesapp.php deleted file mode 100644 index a3298cf76b3..00000000000 --- a/lib/repair/enablefilesapp.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Copyright (c) 2015 Morris Jobke <hey@morrisjobke.de> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OC\Repair; - -use OC\Hooks\BasicEmitter; -use OC\RepairStep; -use OCP\IConfig; - -/** - * Class EnableFilesApp - enables files app if disabled - * - * TODO: remove this with ownCloud 8.1 - this isn't possible anymore with 8.0 - * - * @package OC\Repair - */ -class EnableFilesApp extends BasicEmitter implements RepairStep { - - /** @var IConfig */ - protected $config; - - /** - * @param IConfig $config - */ - public function __construct(IConfig $config) { - $this->config = $config; - } - - /** - * @return string - */ - public function getName() { - return 'Re-enable file app'; - } - - /** - * Enables the files app if it is disabled - */ - public function run() { - if ($this->config->getAppValue('files', 'enabled', 'no') !== 'yes') { - $this->config->setAppValue('files', 'enabled', 'yes'); - $this->emit('\OC\Repair', 'info', ['Files app was disabled - re-enabled']); - } - } -} diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php index 4ed907daf96..4af250f1814 100644 --- a/settings/changepassword/controller.php +++ b/settings/changepassword/controller.php @@ -78,7 +78,7 @@ class Controller { $l = new \OC_L10n('settings'); \OC_JSON::error(array( "data" => array( - "message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.") + "message" => $l->t("Backend doesn't support password change, but the user's encryption key was successfully updated.") ) )); } elseif (!$result && !$recoveryEnabledForUser) { diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js index 2067fb97c6d..efdd28fa3bc 100644 --- a/settings/l10n/ar.js +++ b/settings/l10n/ar.js @@ -20,7 +20,6 @@ OC.L10N.register( "No user supplied" : "لم يتم توفير مستخدم ", "Please provide an admin recovery password, otherwise all user data will be lost" : "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم ", "Wrong admin recovery password. Please check the password and try again." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.", "Unable to change password" : "لا يمكن تغيير كلمة المرور", "Enabled" : "مفعلة", "Saved" : "حفظ", diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json index f0714038a55..69f3c858f61 100644 --- a/settings/l10n/ar.json +++ b/settings/l10n/ar.json @@ -18,7 +18,6 @@ "No user supplied" : "لم يتم توفير مستخدم ", "Please provide an admin recovery password, otherwise all user data will be lost" : "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم ", "Wrong admin recovery password. Please check the password and try again." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.", "Unable to change password" : "لا يمكن تغيير كلمة المرور", "Enabled" : "مفعلة", "Saved" : "حفظ", diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js index e340544721c..06015f724f3 100644 --- a/settings/l10n/ast.js +++ b/settings/l10n/ast.js @@ -27,7 +27,6 @@ OC.L10N.register( "No user supplied" : "Nun s'especificó un usuariu", "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.", "Unable to change password" : "Nun pudo camudase la contraseña", "Enabled" : "Habilitar", "Not enabled" : "Desactiváu", diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json index e7d0f52d37b..6b360419e83 100644 --- a/settings/l10n/ast.json +++ b/settings/l10n/ast.json @@ -25,7 +25,6 @@ "No user supplied" : "Nun s'especificó un usuariu", "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.", "Unable to change password" : "Nun pudo camudase la contraseña", "Enabled" : "Habilitar", "Not enabled" : "Desactiváu", diff --git a/settings/l10n/az.js b/settings/l10n/az.js index 737884ba093..0da0afcfba7 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -22,7 +22,6 @@ OC.L10N.register( "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir", "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.", "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.", "Unable to change password" : "Şifrəni dəyişmək olmur", "Saved" : "Saxlanıldı", "test email settings" : "sınaq məktubu quraşdırmaları", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 5389aec1655..b0d0d4ebfed 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -20,7 +20,6 @@ "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir", "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.", "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.", "Unable to change password" : "Şifrəni dəyişmək olmur", "Saved" : "Saxlanıldı", "test email settings" : "sınaq məktubu quraşdırmaları", diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js index df23dca3408..38934d72a8c 100644 --- a/settings/l10n/bg_BG.js +++ b/settings/l10n/bg_BG.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Липсва потребителско име", "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване. В противен случай, всичката информация на потребителите ще бъде загубена.", "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, проверете паролата и опитайте отново.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но потребителския ключ за криптиране беше успешно обновен.", "Unable to change password" : "Неуспешна смяна на паролата.", "Enabled" : "Включено", "Not enabled" : "Изключено", @@ -172,7 +171,6 @@ OC.L10N.register( "Download logfile" : "Изтегли log файла", "More" : "Още", "Less" : "По-малко", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log файла е по-голям от 100MB. Изтеглянето му може да отнеме време!", "Version" : "Версия", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Още приложения", diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json index b92bf60870e..1c906b6a893 100644 --- a/settings/l10n/bg_BG.json +++ b/settings/l10n/bg_BG.json @@ -26,7 +26,6 @@ "No user supplied" : "Липсва потребителско име", "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване. В противен случай, всичката информация на потребителите ще бъде загубена.", "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, проверете паролата и опитайте отново.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но потребителския ключ за криптиране беше успешно обновен.", "Unable to change password" : "Неуспешна смяна на паролата.", "Enabled" : "Включено", "Not enabled" : "Изключено", @@ -170,7 +169,6 @@ "Download logfile" : "Изтегли log файла", "More" : "Още", "Less" : "По-малко", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log файла е по-голям от 100MB. Изтеглянето му може да отнеме време!", "Version" : "Версия", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Още приложения", diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js index 4df4874ca24..0fc862fd39b 100644 --- a/settings/l10n/bs.js +++ b/settings/l10n/bs.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nijedan korisnik nije dostavljen", "Please provide an admin recovery password, otherwise all user data will be lost" : "Molim navedite admin lozinku za povratak, u protivnom će svi korisnički podaci biti izgubljeni", "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za povratak. Molim provjerite lozinku i pokušajte ponovno.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.", "Unable to change password" : "Promjena lozinke nije moguća", "Enabled" : "Aktivirano", "Not enabled" : "Nije aktivirano", diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json index 1bdc0aa7f52..644b6b1f103 100644 --- a/settings/l10n/bs.json +++ b/settings/l10n/bs.json @@ -26,7 +26,6 @@ "No user supplied" : "Nijedan korisnik nije dostavljen", "Please provide an admin recovery password, otherwise all user data will be lost" : "Molim navedite admin lozinku za povratak, u protivnom će svi korisnički podaci biti izgubljeni", "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za povratak. Molim provjerite lozinku i pokušajte ponovno.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.", "Unable to change password" : "Promjena lozinke nije moguća", "Enabled" : "Aktivirano", "Not enabled" : "Nije aktivirano", diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js index 5f6ddd5854d..51b03e4de94 100644 --- a/settings/l10n/ca.js +++ b/settings/l10n/ca.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "No heu proporcionat cap usuari", "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran", "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.", "Unable to change password" : "No es pot canviar la contrasenya", "Enabled" : "Activat", "Not enabled" : "Desactivat", diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json index 94d51582752..81c68e496b5 100644 --- a/settings/l10n/ca.json +++ b/settings/l10n/ca.json @@ -26,7 +26,6 @@ "No user supplied" : "No heu proporcionat cap usuari", "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran", "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.", "Unable to change password" : "No es pot canviar la contrasenya", "Enabled" : "Activat", "Not enabled" : "Desactivat", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 6258a2f21cd..bfdedafc8a2 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Nebyl uveden uživatel", "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena", "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatele byl úspěšně aktualizován.", "Unable to change password" : "Změna hesla se nezdařila", "Enabled" : "Povoleno", "Not enabled" : "Vypnuto", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Stáhnout soubor logu", "More" : "Více", "Less" : "Méně", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!", "Version" : "Verze", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Více aplikací", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Vaše emailová adresa", "Fill in an email address to enable password recovery and receive notifications" : "Zadejte emailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění", "No email address set" : "Emailová adresa není nastavena", + "You are member of the following groups:" : "Patříte do následujících skupin:", "Profile picture" : "Profilový obrázek", "Upload new" : "Nahrát nový", "Select new from Files" : "Vyberte nový ze souborů", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index e68f46debf9..549ef610de3 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -26,7 +26,7 @@ "No user supplied" : "Nebyl uveden uživatel", "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena", "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatele byl úspěšně aktualizován.", "Unable to change password" : "Změna hesla se nezdařila", "Enabled" : "Povoleno", "Not enabled" : "Vypnuto", @@ -174,7 +174,7 @@ "Download logfile" : "Stáhnout soubor logu", "More" : "Více", "Less" : "Méně", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!", "Version" : "Verze", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Více aplikací", @@ -215,6 +215,7 @@ "Your email address" : "Vaše emailová adresa", "Fill in an email address to enable password recovery and receive notifications" : "Zadejte emailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění", "No email address set" : "Emailová adresa není nastavena", + "You are member of the following groups:" : "Patříte do následujících skupin:", "Profile picture" : "Profilový obrázek", "Upload new" : "Nahrát nový", "Select new from Files" : "Vyberte nový ze souborů", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index 4614eff0fbb..702f7285514 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Intet brugernavn givet", "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt", "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", "Unable to change password" : "Kunne ikke ændre kodeord", "Enabled" : "Aktiveret", "Not enabled" : "Slået fra", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "Hent logfil", "More" : "Mere", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Logfilen er større end 100MB. Det kan tage en del tid at hente den!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Flere programmer", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index 6652762f5bb..093895838be 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -26,7 +26,6 @@ "No user supplied" : "Intet brugernavn givet", "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt", "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", "Unable to change password" : "Kunne ikke ændre kodeord", "Enabled" : "Aktiveret", "Not enabled" : "Slået fra", @@ -174,7 +173,6 @@ "Download logfile" : "Hent logfil", "More" : "Mere", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Logfilen er større end 100MB. Det kan tage en del tid at hente den!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Flere programmer", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index b9fa4d575e3..5deb310399d 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Keinen Benutzer übermittelt", "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Das Backend unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", @@ -39,7 +39,7 @@ OC.L10N.register( "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs", "Saved" : "Gespeichert", "test email settings" : "E-Mail-Einstellungen testen", - "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.", + "If you received this email, the settings seem to be correct." : "Wenn Du diese E-Mail erhalten hast, sind die Einstellungen korrekt.", "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.", "Email sent" : "E-Mail wurde verschickt", "You need to set your user email before being able to send test emails." : "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.", @@ -51,19 +51,19 @@ OC.L10N.register( "Invalid user" : "Ungültiger Nutzer", "Unable to change mail address" : "E-Mail Adresse konnte nicht geändert werden", "Email saved" : "E-Mail Adresse gespeichert", - "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?", + "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?", "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen", - "Sending..." : "Sende...", + "Sending..." : "Senden…", "All" : "Alle", - "Please wait...." : "Bitte warten...", + "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", - "Updating...." : "Aktualisierung...", + "Updating...." : "Aktualisierung…", "Error while updating app" : "Fehler beim Aktualisieren der App", "Updated" : "Aktualisiert", - "Uninstalling ...." : "Deinstalliere ....", + "Uninstalling ...." : "Deinstallieren…", "Error while uninstalling app" : "Fehler beim Deinstallieren der App", "Uninstall" : "Deinstallieren", "Select a profile picture" : "Wähle ein Profilbild", @@ -74,7 +74,7 @@ OC.L10N.register( "Strong password" : "Starkes Passwort", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.", + "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.", "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.", "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.", "Groups" : "Gruppen", @@ -129,7 +129,7 @@ OC.L10N.register( "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.", "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen", - "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwrite.cli.url\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").", + "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).", "Configuration Checks" : "Konfigurationsprüfungen", "No problems found" : "Keine Probleme gefunden", "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.", @@ -138,19 +138,19 @@ OC.L10N.register( "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!", "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.", - "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.", + "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.", "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API", "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen", "Enforce password protection" : "Passwortschutz erzwingen", "Allow public uploads" : "Öffentliches Hochladen erlauben", - "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden", + "Allow users to send mail notification for shared files" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", "Set default expiration date" : "Setze Ablaufdatum", "Expire after " : "Ablauf nach ", "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", "Allow resharing" : "Erlaubt erneutes Teilen", - "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe", - "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", + "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", + "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.", "Enforce HTTPS" : "Erzwinge HTTPS", @@ -160,11 +160,11 @@ OC.L10N.register( "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.", "Send mode" : "Sende-Modus", - "From address" : "Absender-Adresse", + "From address" : "Absenderadresse", "mail" : "Mail", "Authentication method" : "Authentifizierungsmethode", "Authentication required" : "Authentifizierung benötigt", - "Server address" : "Adresse des Servers", + "Server address" : "Serveradresse", "Port" : "Port", "Credentials" : "Zugangsdaten", "SMTP Username" : "SMTP Benutzername", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Logdatei herunterladen", "More" : "Mehr", "Less" : "Weniger", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", "More apps" : "Mehr Apps", @@ -190,7 +190,7 @@ OC.L10N.register( "Update to %s" : "Aktualisierung auf %s", "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", - "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>" : "Hallo,<br><br>wir möchten Dich nur wissen lassen, dass Du jetzt ein %s - Konto besitzt.<br><br>Dein Nutzername: %s<br>Öffne es: <a href=\"%s\">%s</a><br><br>", + "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>" : "Hallo,<br><br>wir möchten Dich nur wissen lassen, dass Du jetzt ein %s-Konto besitzt.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hallo!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwir möchten Dich nur wissen lassen, dass Du jetzt ein %s - Konto besitzt\n\nDein Nutzername: %s\nÖffne es: %s\n", "Administrator Documentation" : "Dokumentation für Administratoren", @@ -216,13 +216,14 @@ OC.L10N.register( "Email" : "E-Mail", "Your email address" : "Deine E-Mail-Adresse", "Fill in an email address to enable password recovery and receive notifications" : "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen", - "No email address set" : "Keine E-Mail Adresse angegeben", + "No email address set" : "Keine E-Mail-Adresse angegeben", + "You are member of the following groups:" : "Du bist Mitglied folgender Gruppen:", "Profile picture" : "Profilbild", "Upload new" : "Neues hochladen", "Select new from Files" : "Neues aus den Dateien wählen", "Remove image" : "Bild entfernen", - "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.", - "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.", + "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Du kannst es zuschneiden.", + "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichen Konto bereitgestellt.", "Cancel" : "Abbrechen", "Choose as profile image" : "Als Profilbild wählen", "Language" : "Sprache", @@ -232,7 +233,7 @@ OC.L10N.register( "Issued By" : "Ausgestellt von:", "Valid until %s" : "Gültig bis %s", "Import Root Certificate" : "Root-Zertifikate importieren", - "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.", + "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht länger aktiviert, bitte entschlüssele alle Deine Daten.", "Log-in password" : "Login-Passwort", "Decrypt all Files" : "Alle Dateien entschlüsseln", "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.", @@ -240,9 +241,9 @@ OC.L10N.register( "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", - "Show user backend" : "Nutzer-Backend anzeigen", + "Show user backend" : "Benutzer-Backend anzeigen", "Send email to new user" : "E-Mail an neuen Nutzer senden", - "Show email address" : "E-Mail Adresse anzeigen", + "Show email address" : "E-Mail-Adresse anzeigen", "Username" : "Benutzername", "E-Mail" : "E-Mail", "Create" : "Anlegen", @@ -254,7 +255,7 @@ OC.L10N.register( "Everyone" : "Jeder", "Admins" : "Administratoren", "Default Quota" : "Standard-Quota", - "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")", + "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z. B.: „512 MB“ oder „12 GB“)", "Unlimited" : "Unbegrenzt", "Other" : "Andere", "Group Admin for" : "Gruppenadministrator für", @@ -264,7 +265,7 @@ OC.L10N.register( "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", - "change email address" : "E-Mail Adresse ändern", + "change email address" : "E-Mail-Adresse ändern", "Default" : "Standard" }, "nplurals=2; plural=(n != 1);"); diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 4b9396cfb96..e023b11780a 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -26,7 +26,7 @@ "No user supplied" : "Keinen Benutzer übermittelt", "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Das Backend unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", @@ -37,7 +37,7 @@ "log-level out of allowed range" : "Log-Level außerhalb des erlaubten Bereichs", "Saved" : "Gespeichert", "test email settings" : "E-Mail-Einstellungen testen", - "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.", + "If you received this email, the settings seem to be correct." : "Wenn Du diese E-Mail erhalten hast, sind die Einstellungen korrekt.", "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.", "Email sent" : "E-Mail wurde verschickt", "You need to set your user email before being able to send test emails." : "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.", @@ -49,19 +49,19 @@ "Invalid user" : "Ungültiger Nutzer", "Unable to change mail address" : "E-Mail Adresse konnte nicht geändert werden", "Email saved" : "E-Mail Adresse gespeichert", - "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?", + "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?", "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen", - "Sending..." : "Sende...", + "Sending..." : "Senden…", "All" : "Alle", - "Please wait...." : "Bitte warten...", + "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", - "Updating...." : "Aktualisierung...", + "Updating...." : "Aktualisierung…", "Error while updating app" : "Fehler beim Aktualisieren der App", "Updated" : "Aktualisiert", - "Uninstalling ...." : "Deinstalliere ....", + "Uninstalling ...." : "Deinstallieren…", "Error while uninstalling app" : "Fehler beim Deinstallieren der App", "Uninstall" : "Deinstallieren", "Select a profile picture" : "Wähle ein Profilbild", @@ -72,7 +72,7 @@ "Strong password" : "Starkes Passwort", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.", + "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.", "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.", "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.", "Groups" : "Gruppen", @@ -127,7 +127,7 @@ "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.", "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen", - "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwrite.cli.url\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").", + "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).", "Configuration Checks" : "Konfigurationsprüfungen", "No problems found" : "Keine Probleme gefunden", "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.", @@ -136,19 +136,19 @@ "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!", "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.", - "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.", + "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.", "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API", "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen", "Enforce password protection" : "Passwortschutz erzwingen", "Allow public uploads" : "Öffentliches Hochladen erlauben", - "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden", + "Allow users to send mail notification for shared files" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", "Set default expiration date" : "Setze Ablaufdatum", "Expire after " : "Ablauf nach ", "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", "Allow resharing" : "Erlaubt erneutes Teilen", - "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe", - "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", + "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", + "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.", "Enforce HTTPS" : "Erzwinge HTTPS", @@ -158,11 +158,11 @@ "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.", "Send mode" : "Sende-Modus", - "From address" : "Absender-Adresse", + "From address" : "Absenderadresse", "mail" : "Mail", "Authentication method" : "Authentifizierungsmethode", "Authentication required" : "Authentifizierung benötigt", - "Server address" : "Adresse des Servers", + "Server address" : "Serveradresse", "Port" : "Port", "Credentials" : "Zugangsdaten", "SMTP Username" : "SMTP Benutzername", @@ -174,7 +174,7 @@ "Download logfile" : "Logdatei herunterladen", "More" : "Mehr", "Less" : "Weniger", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", "More apps" : "Mehr Apps", @@ -188,7 +188,7 @@ "Update to %s" : "Aktualisierung auf %s", "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", - "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>" : "Hallo,<br><br>wir möchten Dich nur wissen lassen, dass Du jetzt ein %s - Konto besitzt.<br><br>Dein Nutzername: %s<br>Öffne es: <a href=\"%s\">%s</a><br><br>", + "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>" : "Hallo,<br><br>wir möchten Dich nur wissen lassen, dass Du jetzt ein %s-Konto besitzt.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hallo!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwir möchten Dich nur wissen lassen, dass Du jetzt ein %s - Konto besitzt\n\nDein Nutzername: %s\nÖffne es: %s\n", "Administrator Documentation" : "Dokumentation für Administratoren", @@ -214,13 +214,14 @@ "Email" : "E-Mail", "Your email address" : "Deine E-Mail-Adresse", "Fill in an email address to enable password recovery and receive notifications" : "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen", - "No email address set" : "Keine E-Mail Adresse angegeben", + "No email address set" : "Keine E-Mail-Adresse angegeben", + "You are member of the following groups:" : "Du bist Mitglied folgender Gruppen:", "Profile picture" : "Profilbild", "Upload new" : "Neues hochladen", "Select new from Files" : "Neues aus den Dateien wählen", "Remove image" : "Bild entfernen", - "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.", - "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.", + "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Du kannst es zuschneiden.", + "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichen Konto bereitgestellt.", "Cancel" : "Abbrechen", "Choose as profile image" : "Als Profilbild wählen", "Language" : "Sprache", @@ -230,7 +231,7 @@ "Issued By" : "Ausgestellt von:", "Valid until %s" : "Gültig bis %s", "Import Root Certificate" : "Root-Zertifikate importieren", - "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.", + "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht länger aktiviert, bitte entschlüssele alle Deine Daten.", "Log-in password" : "Login-Passwort", "Decrypt all Files" : "Alle Dateien entschlüsseln", "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.", @@ -238,9 +239,9 @@ "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", - "Show user backend" : "Nutzer-Backend anzeigen", + "Show user backend" : "Benutzer-Backend anzeigen", "Send email to new user" : "E-Mail an neuen Nutzer senden", - "Show email address" : "E-Mail Adresse anzeigen", + "Show email address" : "E-Mail-Adresse anzeigen", "Username" : "Benutzername", "E-Mail" : "E-Mail", "Create" : "Anlegen", @@ -252,7 +253,7 @@ "Everyone" : "Jeder", "Admins" : "Administratoren", "Default Quota" : "Standard-Quota", - "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")", + "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z. B.: „512 MB“ oder „12 GB“)", "Unlimited" : "Unbegrenzt", "Other" : "Andere", "Group Admin for" : "Gruppenadministrator für", @@ -262,7 +263,7 @@ "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", - "change email address" : "E-Mail Adresse ändern", + "change email address" : "E-Mail-Adresse ändern", "Default" : "Standard" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 9ed520da8fa..874e61fa3fc 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Keinen Benutzer angegeben", "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können", "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Das Backend unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", @@ -49,21 +49,21 @@ OC.L10N.register( "Unable to delete user." : "Benutzer konnte nicht gelöscht werden.", "Forbidden" : "Verboten", "Invalid user" : "Ungültiger Nutzer", - "Unable to change mail address" : "E-Mail Adresse konnte nicht geändert werden", + "Unable to change mail address" : "E-Mail-Adresse konnte nicht geändert werden", "Email saved" : "E-Mail-Adresse gespeichert", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?", "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen", - "Sending..." : "Wird gesendet …", + "Sending..." : "Wird gesendet…", "All" : "Alle", - "Please wait...." : "Bitte warten....", + "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", - "Updating...." : "Update...", + "Updating...." : "Update…", "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", "Updated" : "Aktualisiert", - "Uninstalling ...." : "Wird deinstalliert …", + "Uninstalling ...." : "Wird deinstalliert…", "Error while uninstalling app" : "Fehler beim Deinstallieren der App", "Uninstall" : "Deinstallieren", "Select a profile picture" : "Wählen Sie ein Profilbild", @@ -74,7 +74,7 @@ OC.L10N.register( "Strong password" : "Starkes Passwort", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.", + "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.", "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.", "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.", "Groups" : "Gruppen", @@ -91,7 +91,7 @@ OC.L10N.register( "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", - "A valid email must be provided" : "Es muss eine gültige E-Mail Adresse angegeben werden", + "A valid email must be provided" : "Es muss eine gültige E-Mail-Adresse angegeben werden", "__language_name__" : "Deutsch (Förmlich: Sie)", "Personal Info" : "Persönliche Informationen", "SSL root certificates" : "SSL-Root-Zertifikate", @@ -129,7 +129,7 @@ OC.L10N.register( "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.", "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen", - "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die \"overwrite.cli.url\"-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: \"%s\").", + "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).", "Configuration Checks" : "Konfigurationsprüfungen", "No problems found" : "Keine Probleme gefunden", "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", @@ -143,14 +143,14 @@ OC.L10N.register( "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben", "Enforce password protection" : "Passwortschutz erzwingen", "Allow public uploads" : "Öffentliches Hochladen erlauben", - "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", + "Allow users to send mail notification for shared files" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", "Set default expiration date" : "Standardablaufdatum einstellen", "Expire after " : "Ablauf nach ", "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", - "Allow resharing" : "Erlaube Weiterverteilen", - "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken", - "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", + "Allow resharing" : "Weiterverteilen erlauben", + "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", + "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.", "Enforce HTTPS" : "HTTPS erzwingen", @@ -160,11 +160,11 @@ OC.L10N.register( "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", - "From address" : "Absender-Adresse", + "From address" : "Absenderadresse", "mail" : "Mail", "Authentication method" : "Legitimierungsmethode", "Authentication required" : "Authentifizierung benötigt", - "Server address" : "Adresse des Servers", + "Server address" : "Serveradresse", "Port" : "Port", "Credentials" : "Zugangsdaten", "SMTP Username" : "SMTP Benutzername", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Logdatei herunterladen", "More" : "Mehr", "Less" : "Weniger", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", "More apps" : "Mehr Apps", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Ihre E-Mail-Adresse", "Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen", "No email address set" : "Keine E-Mail-Adresse angegeben", + "You are member of the following groups:" : "Sie sind Mitglied folgender Gruppen:", "Profile picture" : "Profilbild", "Upload new" : "Neues hochladen", "Select new from Files" : "Neues aus Dateien wählen", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 361a3aa9614..03de1dd9a62 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -26,7 +26,7 @@ "No user supplied" : "Keinen Benutzer angegeben", "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können", "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Das Backend unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", @@ -47,21 +47,21 @@ "Unable to delete user." : "Benutzer konnte nicht gelöscht werden.", "Forbidden" : "Verboten", "Invalid user" : "Ungültiger Nutzer", - "Unable to change mail address" : "E-Mail Adresse konnte nicht geändert werden", + "Unable to change mail address" : "E-Mail-Adresse konnte nicht geändert werden", "Email saved" : "E-Mail-Adresse gespeichert", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?", "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen", - "Sending..." : "Wird gesendet …", + "Sending..." : "Wird gesendet…", "All" : "Alle", - "Please wait...." : "Bitte warten....", + "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten", - "Updating...." : "Update...", + "Updating...." : "Update…", "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", "Updated" : "Aktualisiert", - "Uninstalling ...." : "Wird deinstalliert …", + "Uninstalling ...." : "Wird deinstalliert…", "Error while uninstalling app" : "Fehler beim Deinstallieren der App", "Uninstall" : "Deinstallieren", "Select a profile picture" : "Wählen Sie ein Profilbild", @@ -72,7 +72,7 @@ "Strong password" : "Starkes Passwort", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.", + "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.", "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.", "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.", "Groups" : "Gruppen", @@ -89,7 +89,7 @@ "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", - "A valid email must be provided" : "Es muss eine gültige E-Mail Adresse angegeben werden", + "A valid email must be provided" : "Es muss eine gültige E-Mail-Adresse angegeben werden", "__language_name__" : "Deutsch (Förmlich: Sie)", "Personal Info" : "Persönliche Informationen", "SSL root certificates" : "SSL-Root-Zertifikate", @@ -127,7 +127,7 @@ "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.", "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen", - "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die \"overwrite.cli.url\"-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: \"%s\").", + "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).", "Configuration Checks" : "Konfigurationsprüfungen", "No problems found" : "Keine Probleme gefunden", "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", @@ -141,14 +141,14 @@ "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben", "Enforce password protection" : "Passwortschutz erzwingen", "Allow public uploads" : "Öffentliches Hochladen erlauben", - "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", + "Allow users to send mail notification for shared files" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien zu senden", "Set default expiration date" : "Standardablaufdatum einstellen", "Expire after " : "Ablauf nach ", "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", - "Allow resharing" : "Erlaube Weiterverteilen", - "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken", - "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", + "Allow resharing" : "Weiterverteilen erlauben", + "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", + "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.", "Enforce HTTPS" : "HTTPS erzwingen", @@ -158,11 +158,11 @@ "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", - "From address" : "Absender-Adresse", + "From address" : "Absenderadresse", "mail" : "Mail", "Authentication method" : "Legitimierungsmethode", "Authentication required" : "Authentifizierung benötigt", - "Server address" : "Adresse des Servers", + "Server address" : "Serveradresse", "Port" : "Port", "Credentials" : "Zugangsdaten", "SMTP Username" : "SMTP Benutzername", @@ -174,7 +174,7 @@ "Download logfile" : "Logdatei herunterladen", "More" : "Mehr", "Less" : "Weniger", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", "More apps" : "Mehr Apps", @@ -215,6 +215,7 @@ "Your email address" : "Ihre E-Mail-Adresse", "Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen", "No email address set" : "Keine E-Mail-Adresse angegeben", + "You are member of the following groups:" : "Sie sind Mitglied folgender Gruppen:", "Profile picture" : "Profilbild", "Upload new" : "Neues hochladen", "Select new from Files" : "Neues aus Dateien wählen", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 007f07ca55a..d81f643e746 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Δεν εισήχθη χρήστης", "Please provide an admin recovery password, otherwise all user data will be lost" : "Παρακαλώ παρέχετε έναν κωδικό ανάκτησης διαχειριστή, διαφορετικά όλα τα δεδομένα χρήστη θα χαθούν", "Wrong admin recovery password. Please check the password and try again." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.", "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού", "Enabled" : "Ενεργοποιημένο", "Not enabled" : "Μη ενεργοποιημένο", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index ffe355e4dc5..d6ffdddb4b7 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -26,7 +26,6 @@ "No user supplied" : "Δεν εισήχθη χρήστης", "Please provide an admin recovery password, otherwise all user data will be lost" : "Παρακαλώ παρέχετε έναν κωδικό ανάκτησης διαχειριστή, διαφορετικά όλα τα δεδομένα χρήστη θα χαθούν", "Wrong admin recovery password. Please check the password and try again." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.", "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού", "Enabled" : "Ενεργοποιημένο", "Not enabled" : "Μη ενεργοποιημένο", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index ea2e5ba3493..4ba13485ac6 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "No user supplied", "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost", "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend doesn't support password change, but the user's encryption key was successfully updated.", "Unable to change password" : "Unable to change password", "Enabled" : "Enabled", "Not enabled" : "Not enabled", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Download logfile", "More" : "More", "Less" : "Less", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "The logfile is bigger than 100MB. Downloading it may take some time!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>.", "More apps" : "More apps", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Your email address", "Fill in an email address to enable password recovery and receive notifications" : "Fill in an email address to enable password recovery and receive notifications", "No email address set" : "No email address set", + "You are member of the following groups:" : "You are member of the following groups:", "Profile picture" : "Profile picture", "Upload new" : "Upload new", "Select new from Files" : "Select new from Files", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index fef80669a8b..9e0c7ec5b56 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -26,7 +26,7 @@ "No user supplied" : "No user supplied", "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost", "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend doesn't support password change, but the user's encryption key was successfully updated.", "Unable to change password" : "Unable to change password", "Enabled" : "Enabled", "Not enabled" : "Not enabled", @@ -174,7 +174,7 @@ "Download logfile" : "Download logfile", "More" : "More", "Less" : "Less", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "The logfile is bigger than 100MB. Downloading it may take some time!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "The logfile is larger than 100 MB. Downloading it may take some time!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>.", "More apps" : "More apps", @@ -215,6 +215,7 @@ "Your email address" : "Your email address", "Fill in an email address to enable password recovery and receive notifications" : "Fill in an email address to enable password recovery and receive notifications", "No email address set" : "No email address set", + "You are member of the following groups:" : "You are member of the following groups:", "Profile picture" : "Profile picture", "Upload new" : "Upload new", "Select new from Files" : "Select new from Files", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 555d8844059..bf955e11b07 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "No se especificó un usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "El backend no admite cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", "Unable to change password" : "No se ha podido cambiar la contraseña", "Enabled" : "Habilitado", "Not enabled" : "No habilitado", @@ -86,7 +86,7 @@ OC.L10N.register( "no group" : "sin grupo", "never" : "nunca", "deleted {userName}" : "borrado {userName}", - "add group" : "añadir Grupo", + "add group" : "añadir grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "Error creating user" : "Error al crear usuario", @@ -116,7 +116,7 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Database Performance Info" : "Información de rendimiento de la base de datos", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ", - "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.", "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type'", "Microsoft Windows Platform" : "Plataforma de Microsoft Windows", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.", @@ -148,7 +148,7 @@ OC.L10N.register( "Expire after " : "Caduca luego de", "days" : "días", "Enforce expiration date" : "Imponer fecha de caducidad", - "Allow resharing" : "Permitir re-compartición", + "Allow resharing" : "Permitir recompartición", "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios", "Exclude groups from sharing" : "Excluye grupos de compartir", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Descargar archivo de registro", "More" : "Más", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100MB. Descargarlo puede tardar. ", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.", "Version" : "Versión", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Más aplicaciones", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Su dirección de correo", "Fill in an email address to enable password recovery and receive notifications" : "Introducir una dirección de correo electrónico para activar la recuperación de contraseñas y recibir notificaciones", "No email address set" : "Ninguna dirección de correo establecida", + "You are member of the following groups:" : "Es miembro de los siguientes grupos:", "Profile picture" : "Foto de perfil", "Upload new" : "Subir otra", "Select new from Files" : "Seleccionar otra desde Archivos", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 22f15a8c7a7..cb1f960c6ad 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -26,7 +26,7 @@ "No user supplied" : "No se especificó un usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "El backend no admite cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", "Unable to change password" : "No se ha podido cambiar la contraseña", "Enabled" : "Habilitado", "Not enabled" : "No habilitado", @@ -84,7 +84,7 @@ "no group" : "sin grupo", "never" : "nunca", "deleted {userName}" : "borrado {userName}", - "add group" : "añadir Grupo", + "add group" : "añadir grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "Error creating user" : "Error al crear usuario", @@ -114,7 +114,7 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Database Performance Info" : "Información de rendimiento de la base de datos", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ", - "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.", "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type'", "Microsoft Windows Platform" : "Plataforma de Microsoft Windows", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.", @@ -146,7 +146,7 @@ "Expire after " : "Caduca luego de", "days" : "días", "Enforce expiration date" : "Imponer fecha de caducidad", - "Allow resharing" : "Permitir re-compartición", + "Allow resharing" : "Permitir recompartición", "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios", "Exclude groups from sharing" : "Excluye grupos de compartir", @@ -174,7 +174,7 @@ "Download logfile" : "Descargar archivo de registro", "More" : "Más", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100MB. Descargarlo puede tardar. ", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.", "Version" : "Versión", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Más aplicaciones", @@ -215,6 +215,7 @@ "Your email address" : "Su dirección de correo", "Fill in an email address to enable password recovery and receive notifications" : "Introducir una dirección de correo electrónico para activar la recuperación de contraseñas y recibir notificaciones", "No email address set" : "Ninguna dirección de correo establecida", + "You are member of the following groups:" : "Es miembro de los siguientes grupos:", "Profile picture" : "Foto de perfil", "Upload new" : "Subir otra", "Select new from Files" : "Seleccionar otra desde Archivos", diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js index dadc67aa35d..6e6fe904fa3 100644 --- a/settings/l10n/es_AR.js +++ b/settings/l10n/es_AR.js @@ -20,7 +20,6 @@ OC.L10N.register( "No user supplied" : "No se ha indicado el usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.", "Unable to change password" : "Imposible cambiar la contraseña", "Enabled" : "Habilitado", "Saved" : "Guardado", diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json index 3078702c1cb..d0ef5a11d71 100644 --- a/settings/l10n/es_AR.json +++ b/settings/l10n/es_AR.json @@ -18,7 +18,6 @@ "No user supplied" : "No se ha indicado el usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.", "Unable to change password" : "Imposible cambiar la contraseña", "Enabled" : "Habilitado", "Saved" : "Guardado", diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js index b74457cd63b..fbbbb417011 100644 --- a/settings/l10n/es_MX.js +++ b/settings/l10n/es_MX.js @@ -18,7 +18,6 @@ OC.L10N.register( "No user supplied" : "No se especificó un usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", "Unable to change password" : "No se ha podido cambiar la contraseña", "Enabled" : "Habilitar", "Email sent" : "Correo electrónico enviado", diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json index e6842c4e67f..5d1bdcdc14c 100644 --- a/settings/l10n/es_MX.json +++ b/settings/l10n/es_MX.json @@ -16,7 +16,6 @@ "No user supplied" : "No se especificó un usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario", "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.", "Unable to change password" : "No se ha podido cambiar la contraseña", "Enabled" : "Habilitar", "Email sent" : "Correo electrónico enviado", diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js index 26f18ce00fa..40df9ccd203 100644 --- a/settings/l10n/et_EE.js +++ b/settings/l10n/et_EE.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Kasutajat ei sisestatud", "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed", "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.", "Unable to change password" : "Ei suuda parooli muuta", "Enabled" : "Sisse lülitatud", "Not enabled" : "Pole sisse lülitatud", diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json index 7618ee8cda2..6056f3de0f3 100644 --- a/settings/l10n/et_EE.json +++ b/settings/l10n/et_EE.json @@ -26,7 +26,6 @@ "No user supplied" : "Kasutajat ei sisestatud", "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed", "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.", "Unable to change password" : "Ei suuda parooli muuta", "Enabled" : "Sisse lülitatud", "Not enabled" : "Pole sisse lülitatud", diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js index 2967d41b48b..ca3950d73ed 100644 --- a/settings/l10n/eu.js +++ b/settings/l10n/eu.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Ez da erabiltzailerik zehaztu", "Please provide an admin recovery password, otherwise all user data will be lost" : "Mesedez eman berreskuratzeko administrazio pasahitza, bestela erabiltzaile datu guztiak galduko dira", "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.", "Unable to change password" : "Ezin izan da pasahitza aldatu", "Enabled" : "Gaitua", "Not enabled" : "Gaitu gabe", @@ -173,7 +172,6 @@ OC.L10N.register( "Download logfile" : "Deskargatu log fitxategia", "More" : "Gehiago", "Less" : "Gutxiago", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log fitxategia 100MB baino haundiagoa da. Deskargatzeak denbora har lezake!", "Version" : "Bertsioa", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.", "More apps" : "App gehiago", diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json index 7b081773a41..d283812454c 100644 --- a/settings/l10n/eu.json +++ b/settings/l10n/eu.json @@ -26,7 +26,6 @@ "No user supplied" : "Ez da erabiltzailerik zehaztu", "Please provide an admin recovery password, otherwise all user data will be lost" : "Mesedez eman berreskuratzeko administrazio pasahitza, bestela erabiltzaile datu guztiak galduko dira", "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.", "Unable to change password" : "Ezin izan da pasahitza aldatu", "Enabled" : "Gaitua", "Not enabled" : "Gaitu gabe", @@ -171,7 +170,6 @@ "Download logfile" : "Deskargatu log fitxategia", "More" : "Gehiago", "Less" : "Gutxiago", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log fitxategia 100MB baino haundiagoa da. Deskargatzeak denbora har lezake!", "Version" : "Bertsioa", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.", "More apps" : "App gehiago", diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js index 1a963837ba4..873ad725dbd 100644 --- a/settings/l10n/fa.js +++ b/settings/l10n/fa.js @@ -23,7 +23,6 @@ OC.L10N.register( "No user supplied" : "هیچ کاربری تعریف نشده است", "Please provide an admin recovery password, otherwise all user data will be lost" : "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت.", "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمیکند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.", "Unable to change password" : "نمیتوان رمز را تغییر داد", "Enabled" : "فعال شده", "Saved" : "ذخیره شد", diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json index 05bff418774..2762f822057 100644 --- a/settings/l10n/fa.json +++ b/settings/l10n/fa.json @@ -21,7 +21,6 @@ "No user supplied" : "هیچ کاربری تعریف نشده است", "Please provide an admin recovery password, otherwise all user data will be lost" : "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت.", "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمیکند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.", "Unable to change password" : "نمیتوان رمز را تغییر داد", "Enabled" : "فعال شده", "Saved" : "ذخیره شد", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 95c37296ea3..3f7cdd09db9 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Käyttäjää ei määritetty", "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään", "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtoa, mutta käyttäjän salausavain päivitettiin onnistuneesti.", "Unable to change password" : "Salasanan vaihto ei onnistunut", "Enabled" : "Käytössä", "Not enabled" : "Ei käytössä", @@ -169,7 +169,7 @@ OC.L10N.register( "Download logfile" : "Lataa lokitiedosto", "More" : "Enemmän", "Less" : "Vähemmän", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Lokitiedostoa on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.", "Version" : "Versio", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.", "More apps" : "Lisää sovelluksia", @@ -210,6 +210,7 @@ OC.L10N.register( "Your email address" : "Sähköpostiosoitteesi", "Fill in an email address to enable password recovery and receive notifications" : "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia", "No email address set" : "Sähköpostiosoitetta ei ole asetettu", + "You are member of the following groups:" : "Olet jäsenenä seuraavissa ryhmissä:", "Profile picture" : "Profiilikuva", "Upload new" : "Lähetä uusi", "Select new from Files" : "Valitse uusi tiedostoista", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 53bf1eebb5d..a3811b055f3 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -26,7 +26,7 @@ "No user supplied" : "Käyttäjää ei määritetty", "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään", "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtoa, mutta käyttäjän salausavain päivitettiin onnistuneesti.", "Unable to change password" : "Salasanan vaihto ei onnistunut", "Enabled" : "Käytössä", "Not enabled" : "Ei käytössä", @@ -167,7 +167,7 @@ "Download logfile" : "Lataa lokitiedosto", "More" : "Enemmän", "Less" : "Vähemmän", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Lokitiedostoa on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.", "Version" : "Versio", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.", "More apps" : "Lisää sovelluksia", @@ -208,6 +208,7 @@ "Your email address" : "Sähköpostiosoitteesi", "Fill in an email address to enable password recovery and receive notifications" : "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia", "No email address set" : "Sähköpostiosoitetta ei ole asetettu", + "You are member of the following groups:" : "Olet jäsenenä seuraavissa ryhmissä:", "Profile picture" : "Profiilikuva", "Upload new" : "Lähetä uusi", "Select new from Files" : "Valitse uusi tiedostoista", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 9f56de0c834..61d87d4e3f0 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Aucun utilisateur fourni", "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues", "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne permet pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement de l'utilisateur a été mise à jour avec succès.", "Unable to change password" : "Impossible de modifier le mot de passe", "Enabled" : "Activées", "Not enabled" : "Désactivées", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Télécharger le fichier de journalisation", "More" : "Plus", "Less" : "Moins", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Le fichier de journalisation dépasse les 100Mo. Son téléchargement pourra prendre du temps !", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Le fichier de journalisation dépasser les 100 Mo. Le télécharger peut prendre un certain temps.", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Plus d'applications", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Votre adresse e-mail", "Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications", "No email address set" : "Aucune adresse e-mail configurée", + "You are member of the following groups:" : "Vous êtes membre des groupes suivants :", "Profile picture" : "Photo de profil", "Upload new" : "Nouvelle depuis votre ordinateur", "Select new from Files" : "Nouvelle depuis les Fichiers", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index d9d18fd0b19..72ab2394461 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -26,7 +26,7 @@ "No user supplied" : "Aucun utilisateur fourni", "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues", "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne permet pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement de l'utilisateur a été mise à jour avec succès.", "Unable to change password" : "Impossible de modifier le mot de passe", "Enabled" : "Activées", "Not enabled" : "Désactivées", @@ -174,7 +174,7 @@ "Download logfile" : "Télécharger le fichier de journalisation", "More" : "Plus", "Less" : "Moins", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Le fichier de journalisation dépasse les 100Mo. Son téléchargement pourra prendre du temps !", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Le fichier de journalisation dépasser les 100 Mo. Le télécharger peut prendre un certain temps.", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Plus d'applications", @@ -215,6 +215,7 @@ "Your email address" : "Votre adresse e-mail", "Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications", "No email address set" : "Aucune adresse e-mail configurée", + "You are member of the following groups:" : "Vous êtes membre des groupes suivants :", "Profile picture" : "Photo de profil", "Upload new" : "Nouvelle depuis votre ordinateur", "Select new from Files" : "Nouvelle depuis les Fichiers", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index 6b4f1857307..9c8edd487ba 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Non subministrado polo usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario", "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado do usuario foi actualizada correctamente.", "Unable to change password" : "Non é posíbel cambiar o contrasinal", "Enabled" : "Activado", "Not enabled" : "Non activado", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Descargar o ficheiro do rexistro", "More" : "Máis", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O ficheiro do rexistro ocupa máis de 100MB. A descarga pode levar bastante tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!", "Version" : "Versión", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Máis aplicativos", @@ -212,11 +212,12 @@ OC.L10N.register( "New password" : "Novo contrasinal", "Change password" : "Cambiar o contrasinal", "Full Name" : "Nome completo", - "No display name set" : "Sen nome visible establecido", + "No display name set" : "Sen nome visíbel estabelecido", "Email" : "Correo", "Your email address" : "O seu enderezo de correo", "Fill in an email address to enable password recovery and receive notifications" : "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións", "No email address set" : "Non hai un enderezo de correo definido", + "You are member of the following groups:" : "Vostede é membro dos seguintes grupos:", "Profile picture" : "Imaxe do perfil", "Upload new" : "Novo envío", "Select new from Files" : "Seleccione unha nova de ficheiros", @@ -229,8 +230,8 @@ OC.L10N.register( "Help translate" : "Axude na tradución", "Common Name" : "Nome común", "Valid until" : "Válido ata", - "Issued By" : "Proporcionado por", - "Valid until %s" : "Válido ate %s", + "Issued By" : "Fornecido por", + "Valid until %s" : "Válido ata %s", "Import Root Certificate" : "Importar o certificado raíz", "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros", "Log-in password" : "Contrasinal de acceso", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 9aea9e8b5cb..b17c2c424f6 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -26,7 +26,7 @@ "No user supplied" : "Non subministrado polo usuario", "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario", "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado do usuario foi actualizada correctamente.", "Unable to change password" : "Non é posíbel cambiar o contrasinal", "Enabled" : "Activado", "Not enabled" : "Non activado", @@ -174,7 +174,7 @@ "Download logfile" : "Descargar o ficheiro do rexistro", "More" : "Máis", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O ficheiro do rexistro ocupa máis de 100MB. A descarga pode levar bastante tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!", "Version" : "Versión", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Máis aplicativos", @@ -210,11 +210,12 @@ "New password" : "Novo contrasinal", "Change password" : "Cambiar o contrasinal", "Full Name" : "Nome completo", - "No display name set" : "Sen nome visible establecido", + "No display name set" : "Sen nome visíbel estabelecido", "Email" : "Correo", "Your email address" : "O seu enderezo de correo", "Fill in an email address to enable password recovery and receive notifications" : "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións", "No email address set" : "Non hai un enderezo de correo definido", + "You are member of the following groups:" : "Vostede é membro dos seguintes grupos:", "Profile picture" : "Imaxe do perfil", "Upload new" : "Novo envío", "Select new from Files" : "Seleccione unha nova de ficheiros", @@ -227,8 +228,8 @@ "Help translate" : "Axude na tradución", "Common Name" : "Nome común", "Valid until" : "Válido ata", - "Issued By" : "Proporcionado por", - "Valid until %s" : "Válido ate %s", + "Issued By" : "Fornecido por", + "Valid until %s" : "Válido ata %s", "Import Root Certificate" : "Importar o certificado raíz", "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros", "Log-in password" : "Contrasinal de acceso", diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js index 5c8249f10eb..7b193a3b596 100644 --- a/settings/l10n/hr.js +++ b/settings/l10n/hr.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nijedan korisnik nije dostavljen", "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.", "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.", "Unable to change password" : "Promjena lozinke nije moguća", "Enabled" : "Aktivirano", "Recommended" : "Preporuceno", diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json index 65ae83d0b9a..dd0c671805b 100644 --- a/settings/l10n/hr.json +++ b/settings/l10n/hr.json @@ -26,7 +26,6 @@ "No user supplied" : "Nijedan korisnik nije dostavljen", "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.", "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.", "Unable to change password" : "Promjena lozinke nije moguća", "Enabled" : "Aktivirano", "Recommended" : "Preporuceno", diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js index 03091a468fd..17b9897e01c 100644 --- a/settings/l10n/hu_HU.js +++ b/settings/l10n/hu_HU.js @@ -27,7 +27,6 @@ OC.L10N.register( "No user supplied" : "Nincs megadva felhasználó", "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!", "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.", "Unable to change password" : "Nem sikerült megváltoztatni a jelszót", "Enabled" : "Bekapcsolva", "Recommended" : "Ajánlott", diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json index dc58dcf7112..dbf92b68536 100644 --- a/settings/l10n/hu_HU.json +++ b/settings/l10n/hu_HU.json @@ -25,7 +25,6 @@ "No user supplied" : "Nincs megadva felhasználó", "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!", "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.", "Unable to change password" : "Nem sikerült megváltoztatni a jelszót", "Enabled" : "Bekapcsolva", "Recommended" : "Ajánlott", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index d62b00d4778..522276efdf8 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Tidak ada pengguna yang diberikan", "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus", "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.", "Unable to change password" : "Tidak dapat mengubah sandi", "Enabled" : "Diaktifkan", "Not enabled" : "Tidak diaktifkan", @@ -173,7 +172,6 @@ OC.L10N.register( "Download logfile" : "Unduh berkas log", "More" : "Lainnya", "Less" : "Ciutkan", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Menggunduhnya akan memerlukan waktu!", "Version" : "Versi", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Lebih banyak aplikasi", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index 6a096aa6509..727e4d7bf95 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -26,7 +26,6 @@ "No user supplied" : "Tidak ada pengguna yang diberikan", "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus", "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.", "Unable to change password" : "Tidak dapat mengubah sandi", "Enabled" : "Diaktifkan", "Not enabled" : "Tidak diaktifkan", @@ -171,7 +170,6 @@ "Download logfile" : "Unduh berkas log", "More" : "Lainnya", "Less" : "Ciutkan", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Menggunduhnya akan memerlukan waktu!", "Version" : "Versi", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Lebih banyak aplikasi", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index beb4574d216..0984619e282 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Non è stato fornito alcun utente", "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.", "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", "Unable to change password" : "Impossibile cambiare la password", "Enabled" : "Abilitata", "Not enabled" : "Non abilitata", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Scarica file di log", "More" : "Altro", "Less" : "Meno", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!", "Version" : "Versione", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Altre applicazioni", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Il tuo indirizzo email", "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche", "No email address set" : "Nessun indirizzo email impostato", + "You are member of the following groups:" : "Sei membro dei seguenti gruppi:", "Profile picture" : "Immagine del profilo", "Upload new" : "Carica nuova", "Select new from Files" : "Seleziona nuova da file", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index e67e4aee3c8..2973e104665 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -26,7 +26,7 @@ "No user supplied" : "Non è stato fornito alcun utente", "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.", "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", "Unable to change password" : "Impossibile cambiare la password", "Enabled" : "Abilitata", "Not enabled" : "Non abilitata", @@ -174,7 +174,7 @@ "Download logfile" : "Scarica file di log", "More" : "Altro", "Less" : "Meno", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!", "Version" : "Versione", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Altre applicazioni", @@ -215,6 +215,7 @@ "Your email address" : "Il tuo indirizzo email", "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche", "No email address set" : "Nessun indirizzo email impostato", + "You are member of the following groups:" : "Sei membro dei seguenti gruppi:", "Profile picture" : "Immagine del profilo", "Upload new" : "Carica nuova", "Select new from Files" : "Seleziona nuova da file", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 0e0547c8be2..e5ad4a91f38 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "ユーザーが指定されていません", "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。", "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。", "Unable to change password" : "パスワードを変更できません", "Enabled" : "有効", "Not enabled" : "無効", @@ -115,6 +115,9 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。", "Database Performance Info" : "データベースパフォーマンス情報", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．", + "To migrate to another database use the command line tool: 'occ db:convert-type'" : "他のデータベースに移行する場合はコマンドラインツール 'occ db:convert-type'を使ってください。", "Microsoft Windows Platform" : "Microsoft Windows 環境", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", "Module 'fileinfo' missing" : "モジュール 'fileinfo' が見つかりません", @@ -173,7 +176,7 @@ OC.L10N.register( "Download logfile" : "logファイルのダウンロード", "More" : "もっと見る", "Less" : "閉じる", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！", "Version" : "バージョン", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。", "More apps" : "他のアプリ", @@ -214,6 +217,7 @@ OC.L10N.register( "Your email address" : "あなたのメールアドレス", "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください", "No email address set" : "メールアドレスが設定されていません", + "You are member of the following groups:" : "次のグループのメンバーです:", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", "Select new from Files" : "新しいファイルを選択", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 83193ef9c8c..a49469a8550 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -26,7 +26,7 @@ "No user supplied" : "ユーザーが指定されていません", "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。", "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。", "Unable to change password" : "パスワードを変更できません", "Enabled" : "有効", "Not enabled" : "無効", @@ -113,6 +113,9 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。", "Database Performance Info" : "データベースパフォーマンス情報", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．", + "To migrate to another database use the command line tool: 'occ db:convert-type'" : "他のデータベースに移行する場合はコマンドラインツール 'occ db:convert-type'を使ってください。", "Microsoft Windows Platform" : "Microsoft Windows 環境", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", "Module 'fileinfo' missing" : "モジュール 'fileinfo' が見つかりません", @@ -171,7 +174,7 @@ "Download logfile" : "logファイルのダウンロード", "More" : "もっと見る", "Less" : "閉じる", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！", "Version" : "バージョン", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。", "More apps" : "他のアプリ", @@ -212,6 +215,7 @@ "Your email address" : "あなたのメールアドレス", "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください", "No email address set" : "メールアドレスが設定されていません", + "You are member of the following groups:" : "次のグループのメンバーです:", "Profile picture" : "プロフィール画像", "Upload new" : "新たにアップロード", "Select new from Files" : "新しいファイルを選択", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index 10395c10e46..a126aca72d0 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "사용자가 지정되지 않음", "Please provide an admin recovery password, otherwise all user data will be lost" : "관리자 복구 암호를 입력하지 않으면 모든 사용자 데이터가 삭제됩니다", "Wrong admin recovery password. Please check the password and try again." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.", "Unable to change password" : "암호를 변경할 수 없음", "Enabled" : "활성", "Not enabled" : "비활성", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "로그 파일 다운로드", "More" : "더 중요함", "Less" : "덜 중요함", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "이 로그 파일은 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수도 있습니다!", "Version" : "버전", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.", "More apps" : "더 많은 앱", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index 901cabfe873..0b0973cbb56 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -26,7 +26,6 @@ "No user supplied" : "사용자가 지정되지 않음", "Please provide an admin recovery password, otherwise all user data will be lost" : "관리자 복구 암호를 입력하지 않으면 모든 사용자 데이터가 삭제됩니다", "Wrong admin recovery password. Please check the password and try again." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.", "Unable to change password" : "암호를 변경할 수 없음", "Enabled" : "활성", "Not enabled" : "비활성", @@ -174,7 +173,6 @@ "Download logfile" : "로그 파일 다운로드", "More" : "더 중요함", "Less" : "덜 중요함", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "이 로그 파일은 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수도 있습니다!", "Version" : "버전", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.", "More apps" : "더 많은 앱", diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js index c707eb1bac2..18711b019a5 100644 --- a/settings/l10n/lt_LT.js +++ b/settings/l10n/lt_LT.js @@ -16,7 +16,6 @@ OC.L10N.register( "No user supplied" : "Nepateiktas naudotojas", "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti", "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.", "Unable to change password" : "Nepavyksta pakeisti slaptažodžio", "Enabled" : "Įjungta", "Email sent" : "Laiškas išsiųstas", diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json index f561cdb1a24..1755c624207 100644 --- a/settings/l10n/lt_LT.json +++ b/settings/l10n/lt_LT.json @@ -14,7 +14,6 @@ "No user supplied" : "Nepateiktas naudotojas", "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti", "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.", "Unable to change password" : "Nepavyksta pakeisti slaptažodžio", "Enabled" : "Įjungta", "Email sent" : "Laiškas išsiųstas", diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js index 9d07761e32e..d4bdebde618 100644 --- a/settings/l10n/lv.js +++ b/settings/l10n/lv.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nav norādīts lietotājs", "Please provide an admin recovery password, otherwise all user data will be lost" : "Lūdzu ievadiet administratora atjaunošanas paroli, citādi visi lietotāja dati tiks zaudēti", "Wrong admin recovery password. Please check the password and try again." : "Nepareiza administratora atjaunošanas parole. Lūdzu pārbaudiet paroli un mēģiniet vēlreiz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Aizmugursistēma neatbalsta paroles maiņu, bet lietotāja šifrēšanas atslēga tika veiksmīgi atjaunota.", "Unable to change password" : "Nav iespējams nomainīt paroli", "Enabled" : "Pievienots", "Not enabled" : "Nav pievienots", diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json index 813f0d667f4..c76f40d1d2b 100644 --- a/settings/l10n/lv.json +++ b/settings/l10n/lv.json @@ -26,7 +26,6 @@ "No user supplied" : "Nav norādīts lietotājs", "Please provide an admin recovery password, otherwise all user data will be lost" : "Lūdzu ievadiet administratora atjaunošanas paroli, citādi visi lietotāja dati tiks zaudēti", "Wrong admin recovery password. Please check the password and try again." : "Nepareiza administratora atjaunošanas parole. Lūdzu pārbaudiet paroli un mēģiniet vēlreiz.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Aizmugursistēma neatbalsta paroles maiņu, bet lietotāja šifrēšanas atslēga tika veiksmīgi atjaunota.", "Unable to change password" : "Nav iespējams nomainīt paroli", "Enabled" : "Pievienots", "Not enabled" : "Nav pievienots", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index 28ca2773e7e..dfabb8bfb96 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Ingen bruker angitt", "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt", "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.", "Unable to change password" : "Kunne ikke endre passord", "Enabled" : "Aktiv", "Not enabled" : "Ikke aktivert", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "Last ned loggfil", "More" : "Mer", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Loggfilen er større enn 100MB. Det kan ta litt tid å laste den ned!", "Version" : "Versjon", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Flere apper", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index b7965fbf67d..019496ebf4b 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -26,7 +26,6 @@ "No user supplied" : "Ingen bruker angitt", "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt", "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.", "Unable to change password" : "Kunne ikke endre passord", "Enabled" : "Aktiv", "Not enabled" : "Ikke aktivert", @@ -174,7 +173,6 @@ "Download logfile" : "Last ned loggfil", "More" : "Mer", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Loggfilen er større enn 100MB. Det kan ta litt tid å laste den ned!", "Version" : "Versjon", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Flere apper", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 9cb1d26fb05..8913ab80c5c 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Geen gebruiker opgegeven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan", "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.", "Unable to change password" : "Kan wachtwoord niet wijzigen", "Enabled" : "Geactiveerd", "Not enabled" : "Niet ingeschakeld", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Download logbestand", "More" : "Meer", "Less" : "Minder", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "het logbestand is groter dan 100MB. Downloaden kost even tijd!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!", "Version" : "Versie", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Meer applicaties", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "Uw e-mailadres", "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen", "No email address set" : "Geen e-mailadres opgegeven", + "You are member of the following groups:" : "U bent lid van de volgende groepen:", "Profile picture" : "Profielafbeelding", "Upload new" : "Upload een nieuwe", "Select new from Files" : "Selecteer een nieuwe vanuit bestanden", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 97549a6f08d..ff6ebd2b0a1 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -26,7 +26,7 @@ "No user supplied" : "Geen gebruiker opgegeven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan", "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.", "Unable to change password" : "Kan wachtwoord niet wijzigen", "Enabled" : "Geactiveerd", "Not enabled" : "Niet ingeschakeld", @@ -174,7 +174,7 @@ "Download logfile" : "Download logbestand", "More" : "Meer", "Less" : "Minder", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "het logbestand is groter dan 100MB. Downloaden kost even tijd!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!", "Version" : "Versie", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Meer applicaties", @@ -215,6 +215,7 @@ "Your email address" : "Uw e-mailadres", "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen", "No email address set" : "Geen e-mailadres opgegeven", + "You are member of the following groups:" : "U bent lid van de volgende groepen:", "Profile picture" : "Profielafbeelding", "Upload new" : "Upload een nieuwe", "Select new from Files" : "Selecteer een nieuwe vanuit bestanden", diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js index cf686040086..c2146b270d9 100644 --- a/settings/l10n/nn_NO.js +++ b/settings/l10n/nn_NO.js @@ -16,7 +16,6 @@ OC.L10N.register( "No user supplied" : "Ingen brukar gjeve", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gje eit admingjenopprettingspassord, elles vil all brukardata gå tapt.", "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.", "Unable to change password" : "Klarte ikkje å endra passordet", "Email sent" : "E-post sendt", "Email saved" : "E-postadresse lagra", diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json index f0275d8805b..d0774fa7d2e 100644 --- a/settings/l10n/nn_NO.json +++ b/settings/l10n/nn_NO.json @@ -14,7 +14,6 @@ "No user supplied" : "Ingen brukar gjeve", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gje eit admingjenopprettingspassord, elles vil all brukardata gå tapt.", "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.", "Unable to change password" : "Klarte ikkje å endra passordet", "Email sent" : "E-post sendt", "Email saved" : "E-postadresse lagra", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index f22ca4148d1..aef8f91dcdc 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Niedostarczony użytkownik", "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone", "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.", "Unable to change password" : "Nie można zmienić hasła", "Enabled" : "Włączone", "Not enabled" : "Nie włączone", @@ -109,6 +108,7 @@ OC.L10N.register( "TLS" : "TLS", "Security Warning" : "Ostrzeżenie o zabezpieczeniach", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.", + "Read-Only config enabled" : "Włączona konfiguracja tylko do odczytu", "Setup Warning" : "Ostrzeżenia konfiguracji", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", @@ -168,7 +168,6 @@ OC.L10N.register( "Download logfile" : "Pobierz plik log", "More" : "Więcej", "Less" : "Mniej", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!", "Version" : "Wersja", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Więcej aplikacji", @@ -191,6 +190,7 @@ OC.L10N.register( "Bugtracker" : "Zgłaszanie błędów", "Commercial Support" : "Wsparcie komercyjne", "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki", + "Desktop client" : "Klient na komputer", "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index c48ee78662f..f8afc49c50d 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -26,7 +26,6 @@ "No user supplied" : "Niedostarczony użytkownik", "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone", "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.", "Unable to change password" : "Nie można zmienić hasła", "Enabled" : "Włączone", "Not enabled" : "Nie włączone", @@ -107,6 +106,7 @@ "TLS" : "TLS", "Security Warning" : "Ostrzeżenie o zabezpieczeniach", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.", + "Read-Only config enabled" : "Włączona konfiguracja tylko do odczytu", "Setup Warning" : "Ostrzeżenia konfiguracji", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", @@ -166,7 +166,6 @@ "Download logfile" : "Pobierz plik log", "More" : "Więcej", "Less" : "Mniej", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!", "Version" : "Wersja", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Więcej aplikacji", @@ -189,6 +188,7 @@ "Bugtracker" : "Zgłaszanie błędów", "Commercial Support" : "Wsparcie komercyjne", "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki", + "Desktop client" : "Klient na komputer", "Android app" : "Aplikacja Android", "iOS app" : "Aplikacja iOS", "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 98741abc916..989eb8e8486 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nenhum usuário fornecido", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos", "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....", "Unable to change password" : "Impossível modificar senha", "Enabled" : "Habilitado", "Not enabled" : "Desabilitado", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "Baixar o arquivo de log", "More" : "Mais", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O arquivo de log é maior do que 100 MB. Baixar o arquivo pode demorar algum tempo!", "Version" : "Versão", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Mais aplicativos", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 05aaa0157b8..9cf17268e59 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -26,7 +26,6 @@ "No user supplied" : "Nenhum usuário fornecido", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos", "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....", "Unable to change password" : "Impossível modificar senha", "Enabled" : "Habilitado", "Not enabled" : "Desabilitado", @@ -174,7 +173,6 @@ "Download logfile" : "Baixar o arquivo de log", "More" : "Mais", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O arquivo de log é maior do que 100 MB. Baixar o arquivo pode demorar algum tempo!", "Version" : "Versão", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Mais aplicativos", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index ea1a92aa158..554ecce121b 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Nenhum utilizador especificado", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados", "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada com sucesso.", "Unable to change password" : "Não foi possível alterar a sua palavra-passe ", "Enabled" : "Ativada", "Not enabled" : "Desativada", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Descarregar logfile", "More" : "Mais", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download poderá demorar algum tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!", "Version" : "Versão", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Mais aplicações", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "O seu endereço de email", "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações", "No email address set" : "Nenhum endereço de email estabelecido", + "You are member of the following groups:" : "Você é membro dos seguintes grupos:", "Profile picture" : "Foto do perfil", "Upload new" : "Carregar novo", "Select new from Files" : "Seleccionar novo a partir dos ficheiros", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 7b8fe49fa16..86a515ff842 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -26,7 +26,7 @@ "No user supplied" : "Nenhum utilizador especificado", "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados", "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada com sucesso.", "Unable to change password" : "Não foi possível alterar a sua palavra-passe ", "Enabled" : "Ativada", "Not enabled" : "Desativada", @@ -174,7 +174,7 @@ "Download logfile" : "Descarregar logfile", "More" : "Mais", "Less" : "Menos", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download poderá demorar algum tempo!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O logfile é maior que 100MB. O download do mesmo poderá demorar algum tempo!", "Version" : "Versão", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Mais aplicações", @@ -215,6 +215,7 @@ "Your email address" : "O seu endereço de email", "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações", "No email address set" : "Nenhum endereço de email estabelecido", + "You are member of the following groups:" : "Você é membro dos seguintes grupos:", "Profile picture" : "Foto do perfil", "Upload new" : "Carregar novo", "Select new from Files" : "Seleccionar novo a partir dos ficheiros", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 83edce29d60..16e649b2a03 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Пользователь не задан", "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны", "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления администратора. Проверьте пароль и попробуйте еще раз.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён", "Unable to change password" : "Невозможно изменить пароль", "Enabled" : "Включено", "Not enabled" : "Не включено", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "Скачать журнал", "More" : "Больше", "Less" : "Меньше", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Размер журнала превышает 100MB. Скачивание может занять некоторое время.", "Version" : "Версия", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Ещё приложения", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index 7a58f19d8ce..6cda0e743a6 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -26,7 +26,6 @@ "No user supplied" : "Пользователь не задан", "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны", "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления администратора. Проверьте пароль и попробуйте еще раз.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён", "Unable to change password" : "Невозможно изменить пароль", "Enabled" : "Включено", "Not enabled" : "Не включено", @@ -174,7 +173,6 @@ "Download logfile" : "Скачать журнал", "More" : "Больше", "Less" : "Меньше", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Размер журнала превышает 100MB. Скачивание может занять некоторое время.", "Version" : "Версия", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Ещё приложения", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index a79072c5970..34577fb084b 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nebol uvedený používateľ", "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené", "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.", "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", @@ -176,7 +175,6 @@ OC.L10N.register( "Download logfile" : "Stiahnuť súbor logu", "More" : "Viac", "Less" : "Menej", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Súbor logu je väčší ako 100MB. Jeho sťahovanie bude chvíľu trvať!", "Version" : "Verzia", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Viac aplikácií", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index 201fd7ba024..1c45f961332 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -26,7 +26,6 @@ "No user supplied" : "Nebol uvedený používateľ", "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené", "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.", "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", @@ -174,7 +173,6 @@ "Download logfile" : "Stiahnuť súbor logu", "More" : "Viac", "Less" : "Menej", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Súbor logu je väčší ako 100MB. Jeho sťahovanie bude chvíľu trvať!", "Version" : "Verzia", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Viac aplikácií", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index 8e30838600c..2280912d19b 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Ni navedenega uporabnika", "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.", "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.", "Unable to change password" : "Ni mogoče spremeniti gesla", "Enabled" : "Omogočeno", "Not enabled" : "Ni omogočeno", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index c9b867dce40..75fc58bf008 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -26,7 +26,6 @@ "No user supplied" : "Ni navedenega uporabnika", "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.", "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.", "Unable to change password" : "Ni mogoče spremeniti gesla", "Enabled" : "Omogočeno", "Not enabled" : "Ni omogočeno", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index 1dbc3daf465..a483f46166f 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Nuk është dhënë asnjë përdorues", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutem jepni një fjalëkalim restaurimi administrativ, në të kundërt të gjitha të dhënat do humbasin", "Wrong admin recovery password. Please check the password and try again." : "Fjalëkalim i gabuar restaurimi administrativ. Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Paneli i kontrollit nuk mbështet ndryshimin e fjalëkalimit, por çelësi i shifrimit të përdoruesit u modifikua me sukses.", "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet", "Enabled" : "Aktivizuar", "Not enabled" : "Jo aktive", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index 18352750616..b0f8e519285 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -26,7 +26,6 @@ "No user supplied" : "Nuk është dhënë asnjë përdorues", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutem jepni një fjalëkalim restaurimi administrativ, në të kundërt të gjitha të dhënat do humbasin", "Wrong admin recovery password. Please check the password and try again." : "Fjalëkalim i gabuar restaurimi administrativ. Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Paneli i kontrollit nuk mbështet ndryshimin e fjalëkalimit, por çelësi i shifrimit të përdoruesit u modifikua me sukses.", "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet", "Enabled" : "Aktivizuar", "Not enabled" : "Jo aktive", diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index a0d388d1dc9..915913b8950 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -11,6 +11,7 @@ OC.L10N.register( "Unable to add user to group %s" : "Не могу да додам корисника у групу %s", "Unable to remove user from group %s" : "Не могу да уклоним корисника из групе %s", "Couldn't update app." : "Не могу да ажурирам апликацију.", + "Wrong password" : "Лозинка пограшна", "Email sent" : "Порука је послата", "Email saved" : "Е-порука сачувана", "Please wait...." : "Сачекајте…", @@ -41,6 +42,7 @@ OC.L10N.register( "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share", "Allow resharing" : "Дозволи поновно дељење", "Enforce HTTPS" : "Наметни HTTPS", + "Authentication required" : "Неопходна провера идентитета", "Server address" : "Адреса сервера", "Port" : "Порт", "Log level" : "Ниво бележења", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index a8314f1ccb5..cb6bd430507 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -9,6 +9,7 @@ "Unable to add user to group %s" : "Не могу да додам корисника у групу %s", "Unable to remove user from group %s" : "Не могу да уклоним корисника из групе %s", "Couldn't update app." : "Не могу да ажурирам апликацију.", + "Wrong password" : "Лозинка пограшна", "Email sent" : "Порука је послата", "Email saved" : "Е-порука сачувана", "Please wait...." : "Сачекајте…", @@ -39,6 +40,7 @@ "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share", "Allow resharing" : "Дозволи поновно дељење", "Enforce HTTPS" : "Наметни HTTPS", + "Authentication required" : "Неопходна провера идентитета", "Server address" : "Адреса сервера", "Port" : "Порт", "Log level" : "Ниво бележења", diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js index 66b17fd6fb5..150ed74b977 100644 --- a/settings/l10n/sv.js +++ b/settings/l10n/sv.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Ingen användare angiven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras", "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.", "Unable to change password" : "Kunde inte ändra lösenord", "Enabled" : "Aktiverad", "Not enabled" : "Inte aktiverad", @@ -172,7 +171,6 @@ OC.L10N.register( "Download logfile" : "Ladda ner loggfil", "More" : "Mer", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Loggfilen är större än 100MB. Att ladda ner den kan ta lite tid!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Fler appar", diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json index e7ad686aaf7..b0a65798e36 100644 --- a/settings/l10n/sv.json +++ b/settings/l10n/sv.json @@ -26,7 +26,6 @@ "No user supplied" : "Ingen användare angiven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras", "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.", "Unable to change password" : "Kunde inte ändra lösenord", "Enabled" : "Aktiverad", "Not enabled" : "Inte aktiverad", @@ -170,7 +169,6 @@ "Download logfile" : "Ladda ner loggfil", "More" : "Mer", "Less" : "Mindre", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Loggfilen är större än 100MB. Att ladda ner den kan ta lite tid!", "Version" : "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Fler appar", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 7f0ba6c55ac..e1cb39d957b 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -1,7 +1,7 @@ OC.L10N.register( "settings", { - "Security & Setup Warnings" : "Güvelik ve Kurulum Uyarıları", + "Security & Setup Warnings" : "Güvenlik ve Kurulum Uyarıları", "Cron" : "Cron", "Sharing" : "Paylaşım", "Security" : "Güvenlik", @@ -28,7 +28,7 @@ OC.L10N.register( "No user supplied" : "Kullanıcı girilmedi", "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek", "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Arka uç, parola değiştirmesini desteklemiyor, ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.", "Unable to change password" : "Parola değiştirilemiyor", "Enabled" : "Etkin", "Not enabled" : "Etkin değil", @@ -176,7 +176,7 @@ OC.L10N.register( "Download logfile" : "Günlük dosyasını indir", "More" : "Daha fazla", "Less" : "Daha az", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Günlük dosyası 100MB'dan daha büyük. İndirmek zaman alabilir!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!", "Version" : "Sürüm", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.", "More apps" : "Daha fazla uygulama", @@ -217,6 +217,7 @@ OC.L10N.register( "Your email address" : "E-posta adresiniz", "Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin", "No email address set" : "E-posta adresi ayarlanmamış", + "You are member of the following groups:" : "Şu grupların üyesisiniz:", "Profile picture" : "Profil resmi", "Upload new" : "Yeni yükle", "Select new from Files" : "Dosyalardan seç", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 3d9818f990c..ba63054c573 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -1,5 +1,5 @@ { "translations": { - "Security & Setup Warnings" : "Güvelik ve Kurulum Uyarıları", + "Security & Setup Warnings" : "Güvenlik ve Kurulum Uyarıları", "Cron" : "Cron", "Sharing" : "Paylaşım", "Security" : "Güvenlik", @@ -26,7 +26,7 @@ "No user supplied" : "Kullanıcı girilmedi", "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek", "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Arka uç, parola değiştirmesini desteklemiyor, ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.", "Unable to change password" : "Parola değiştirilemiyor", "Enabled" : "Etkin", "Not enabled" : "Etkin değil", @@ -174,7 +174,7 @@ "Download logfile" : "Günlük dosyasını indir", "More" : "Daha fazla", "Less" : "Daha az", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Günlük dosyası 100MB'dan daha büyük. İndirmek zaman alabilir!", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!", "Version" : "Sürüm", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.", "More apps" : "Daha fazla uygulama", @@ -215,6 +215,7 @@ "Your email address" : "E-posta adresiniz", "Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin", "No email address set" : "E-posta adresi ayarlanmamış", + "You are member of the following groups:" : "Şu grupların üyesisiniz:", "Profile picture" : "Profil resmi", "Upload new" : "Yeni yükle", "Select new from Files" : "Dosyalardan seç", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index f4eb63c3f93..d533746ef4b 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -28,7 +28,6 @@ OC.L10N.register( "No user supplied" : "Користувач не знайден", "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені", "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.", "Unable to change password" : "Неможливо змінити пароль", "Enabled" : "Увімкнено", "Not enabled" : "Вимкнено", @@ -170,7 +169,6 @@ OC.L10N.register( "Download logfile" : "Завантажити файл журналу", "More" : "Більше", "Less" : "Менше", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Лог більше, ніж 100MB. Завантаження може зайняти деякий час!", "Version" : "Версія", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Більше додатків", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index aae730eefcf..9d4d25095a0 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -26,7 +26,6 @@ "No user supplied" : "Користувач не знайден", "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені", "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.", "Unable to change password" : "Неможливо змінити пароль", "Enabled" : "Увімкнено", "Not enabled" : "Вимкнено", @@ -168,7 +167,6 @@ "Download logfile" : "Завантажити файл журналу", "More" : "Більше", "Less" : "Менше", - "The logfile is bigger than 100MB. Downloading it may take some time!" : "Лог більше, ніж 100MB. Завантаження може зайняти деякий час!", "Version" : "Версія", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "More apps" : "Більше додатків", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index 2f894e2fad8..65bb488c433 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -27,7 +27,6 @@ OC.L10N.register( "No user supplied" : "没有满足的用户", "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。", "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。", "Unable to change password" : "不能更改密码", "Enabled" : "开启", "Saved" : "已保存", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index d7b87f8703c..8006d8bfc4c 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -25,7 +25,6 @@ "No user supplied" : "没有满足的用户", "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。", "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。", "Unable to change password" : "不能更改密码", "Enabled" : "开启", "Saved" : "已保存", diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js index eb262541fd4..9e30fa11632 100644 --- a/settings/l10n/zh_TW.js +++ b/settings/l10n/zh_TW.js @@ -26,7 +26,6 @@ OC.L10N.register( "No user supplied" : "未提供使用者", "Please provide an admin recovery password, otherwise all user data will be lost" : "請提供管理者還原密碼，否則會遺失所有使用者資料", "Wrong admin recovery password. Please check the password and try again." : "錯誤的管理者還原密碼", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰", "Unable to change password" : "無法修改密碼", "Enabled" : "已啓用", "Not enabled" : "無啟動", @@ -94,6 +93,7 @@ OC.L10N.register( "Allow apps to use the Share API" : "允許 apps 使用分享 API", "Allow public uploads" : "允許任何人上傳", "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知", + "days" : "天", "Allow resharing" : "允許轉貼分享", "Enforce HTTPS" : "強制啟用 HTTPS", "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s", diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json index 411e165825e..309ba1f72b3 100644 --- a/settings/l10n/zh_TW.json +++ b/settings/l10n/zh_TW.json @@ -24,7 +24,6 @@ "No user supplied" : "未提供使用者", "Please provide an admin recovery password, otherwise all user data will be lost" : "請提供管理者還原密碼，否則會遺失所有使用者資料", "Wrong admin recovery password. Please check the password and try again." : "錯誤的管理者還原密碼", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰", "Unable to change password" : "無法修改密碼", "Enabled" : "已啓用", "Not enabled" : "無啟動", @@ -92,6 +91,7 @@ "Allow apps to use the Share API" : "允許 apps 使用分享 API", "Allow public uploads" : "允許任何人上傳", "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知", + "days" : "天", "Allow resharing" : "允許轉貼分享", "Enforce HTTPS" : "強制啟用 HTTPS", "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s", diff --git a/settings/personal.php b/settings/personal.php index f181c9cb2c1..7239df365f5 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -100,6 +100,12 @@ $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true)); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); $tmpl->assign('certs', $certificateManager->listCertificates()); +// Get array of group ids for this user +$groups = \OC::$server->getGroupManager()->getUserIdGroups(OC_User::getUser()); +$groups2 = array_map(function($group) { return $group->getGID(); }, $groups); +sort($groups2); +$tmpl->assign('groups', $groups2); + // add hardcoded forms from the template $l = OC_L10N::get('settings'); $formsAndMore = array(); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index cd26d64aa03..a739e517ede 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -516,7 +516,7 @@ if ($_['suggestedOverwriteCliUrl']) { <?php if ($_['logFileSize'] > (100 * 1024 * 1024)): ?> <br> <em> - <?php p($l->t('The logfile is bigger than 100MB. Downloading it may take some time!')); ?> + <?php p($l->t('The logfile is bigger than 100 MB. Downloading it may take some time!')); ?> </em> <?php endif; ?> <?php endif; ?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 3bd5971f44e..02e61287937 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -136,6 +136,14 @@ if($_['passwordChangeSupported']) { } ?> +<div id="groups" class="section"> + <h2><?php p($l->t('Groups')); ?></h2> + <p><?php p($l->t('You are member of the following groups:')); ?></p> + <p> + <?php p(implode(', ', $_['groups'])); ?> + </p> +</div> + <?php if ($_['enableAvatars']): ?> <form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>"> <h2><?php p($l->t('Profile picture')); ?></h2> diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php index cd6bd57da4c..c513e23cd6b 100644 --- a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php +++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php @@ -25,6 +25,38 @@ namespace OC\AppFramework\Utility; +class BaseController { + + /** + * @Annotation + */ + public function test(){} + + /** + * @Annotation + */ + public function test2(){} + + /** + * @Annotation + */ + public function test3(){} + +} + +class MiddleController extends BaseController { + + /** + * @NoAnnotation + */ + public function test2() {} + + public function test3() {} + +} + +class EndController extends MiddleController {} + class ControllerMethodReflectorTest extends \Test\TestCase { @@ -96,7 +128,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase { 'arguments' ); - $this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters()); + $this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters()); } @@ -108,8 +140,32 @@ class ControllerMethodReflectorTest extends \Test\TestCase { 'arguments2' ); - $this->assertEquals(array('arg' => null), $reader->getParameters()); + $this->assertEquals(array('arg' => null), $reader->getParameters()); + } + + + public function testInheritance() { + $reader = new ControllerMethodReflector(); + $reader->reflect('OC\AppFramework\Utility\EndController', 'test'); + + $this->assertTrue($reader->hasAnnotation('Annotation')); } + public function testInheritanceOverride() { + $reader = new ControllerMethodReflector(); + $reader->reflect('OC\AppFramework\Utility\EndController', 'test2'); + + $this->assertTrue($reader->hasAnnotation('NoAnnotation')); + $this->assertFalse($reader->hasAnnotation('Annotation')); + } + + + public function testInheritanceOverrideNoDocblock() { + $reader = new ControllerMethodReflector(); + $reader->reflect('OC\AppFramework\Utility\EndController', 'test3'); + + $this->assertFalse($reader->hasAnnotation('Annotation')); + } + } diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 6a50dd1f962..1ef62dc2b07 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -586,7 +586,10 @@ class Test_Share extends \Test\TestCase { // Attempt user specific target conflict OC_User::setUserId($this->user3); + \OCP\Util::connectHook('OCP\\Share', 'post_shared', 'DummyHookListener', 'listen'); + $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE)); + $this->assertEquals(OCP\Share::SHARE_TYPE_GROUP, DummyHookListener::$shareType); OC_User::setUserId($this->user2); $to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET); $this->assertEquals(2, count($to_test)); @@ -1055,3 +1058,11 @@ class DummyShareClass extends \OC\Share\Share { return parent::groupItems($items, 'test'); } } + +class DummyHookListener { + static $shareType = null; + + public static function listen($params) { + self::$shareType = $params['shareType']; + } +} diff --git a/version.php b/version.php index e50220be11b..89d8bc48a2a 100644 --- a/version.php +++ b/version.php @@ -3,7 +3,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(8, 0, 0, 7); +$OC_Version=array(8, 0, 0, 9); // The human readable string $OC_VersionString='8.0'; |