diff options
208 files changed, 1706 insertions, 322 deletions
diff --git a/.htaccess b/.htaccess index 725efa0971a..ec33fe31e15 100644 --- a/.htaccess +++ b/.htaccess @@ -63,6 +63,7 @@ RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php RewriteCond %{REQUEST_FILENAME} !/updater/ + RewriteCond %{REQUEST_FILENAME} !/ocs-provider/ RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.* RewriteRule .* index.php [PT,E=PATH_INFO:$1] </IfModule> diff --git a/apps/comments/l10n/el.js b/apps/comments/l10n/el.js index c89e6410b9b..6c085651be3 100644 --- a/apps/comments/l10n/el.js +++ b/apps/comments/l10n/el.js @@ -1,7 +1,12 @@ OC.L10N.register( "comments", { + "Comments" : "Σχόλια", + "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...", + "Delete comment" : "Διαγραφή σχολίου", "Cancel" : "Άκυρο", + "Edit comment" : "Επεξεργασία σχολίου", + "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", "Comment" : "Σχόλιο" }, diff --git a/apps/comments/l10n/el.json b/apps/comments/l10n/el.json index d3a2967d3cb..59b9a2659f9 100644 --- a/apps/comments/l10n/el.json +++ b/apps/comments/l10n/el.json @@ -1,5 +1,10 @@ { "translations": { + "Comments" : "Σχόλια", + "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...", + "Delete comment" : "Διαγραφή σχολίου", "Cancel" : "Άκυρο", + "Edit comment" : "Επεξεργασία σχολίου", + "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", "Comment" : "Σχόλιο" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/comments/l10n/es.js b/apps/comments/l10n/es.js index ab04eea953e..23716ca5757 100644 --- a/apps/comments/l10n/es.js +++ b/apps/comments/l10n/es.js @@ -1,8 +1,21 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos", + "%1$s commented" : "%1$s comentados", + "%1$s commented on %2$s" : "%1$s comentados en %2$s", + "Comments" : "Comentarios", + "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Delete comment" : "Borrar comentario", + "Post" : "Publicar", "Cancel" : "Cancelar", + "Edit comment" : "Editar comentario", + "[Deleted user]" : "[Usuario eliminado]", + "No other comments available" : "No hay otros comentarios disponibles", + "More comments..." : "Más comentarios...", "Save" : "Guardar", + "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", + "{count} unread comments" : "{count} comentarios no leídos", "Comment" : "Comentario" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/es.json b/apps/comments/l10n/es.json index 6f6df7e9c84..cc3e1781299 100644 --- a/apps/comments/l10n/es.json +++ b/apps/comments/l10n/es.json @@ -1,6 +1,19 @@ { "translations": { + "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos", + "%1$s commented" : "%1$s comentados", + "%1$s commented on %2$s" : "%1$s comentados en %2$s", + "Comments" : "Comentarios", + "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Delete comment" : "Borrar comentario", + "Post" : "Publicar", "Cancel" : "Cancelar", + "Edit comment" : "Editar comentario", + "[Deleted user]" : "[Usuario eliminado]", + "No other comments available" : "No hay otros comentarios disponibles", + "More comments..." : "Más comentarios...", "Save" : "Guardar", + "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", + "{count} unread comments" : "{count} comentarios no leídos", "Comment" : "Comentario" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js index f8337d6b9a4..514ba843f3e 100644 --- a/apps/comments/l10n/fr.js +++ b/apps/comments/l10n/fr.js @@ -2,8 +2,8 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers", - "%1$s commented" : "%1$s commenté(es)", - "%1$s commented on %2$s" : "%1$s commenté sur %2$s", + "%1$s commented" : "%1$s a commenté", + "%1$s commented on %2$s" : "%1$s a commenté %2$s", "Comments" : "Commentaires", "Type in a new comment..." : "Écrire un nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", @@ -11,7 +11,7 @@ OC.L10N.register( "Cancel" : "Annuler", "Edit comment" : "Modifier le commentaire", "[Deleted user]" : "[Utilisateur supprimé]", - "No other comments available" : "Pas d'autres commentaires disponibles", + "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", "Save" : "Enregistrer", "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés", diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json index 23c0b0d11ec..ace5e14a14c 100644 --- a/apps/comments/l10n/fr.json +++ b/apps/comments/l10n/fr.json @@ -1,7 +1,7 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers", - "%1$s commented" : "%1$s commenté(es)", - "%1$s commented on %2$s" : "%1$s commenté sur %2$s", + "%1$s commented" : "%1$s a commenté", + "%1$s commented on %2$s" : "%1$s a commenté %2$s", "Comments" : "Commentaires", "Type in a new comment..." : "Écrire un nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", @@ -9,7 +9,7 @@ "Cancel" : "Annuler", "Edit comment" : "Modifier le commentaire", "[Deleted user]" : "[Utilisateur supprimé]", - "No other comments available" : "Pas d'autres commentaires disponibles", + "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", "Save" : "Enregistrer", "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés", diff --git a/apps/comments/l10n/is.js b/apps/comments/l10n/is.js index d9494241eb2..0da04289f5e 100644 --- a/apps/comments/l10n/is.js +++ b/apps/comments/l10n/is.js @@ -2,6 +2,7 @@ OC.L10N.register( "comments", { "Cancel" : "Hætta við", - "Save" : "Vista" + "Save" : "Vista", + "Comment" : "Athugasemd" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/comments/l10n/is.json b/apps/comments/l10n/is.json index f2909dbb019..c9312740105 100644 --- a/apps/comments/l10n/is.json +++ b/apps/comments/l10n/is.json @@ -1,5 +1,6 @@ { "translations": { "Cancel" : "Hætta við", - "Save" : "Vista" + "Save" : "Vista", + "Comment" : "Athugasemd" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/comments/l10n/mk.js b/apps/comments/l10n/mk.js index caba856f3e7..52277cc9222 100644 --- a/apps/comments/l10n/mk.js +++ b/apps/comments/l10n/mk.js @@ -1,6 +1,7 @@ OC.L10N.register( "comments", { + "%1$s commented" : "%1$s коментиран", "Cancel" : "Откажи", "Save" : "Сними", "Comment" : "Коментар" diff --git a/apps/comments/l10n/mk.json b/apps/comments/l10n/mk.json index ac5fc0d7b8b..9a3b69b499a 100644 --- a/apps/comments/l10n/mk.json +++ b/apps/comments/l10n/mk.json @@ -1,4 +1,5 @@ { "translations": { + "%1$s commented" : "%1$s коментиран", "Cancel" : "Откажи", "Save" : "Сними", "Comment" : "Коментар" diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js index e69ee88f098..1378874593b 100644 --- a/apps/encryption/l10n/is.js +++ b/apps/encryption/l10n/is.js @@ -3,6 +3,7 @@ OC.L10N.register( { "The share will expire on %s." : "Gildistími deilingar rennur út %s.", "Cheers!" : "Skál!", + "Enabled" : "Virkt", "Disabled" : "Óvirkt" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json index 7b77bd12ebb..37ca1d1fc3f 100644 --- a/apps/encryption/l10n/is.json +++ b/apps/encryption/l10n/is.json @@ -1,6 +1,7 @@ { "translations": { "The share will expire on %s." : "Gildistími deilingar rennur út %s.", "Cheers!" : "Skál!", + "Enabled" : "Virkt", "Disabled" : "Óvirkt" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js index c2f503a4495..0de345e5c1e 100644 --- a/apps/encryption/l10n/mk.js +++ b/apps/encryption/l10n/mk.js @@ -1,8 +1,11 @@ OC.L10N.register( "encryption", { + "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување", "Password successfully changed." : "Лозинката е успешно променета.", "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.", + "Bad Signature" : "Лош потпис", + "Missing Signature" : "Недостасува потписот", "Cheers!" : "Поздрав!", "Change Password" : "Смени лозинка", "Old log-in password" : "Старата лозинка за најавување", diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json index fb521ea75fb..537815b7aa3 100644 --- a/apps/encryption/l10n/mk.json +++ b/apps/encryption/l10n/mk.json @@ -1,6 +1,9 @@ { "translations": { + "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување", "Password successfully changed." : "Лозинката е успешно променета.", "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.", + "Bad Signature" : "Лош потпис", + "Missing Signature" : "Недостасува потписот", "Cheers!" : "Поздрав!", "Change Password" : "Смени лозинка", "Old log-in password" : "Старата лозинка за најавување", diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index 25ceba72b2f..b9f4d3d9807 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -2,7 +2,7 @@ OC.L10N.register( "federatedfilesharing", { "Invalid Federated Cloud ID" : "ID Federated Cloud incorrect", - "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s", + "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s", "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable." }, diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index ffd991d46f3..5f5ba5f6c16 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -1,6 +1,6 @@ { "translations": { "Invalid Federated Cloud ID" : "ID Federated Cloud incorrect", - "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s", + "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s", "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable." },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/federation/l10n/el.js b/apps/federation/l10n/el.js new file mode 100644 index 00000000000..e67a9242b0d --- /dev/null +++ b/apps/federation/l10n/el.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "federation", + { + "Could not add server" : "Αδυναμία προσθήκης διακομιστή" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/el.json b/apps/federation/l10n/el.json new file mode 100644 index 00000000000..45d91aae735 --- /dev/null +++ b/apps/federation/l10n/el.json @@ -0,0 +1,4 @@ +{ "translations": { + "Could not add server" : "Αδυναμία προσθήκης διακομιστή" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/federation/l10n/fr.js b/apps/federation/l10n/fr.js index 08e9d243bdc..a6e4fbda16f 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -6,6 +6,6 @@ OC.L10N.register( "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous autorise à vous connecter avec d'autres ownCloud de confiance pour échanger le dossier utilisateur. Par exemple, cela peut être utilisé pour compléter automatiquement les utilisateurs externes pour le partage fédéré." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous permet de vous connecter avec d'autres ownCloud de confiance pour partager l'annuaire d'utilisateurs. Par exemple, cela peut être utilisé pour compléter automatiquement les noms des utilisateurs externes pour le partage fédéré." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index ef5096b1d4f..c84cb78dbc1 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -4,6 +4,6 @@ "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous autorise à vous connecter avec d'autres ownCloud de confiance pour échanger le dossier utilisateur. Par exemple, cela peut être utilisé pour compléter automatiquement les utilisateurs externes pour le partage fédéré." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous permet de vous connecter avec d'autres ownCloud de confiance pour partager l'annuaire d'utilisateurs. Par exemple, cela peut être utilisé pour compléter automatiquement les noms des utilisateurs externes pour le partage fédéré." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 389b7fae806..b65af1fa0f3 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -747,9 +747,6 @@ html.ie8 #controls .button.new { white-space: nowrap; overflow: hidden; } -.newFileMenu.popovermenu .menuitem .icon { - margin-bottom: -2px; -} .newFileMenu.popovermenu a.menuitem, .newFileMenu.popovermenu label.menuitem, .newFileMenu.popovermenu .menuitem { @@ -788,3 +785,14 @@ html.ie8 #controls .button.new { padding: 0; } +#filestable .filename .action .icon, +#filestable .selectedActions a .icon, +#controls .actions .button .icon { + display: inline-block; + vertical-align: middle; + background-size: 16px 16px; +} + +.app-files .actions .button.new .icon { + margin-bottom: 2px; +} diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 67125f1570f..05ff2f0cbfa 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -12,7 +12,12 @@ var TEMPLATE_FILE_ACTION_TRIGGER = '<a class="action action-{{nameLowerCase}}" href="#" data-action="{{name}}">' + - '{{#if icon}}<img class="svg" alt="{{altText}}" src="{{icon}}" />{{/if}}' + + '{{#if icon}}' + + '<img class="svg" alt="{{altText}}" src="{{icon}}" />' + + '{{else}}' + + '{{#if iconClass}}<span class="icon {{iconClass}}" />{{/if}}' + + '{{#unless hasDisplayName}}<span class="hidden-visually">{{altText}}</span>{{/unless}}' + + '{{/if}}' + '{{#if displayName}}<span> {{displayName}}</span>{{/if}}' + '</a>'; @@ -143,6 +148,7 @@ mime: mime, order: action.order || 0, icon: action.icon, + iconClass: action.iconClass, permissions: action.permissions, type: action.type || FileActions.TYPE_DROPDOWN, altText: action.altText || '' @@ -299,10 +305,15 @@ nameLowerCase: actionSpec.name.toLowerCase(), displayName: actionSpec.displayName, icon: actionSpec.icon, + iconClass: actionSpec.iconClass, altText: actionSpec.altText, + hasDisplayName: !!actionSpec.displayName }; if (_.isFunction(actionSpec.icon)) { - params.icon = actionSpec.icon(context.$file.attr('data-file')); + params.icon = actionSpec.icon(context.$file.attr('data-file'), context); + } + if (_.isFunction(actionSpec.iconClass)) { + params.iconClass = actionSpec.iconClass(context.$file.attr('data-file'), context); } var $actionLink = this._makeActionLink(params, context); @@ -363,7 +374,7 @@ var $el = this._renderInlineAction({ name: 'menu', displayName: '', - icon: OC.imagePath('core', 'actions/more'), + iconClass: 'icon-more', altText: t('files', 'Actions'), action: this._showMenuClosure }, false, context); @@ -570,9 +581,7 @@ order: -20, mime: 'all', permissions: OC.PERMISSION_READ, - icon: function () { - return OC.imagePath('core', 'actions/download'); - }, + iconClass: 'icon-download', actionHandler: function (filename, context) { var dir = context.dir || context.fileList.getCurrentDirectory(); var isDir = context.$file.attr('data-type') === 'dir'; @@ -602,9 +611,7 @@ mime: 'all', order: -30, permissions: OC.PERMISSION_UPDATE, - icon: function() { - return OC.imagePath('core', 'actions/rename'); - }, + iconClass: 'icon-rename', actionHandler: function (filename, context) { context.fileList.rename(filename); } @@ -631,9 +638,7 @@ order: 1000, // permission is READ because we show a hint instead if there is no permission permissions: OC.PERMISSION_DELETE, - icon: function() { - return OC.imagePath('core', 'actions/delete'); - }, + iconClass: 'icon-delete', actionHandler: function(fileName, context) { // if there is no permission to delete do nothing if((context.$file.data('permissions') & OC.PERMISSION_DELETE) === 0) { @@ -682,8 +687,8 @@ * Defaults to the name given in name property * @property {String} mime mime type * @property {int} permissions permissions - * @property {(Function|String)} icon icon path to the icon or function - * that returns it + * @property {(Function|String)} icon icon path to the icon or function that returns it (deprecated, use iconClass instead) + * @property {(Function|String)} iconClass class name of the icon (recommended for theming) * @property {OCA.Files.FileActions~renderActionFunction} [render] optional rendering function * @property {OCA.Files.FileActions~actionHandler} actionHandler action handler function */ diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js index 9e51d8f1f1f..45d2bd83049 100644 --- a/apps/files/js/fileactionsmenu.js +++ b/apps/files/js/fileactionsmenu.js @@ -14,7 +14,16 @@ '<ul>' + '{{#each items}}' + '<li>' + - '<a href="#" class="menuitem action action-{{nameLowerCase}} permanent" data-action="{{name}}">{{#if icon}}<img class="icon" src="{{icon}}"/>{{else}}<span class="no-icon"></span>{{/if}}<span>{{displayName}}</span></a>' + + '<a href="#" class="menuitem action action-{{nameLowerCase}} permanent" data-action="{{name}}">' + + '{{#if icon}}<img class="icon" src="{{icon}}"/>' + + '{{else}}'+ + '{{#if iconClass}}' + + '<span class="icon {{iconClass}}"></span>' + + '{{else}}' + + '<span class="no-icon"></span>' + + '{{/if}}' + + '{{/if}}' + + '<span>{{displayName}}</span></a>' + '</li>' + '{{/each}}' + '</ul>'; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 81dfea2114d..95fdac02c2d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -10,7 +10,10 @@ (function() { - var TEMPLATE_ADDBUTTON = '<a href="#" class="button new"><img src="{{iconUrl}}" alt="{{addText}}"></img></a>'; + var TEMPLATE_ADDBUTTON = '<a href="#" class="button new">' + + '<span class="icon {{iconClass}}"></span>' + + '<span class="hidden-visually">{{addText}}</span>' + + '</a>'; /** * @class OCA.Files.FileList @@ -329,7 +332,7 @@ displayName: t('files', 'Details'), mime: 'all', order: -50, - icon: OC.imagePath('core', 'actions/details'), + iconClass: 'icon-details', permissions: OC.PERMISSION_READ, actionHandler: function(fileName, context) { self._updateDetailsView(fileName); @@ -2715,7 +2718,7 @@ } var $newButton = $(this._addButtonTemplate({ addText: t('files', 'New'), - iconUrl: OC.imagePath('core', 'actions/add') + iconClass: 'icon-add' })); $actionsContainer.prepend($newButton); diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js index 81b22e34cc2..3c0a231d003 100644 --- a/apps/files/js/tagsplugin.js +++ b/apps/files/js/tagsplugin.js @@ -15,17 +15,18 @@ var TEMPLATE_FAVORITE_ACTION = '<a href="#" ' + 'class="action action-favorite {{#isFavorite}}permanent{{/isFavorite}}">' + - '<img class="svg" alt="{{altText}}" src="{{imgFile}}" />' + + '<span class="icon {{iconClass}}" />' + + '<span class="hidden-visually">{{altText}}</span>' + '</a>'; /** - * Returns the path to the star image + * Returns the icon class for the matching state * * @param {boolean} state true if starred, false otherwise - * @return {string} path to star image + * @return {string} icon class for star image */ - function getStarImage(state) { - return OC.imagePath('core', state ? 'actions/starred' : 'actions/star'); + function getStarIconClass(state) { + return state ? 'icon-starred' : 'icon-star'; } /** @@ -41,7 +42,7 @@ return this._template({ isFavorite: state, altText: state ? t('files', 'Favorited') : t('files', 'Favorite'), - imgFile: getStarImage(state) + iconClass: getStarIconClass(state) }); } @@ -52,8 +53,7 @@ * @param {boolean} state true if starred, false otherwise */ function toggleStar($actionEl, state) { - $actionEl.find('img').attr('src', getStarImage(state)); - $actionEl.hide().show(0); //force Safari to redraw element on src change + $actionEl.removeClass('icon-star icon-starred').addClass(getStarIconClass(state)); $actionEl.toggleClass('permanent', state); } diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index bf7eb4c895a..1b89c48b129 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", + "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index 97444abc876..b307053d449 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", + "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 2314b29ace9..d0ee9192669 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 111a5e11a1e..51120ebec0b 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index e0a3744a378..d8472cbc459 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index cdac7613678..0ec7dea0e86 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index 93286d3532f..f15fa7e49ad 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", + "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index 7bb23d9886d..5606b0c2c7f 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", + "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 9b8b43ad5a1..f88135163c2 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", + "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index f0649db14b2..fe135f765ce 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", + "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index 62386eb781d..ba63b927655 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", + "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index 0484e85edd2..bfcc08aaa77 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", + "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 461157d6749..bc88d62fb20 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", + "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index ed9fbc860d3..b3d28f92a47 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", + "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js index 2ff7090ad59..74f54deb76e 100644 --- a/apps/files/l10n/he.js +++ b/apps/files/l10n/he.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", + "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json index 001dc96db8d..8f45d4c851b 100644 --- a/apps/files/l10n/he.json +++ b/apps/files/l10n/he.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", + "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 57e78597c54..e6072997b2d 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", + "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index cdd7366fcc5..f81affd9038 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", + "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index deb3a35b635..4280375b46e 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", + "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", @@ -52,7 +53,7 @@ OC.L10N.register( "Could not create file \"{file}\" because it already exists" : "ファイル \"{file}\"は既に存在するため作成できませんでした", "Could not create folder \"{dir}\"" : "フォルダー \"{dir}\" を作成できませんでした", "Could not create folder \"{dir}\" because it already exists" : "フォルダー \"{dir}\" は既に存在するため作成できませんでした", - "Error deleting file \"{fileName}\"." : "\"{fileName}\" でエラーを検出しました。", + "Error deleting file \"{fileName}\"." : "ファイル\"{fileName}\"の削除エラー。", "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません", "Name" : "名前", "Size" : "サイズ", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index aa3c45dcaa3..674a3155954 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", + "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", @@ -50,7 +51,7 @@ "Could not create file \"{file}\" because it already exists" : "ファイル \"{file}\"は既に存在するため作成できませんでした", "Could not create folder \"{dir}\"" : "フォルダー \"{dir}\" を作成できませんでした", "Could not create folder \"{dir}\" because it already exists" : "フォルダー \"{dir}\" は既に存在するため作成できませんでした", - "Error deleting file \"{fileName}\"." : "\"{fileName}\" でエラーを検出しました。", + "Error deleting file \"{fileName}\"." : "ファイル\"{fileName}\"の削除エラー。", "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません", "Name" : "名前", "Size" : "サイズ", diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index a49c7b1a3d8..5227bf0b9ac 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", + "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 860ac1633ab..586850a9e8a 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", + "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index 41e1343f47e..79c49400723 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", + "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 5c6891d2d92..9cf0326d216 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", + "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index aaa655baf5f..4af02942fb1 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", + "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 111695612ce..71ca647a90d 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", + "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index 0e6c7d2b355..98ecabe7e47 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", + "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index 1879f7b1ecf..8277852b5be 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", + "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index dcdcae65dbf..9e4a72eb848 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", + "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index 80b2338d383..2b4478db185 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", + "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js index f86f0af4937..0f5d5abdd42 100644 --- a/apps/files/l10n/sq.js +++ b/apps/files/l10n/sq.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", + "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json index 90f1af5b67f..56025d47807 100644 --- a/apps/files/l10n/sq.json +++ b/apps/files/l10n/sq.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", + "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index ea3e6c61d4a..29769bcd825 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -52,9 +52,8 @@ <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <span id="selectedActionsList" class="selectedActions"> <a href="" class="download"> - <img class="svg" alt="" - src="<?php print_unescaped(image_path("core", "actions/download.svg")); ?>" /> - <?php p($l->t('Download'))?> + <span class="icon icon-download"></span> + <span><?php p($l->t('Download'))?></span> </a> </span> </div> @@ -65,9 +64,8 @@ <th id="headerDate" class="hidden column-mtime"> <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> <span class="selectedActions"><a href="" class="delete-selected"> - <?php p($l->t('Delete'))?> - <img class="svg" alt="" - src="<?php print_unescaped(image_path("core", "actions/delete.svg")); ?>" /> + <span><?php p($l->t('Delete'))?></span> + <span class="icon icon-delete"></span> </a></span> </th> </tr> diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php index 28e2f0c2c9a..e91d40a0e6b 100644 --- a/apps/files/tests/controller/ViewControllerTest.php +++ b/apps/files/tests/controller/ViewControllerTest.php @@ -149,7 +149,7 @@ class ViewControllerTest extends TestCase { $nav = new Template('files', 'appnavigation'); $nav->assign('navigationItems', [ - 0 => [ + [ 'id' => 'files', 'appname' => 'files', 'script' => 'list.php', @@ -158,7 +158,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 1 => [ + [ 'id' => 'favorites', 'appname' => 'files', 'script' => 'simplelist.php', @@ -167,16 +167,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 2 => [ - 'id' => 'systemtagsfilter', - 'appname' => 'systemtags', - 'script' => 'list.php', - 'order' => 9, - 'name' => new \OC_L10N_String(new \OC_L10N('systemtags'), 'Tags', []), - 'active' => false, - 'icon' => '', - ], - 3 => [ + [ 'id' => 'sharingin', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -185,7 +176,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 4 => [ + [ 'id' => 'sharingout', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -194,7 +185,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 5 => [ + [ 'id' => 'sharinglinks', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -203,7 +194,16 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 6 => [ + [ + 'id' => 'systemtagsfilter', + 'appname' => 'systemtags', + 'script' => 'list.php', + 'order' => 25, + 'name' => new \OC_L10N_String(new \OC_L10N('systemtags'), 'Tags', []), + 'active' => false, + 'icon' => '', + ], + [ 'id' => 'trashbin', 'appname' => 'files_trashbin', 'script' => 'list.php', @@ -227,31 +227,31 @@ class ViewControllerTest extends TestCase { 'allowShareWithLink' => 'yes', 'appNavigation' => $nav, 'appContents' => [ - 0 => [ + [ 'id' => 'files', 'content' => null, ], - 1 => [ + [ 'id' => 'favorites', 'content' => null, ], - 2 => [ - 'id' => 'systemtagsfilter', - 'content' => null, - ], - 3 => [ + [ 'id' => 'sharingin', 'content' => null, ], - 4 => [ + [ 'id' => 'sharingout', 'content' => null, ], - 5 => [ + [ 'id' => 'sharinglinks', 'content' => null, ], - 6 => [ + [ + 'id' => 'systemtagsfilter', + 'content' => null, + ], + [ 'id' => 'trashbin', 'content' => null, ], diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 4f4d4d3d197..470f2854f43 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -153,7 +153,7 @@ describe('OCA.Files.FileActions tests', function() { expect($tr.find('.action.action-match').length).toEqual(1); expect($tr.find('.action.action-nomatch').length).toEqual(0); }); - it('display inline icon', function() { + it('display inline icon with image path', function() { fileActions.registerAction({ name: 'Icon', displayName: 'IconDisplay', @@ -179,7 +179,7 @@ describe('OCA.Files.FileActions tests', function() { expect($tr.find('.action.action-noicon').length).toEqual(1); expect($tr.find('.action.action-noicon').find('img').length).toEqual(0); }); - it('display alt text on inline icon', function() { + it('display alt text on inline icon with image path', function() { fileActions.registerAction({ name: 'IconAltText', displayName: 'IconAltTextDisplay', @@ -209,6 +209,63 @@ describe('OCA.Files.FileActions tests', function() { expect($tr.find('.action.action-iconnoalttext').find('img').length).toEqual(1); expect($tr.find('.action.action-iconnoalttext').find('img').eq(0).attr('alt')).toEqual(''); }); + it('display inline icon with iconClass', function() { + fileActions.registerAction({ + name: 'Icon', + displayName: 'IconDisplay', + type: OCA.Files.FileActions.TYPE_INLINE, + mime: 'all', + iconClass: 'icon-test', + permissions: OC.PERMISSION_READ + }); + fileActions.registerAction({ + name: 'NoIcon', + displayName: 'NoIconDisplay', + type: OCA.Files.FileActions.TYPE_INLINE, + mime: 'all', + permissions: OC.PERMISSION_READ + }); + + fileActions.display($tr.find('td.filename'), true, fileList); + + expect($tr.find('.action.action-icon').length).toEqual(1); + expect($tr.find('.action.action-icon').find('.icon').length).toEqual(1); + expect($tr.find('.action.action-icon').find('.icon').hasClass('icon-test')).toEqual(true); + + expect($tr.find('.action.action-noicon').length).toEqual(1); + expect($tr.find('.action.action-noicon').find('.icon').length).toEqual(0); + }); + it('display alt text on inline icon with iconClass when no display name exists', function() { + fileActions.registerAction({ + name: 'IconAltText', + displayName: '', + type: OCA.Files.FileActions.TYPE_INLINE, + mime: 'all', + iconClass: 'icon-alttext', + altText: 'alt icon text', + permissions: OC.PERMISSION_READ + }); + + fileActions.registerAction({ + name: 'IconNoAltText', + displayName: 'IconNoAltTextDisplay', + type: OCA.Files.FileActions.TYPE_INLINE, + mime: 'all', + altText: 'useless alt text', + iconClass: 'icon-noalttext', + permissions: OC.PERMISSION_READ + }); + + fileActions.display($tr.find('td.filename'), true, fileList); + + expect($tr.find('.action.action-iconalttext').length).toEqual(1); + expect($tr.find('.action.action-iconalttext').find('.icon').length).toEqual(1); + expect($tr.find('.action.action-iconalttext').find('.hidden-visually').text()).toEqual('alt icon text'); + + expect($tr.find('.action.action-iconnoalttext').length).toEqual(1); + expect($tr.find('.action.action-iconnoalttext').find('.icon').length).toEqual(1); + expect($tr.find('.action.action-iconnoalttext').find('.hidden-visually').length).toEqual(0); + }); }); describe('action handler', function() { var actionStub, $tr, clock; diff --git a/apps/files/tests/js/tagspluginspec.js b/apps/files/tests/js/tagspluginspec.js index 533aa63362c..a4efc08aa53 100644 --- a/apps/files/tests/js/tagspluginspec.js +++ b/apps/files/tests/js/tagspluginspec.js @@ -99,7 +99,8 @@ describe('OCA.Files.TagsPlugin tests', function() { expect($tr.attr('data-favorite')).toEqual('true'); expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]); expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]); - expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/starred')); + expect($action.find('.icon').hasClass('icon-star')).toEqual(false); + expect($action.find('.icon').hasClass('icon-starred')).toEqual(true); $action.click(); @@ -119,7 +120,8 @@ describe('OCA.Files.TagsPlugin tests', function() { expect($tr.attr('data-favorite')).toBeFalsy(); expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3']); expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3']); - expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/star')); + expect($action.find('.icon').hasClass('icon-star')).toEqual(true); + expect($action.find('.icon').hasClass('icon-starred')).toEqual(false); }); }); describe('elementToFile', function() { diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index d108f30e846..135e9a44eb8 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -10,7 +10,10 @@ OC.L10N.register( "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden", "Invalid backend or authentication mechanism class" : "Ungültiges Backend oder falscher Authentifizierungsmodus", "Invalid mount point" : "Ungültiger mount point", + "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", + "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Personal" : "Persönlich", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index d76cb268cb6..956d202ff72 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -8,7 +8,10 @@ "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden", "Invalid backend or authentication mechanism class" : "Ungültiges Backend oder falscher Authentifizierungsmodus", "Invalid mount point" : "Ungültiger mount point", + "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", + "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Personal" : "Persönlich", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index 33f6f0f0f6e..e57c94ed957 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -4,11 +4,13 @@ OC.L10N.register( "Personal" : "Um mig", "Grant access" : "Veita aðgengi", "Access granted" : "Aðgengi veitt", + "Enable encryption" : "Virkja dulritun", "Saved" : "Vistað", "Username" : "Notendanafn", "Password" : "Lykilorð", "Save" : "Vista", "None" : "Ekkert", + "Port" : "Gátt", "WebDAV" : "WebDAV", "URL" : "URL", "Host" : "Netþjónn", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index 312a0a9f752..3de37fd149f 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -2,11 +2,13 @@ "Personal" : "Um mig", "Grant access" : "Veita aðgengi", "Access granted" : "Aðgengi veitt", + "Enable encryption" : "Virkja dulritun", "Saved" : "Vistað", "Username" : "Notendanafn", "Password" : "Lykilorð", "Save" : "Vista", "None" : "Ekkert", + "Port" : "Gátt", "WebDAV" : "WebDAV", "URL" : "URL", "Host" : "Netþjónn", diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 309e1159fff..588538fbb6c 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -271,6 +271,15 @@ class Share20OCS { $permissions &= ~\OCP\Constants::PERMISSION_CREATE; } + /* + * Hack for https://github.com/owncloud/core/issues/22587 + * We check the permissions via webdav. But the permissions of the mount point + * do not equal the share permissions. Here we fix that for federated mounts. + */ + if ($path->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) { + $permissions &= ~($permissions & ~$path->getPermissions()); + } + $shareWith = $this->request->getParam('shareWith', null); $shareType = (int)$this->request->getParam('shareType', '-1'); diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 642c0909af3..04338820881 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -87,3 +87,7 @@ margin-top: 9px; } +.shareTabView .icon { + display: inline-block; + background-size: 16px 16px; +} diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 0a01c5af0ad..2711b2392e9 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -131,7 +131,7 @@ displayName: '', mime: 'all', permissions: OC.PERMISSION_ALL, - icon: OC.imagePath('core', 'actions/share'), + iconClass: 'icon-share', type: OCA.Files.FileActions.TYPE_INLINE, actionHandler: function(fileName) { fileList.showDetailsView(fileName, 'shareTabView'); diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 39c48e99d7c..70db30c6855 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -10,6 +10,7 @@ OC.L10N.register( "Shared with you" : "Mit Ihnen geteilt", "Shared with others" : "Von Ihnen geteilt", "Shared by link" : "Geteilt über einen Link", + "Federated sharing" : "Federated-Sharing", "Nothing shared with you yet" : "Bis jetzt wurde nichts mit Ihnen geteilt", "Files and folders others share with you will show up here" : "Mit Ihnen geteilte Dateien und Ordner anderer werden hier erscheinen", "Nothing shared yet" : "Noch nichts geteilt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 75f594d1dbc..6a3f9b353db 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -8,6 +8,7 @@ "Shared with you" : "Mit Ihnen geteilt", "Shared with others" : "Von Ihnen geteilt", "Shared by link" : "Geteilt über einen Link", + "Federated sharing" : "Federated-Sharing", "Nothing shared with you yet" : "Bis jetzt wurde nichts mit Ihnen geteilt", "Files and folders others share with you will show up here" : "Mit Ihnen geteilte Dateien und Ordner anderer werden hier erscheinen", "Nothing shared yet" : "Noch nichts geteilt", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index c14e24051ed..e2110f2b6a3 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -11,6 +11,7 @@ OC.L10N.register( "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", "Shared by link" : "Compartido por medio de enlaces", + "Federated sharing" : "Compartido federado", "Nothing shared with you yet" : "Todavía no han compartido nada contigo", "Files and folders others share with you will show up here" : "Aquí aparecerán archivos y carpetas que otros compartan contigo", "Nothing shared yet" : "Aún no hay nada compartido", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 6b21f7c8d83..4372f6c661d 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -9,6 +9,7 @@ "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", "Shared by link" : "Compartido por medio de enlaces", + "Federated sharing" : "Compartido federado", "Nothing shared with you yet" : "Todavía no han compartido nada contigo", "Files and folders others share with you will show up here" : "Aquí aparecerán archivos y carpetas que otros compartan contigo", "Nothing shared yet" : "Aún no hay nada compartido", diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index 8094551bd47..fa95da0ffe2 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -1,19 +1,106 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni", + "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.", + "Not allowed to create a federated share with the same user server" : "Ekki er heimilt að búa til skýjasambandssameign með sama notendaþjóni", + "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki", + "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt", + "Storage not valid" : "Geymslan er ekki gild", + "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign", + "Shared with you" : "Deilt með þér", + "Shared with others" : "Deilt með öðrum", + "Shared by link" : "Deilt með tengli", + "Federated sharing" : "Deiling milli þjóna", + "Nothing shared with you yet" : "Engu deilt með þér ennþá", + "Files and folders others share with you will show up here" : "Skrár og möppur sem aðrir deila með þér birtast hér", + "Nothing shared yet" : "Engu deilt ennþá", + "Files and folders you share will show up here" : "Skrár og möppur sem þú deilir birtast hér", + "No shared links" : "Engir sameignartenglar", + "Files and folders you share by link will show up here" : "Skrár og möppur sem þú deilir með tenglum birtast hér", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?", + "Remote share" : "Fjartengd sameign", + "Remote share password" : "Lykilorð fjartengdrar sameignar", "Cancel" : "Hætta við", + "Add remote share" : "Bæta við fjartengdri sameign", + "You can upload into this folder" : "Þú getur sent inn skrár í þessa möppu", "No ownCloud installation (7 or higher) found at {remote}" : "Engin ownCloud uppsetning (útgáfa 7 eða nýrri) fannst á {remote}", "Invalid ownCloud url" : "Ógild ownCloud-slóð", "Shared by" : "Deilt af", + "Sharing" : "Deiling", + "A file or folder has been <strong>shared</strong>" : "Skjali eð möppu hefur verið <strong>deilt</strong>", + "A file or folder was shared from <strong>another server</strong>" : "Skjali eð möppu hefur verið deilt <strong>frá öðrum þjóni</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Skrá eða mappa í almenningsaðgangi var <strong>sótt</strong>", + "You received a new remote share %2$s from %1$s" : "Þú tókst við nýrri fjartengdri sameign %2$s frá %1$s", + "You received a new remote share from %s" : "Þú tókst við nýrri fjartengdri sameign frá %s", + "%1$s accepted remote share %2$s" : "%1$s samþykkti fjartengda sameign %2$s", + "%1$s declined remote share %2$s" : "%1$s hafnaði fjartengdri sameign %2$s", + "%1$s unshared %2$s from you" : "%1$s tók af deilingu %2$s frá þér", + "Public shared folder %1$s was downloaded" : "Deild mappa í almenningsaðgangi %1$s var sótt", + "Public shared file %1$s was downloaded" : "Deild skrá í almenningsaðgangi %1$s var sótt", + "You shared %1$s with %2$s" : "Þú deildir %1$s með %2$s", + "%2$s shared %1$s with %3$s" : "%2$s deildi %1$s með %3$s", + "You removed the share of %2$s for %1$s" : "Þú fjarlægðir deilingu af %2$s fyrir %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s fjarlægði deilingu af %3$s fyrir %1$s", + "You shared %1$s with group %2$s" : "Þú deildir %1$s með hópnum %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s deildi %1$s með hópnum %3$s", + "You removed the share of group %2$s for %1$s" : "Þú fjarlægðir deilingu til hópsins %2$s fyrir %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s fjarlægði deilingu til hópsins %3$s fyrir %1$s", + "%2$s shared %1$s via link" : "%2$s deildi %1$s með tengli", + "You shared %1$s via link" : "Þú deildir %1$s með tengli", + "You removed the public link for %1$s" : "Þú fjarlægðir almenningstengilinn fyrir %1$s", + "%2$s removed the public link for %1$s" : "%2$s fjarlægði almenningstengilinn fyrir %1$s", + "Your public link for %1$s expired" : "Almenningstengill þinn fyrir %1$s er útrunninn", + "The public link of %2$s for %1$s expired" : "Almenningstengill %2$s fyrir %1$s er útrunninn", + "%2$s shared %1$s with you" : "%2$s deildi %1$s með þér", + "%2$s removed the share for %1$s" : "%2$s fjarlægði deilingu af %1$s", + "Downloaded via public link" : "Náð í með almenningstengli", + "Shared with %2$s" : "Deilt með %2$s", + "Shared with %3$s by %2$s" : "Deilt með %3$s af %2$s", + "Removed share for %2$s" : "Fjarlægði deilingu af %2$s", + "%2$s removed share for %3$s" : "%2$s fjarlægði deilingu af %3$s", + "Shared with group %2$s" : "Deilt með hópnum %2$s", + "Shared with group %3$s by %2$s" : "Deilt með hópnum %3$s af %2$s", + "Removed share of group %2$s" : "Fjarlægði deilingu af hópnum %2$s", + "%2$s removed share of group %3$s" : "%2$s fjarlægði deilingu af hópnum %3$s", + "Shared via link by %2$s" : "Deilt með tengli af %2$s", + "Shared via public link" : "Deilt með almenningstengli", + "Removed public link" : "Fjarlægði almenningstengil", + "%2$s removed public link" : "%2$s fjarlægði almenningstengil", + "Public link expired" : "Almenningstengill er útrunninn", + "Public link of %2$s expired" : "Almenningstengill %2$s er útrunninn", + "Shared by %2$s" : "Deilt af %2$s", + "Shares" : "Sameignir", + "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s", + "Accept" : "Samþykkja", + "Decline" : "Hafna", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", "This share is password-protected" : "Þessi sameign er varin með lykilorði", "The password is wrong. Try again." : "Lykilorðið er rangt. Reyndu aftur.", "Password" : "Lykilorð", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Name" : "Nafn", + "Share time" : "Deilingartími", + "Sorry, this link doesn’t seem to work anymore." : "Því miður, þessi tengill virðist ekki virka lengur.", "Reasons might be:" : "Mögulegar ástæður gætu verið:", "the item was removed" : "atriðið var fjarlægt", + "the link expired" : "tengillinn er útrunninn", "sharing is disabled" : "slökkt er á skráadeilingu", + "For more info, please ask the person who sent this link." : "Til að vita meira skaltu hafa samband við þann sem sendi þér þennan tengil.", "Add to your ownCloud" : "Bæta í þitt eigið ownCloud", - "Download" : "Niðurhal" + "Download" : "Niðurhal", + "Download %s" : "Sækja %s", + "Direct link" : "Beinn tengill", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "Open documentation" : "Opna hjálparskjöl", + "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", + "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Federated Cloud" : "Skýjasamband (federated)", + "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", + "Share it:" : "Deila því:", + "Add to your website" : "Bæta við vefsvæðið þitt", + "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", + "HTML Code:" : "HTML-kóði:" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 71b6c280431..8ddb01882ab 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -1,17 +1,104 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni", + "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.", + "Not allowed to create a federated share with the same user server" : "Ekki er heimilt að búa til skýjasambandssameign með sama notendaþjóni", + "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki", + "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt", + "Storage not valid" : "Geymslan er ekki gild", + "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign", + "Shared with you" : "Deilt með þér", + "Shared with others" : "Deilt með öðrum", + "Shared by link" : "Deilt með tengli", + "Federated sharing" : "Deiling milli þjóna", + "Nothing shared with you yet" : "Engu deilt með þér ennþá", + "Files and folders others share with you will show up here" : "Skrár og möppur sem aðrir deila með þér birtast hér", + "Nothing shared yet" : "Engu deilt ennþá", + "Files and folders you share will show up here" : "Skrár og möppur sem þú deilir birtast hér", + "No shared links" : "Engir sameignartenglar", + "Files and folders you share by link will show up here" : "Skrár og möppur sem þú deilir með tenglum birtast hér", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?", + "Remote share" : "Fjartengd sameign", + "Remote share password" : "Lykilorð fjartengdrar sameignar", "Cancel" : "Hætta við", + "Add remote share" : "Bæta við fjartengdri sameign", + "You can upload into this folder" : "Þú getur sent inn skrár í þessa möppu", "No ownCloud installation (7 or higher) found at {remote}" : "Engin ownCloud uppsetning (útgáfa 7 eða nýrri) fannst á {remote}", "Invalid ownCloud url" : "Ógild ownCloud-slóð", "Shared by" : "Deilt af", + "Sharing" : "Deiling", + "A file or folder has been <strong>shared</strong>" : "Skjali eð möppu hefur verið <strong>deilt</strong>", + "A file or folder was shared from <strong>another server</strong>" : "Skjali eð möppu hefur verið deilt <strong>frá öðrum þjóni</strong>", + "A public shared file or folder was <strong>downloaded</strong>" : "Skrá eða mappa í almenningsaðgangi var <strong>sótt</strong>", + "You received a new remote share %2$s from %1$s" : "Þú tókst við nýrri fjartengdri sameign %2$s frá %1$s", + "You received a new remote share from %s" : "Þú tókst við nýrri fjartengdri sameign frá %s", + "%1$s accepted remote share %2$s" : "%1$s samþykkti fjartengda sameign %2$s", + "%1$s declined remote share %2$s" : "%1$s hafnaði fjartengdri sameign %2$s", + "%1$s unshared %2$s from you" : "%1$s tók af deilingu %2$s frá þér", + "Public shared folder %1$s was downloaded" : "Deild mappa í almenningsaðgangi %1$s var sótt", + "Public shared file %1$s was downloaded" : "Deild skrá í almenningsaðgangi %1$s var sótt", + "You shared %1$s with %2$s" : "Þú deildir %1$s með %2$s", + "%2$s shared %1$s with %3$s" : "%2$s deildi %1$s með %3$s", + "You removed the share of %2$s for %1$s" : "Þú fjarlægðir deilingu af %2$s fyrir %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s fjarlægði deilingu af %3$s fyrir %1$s", + "You shared %1$s with group %2$s" : "Þú deildir %1$s með hópnum %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s deildi %1$s með hópnum %3$s", + "You removed the share of group %2$s for %1$s" : "Þú fjarlægðir deilingu til hópsins %2$s fyrir %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s fjarlægði deilingu til hópsins %3$s fyrir %1$s", + "%2$s shared %1$s via link" : "%2$s deildi %1$s með tengli", + "You shared %1$s via link" : "Þú deildir %1$s með tengli", + "You removed the public link for %1$s" : "Þú fjarlægðir almenningstengilinn fyrir %1$s", + "%2$s removed the public link for %1$s" : "%2$s fjarlægði almenningstengilinn fyrir %1$s", + "Your public link for %1$s expired" : "Almenningstengill þinn fyrir %1$s er útrunninn", + "The public link of %2$s for %1$s expired" : "Almenningstengill %2$s fyrir %1$s er útrunninn", + "%2$s shared %1$s with you" : "%2$s deildi %1$s með þér", + "%2$s removed the share for %1$s" : "%2$s fjarlægði deilingu af %1$s", + "Downloaded via public link" : "Náð í með almenningstengli", + "Shared with %2$s" : "Deilt með %2$s", + "Shared with %3$s by %2$s" : "Deilt með %3$s af %2$s", + "Removed share for %2$s" : "Fjarlægði deilingu af %2$s", + "%2$s removed share for %3$s" : "%2$s fjarlægði deilingu af %3$s", + "Shared with group %2$s" : "Deilt með hópnum %2$s", + "Shared with group %3$s by %2$s" : "Deilt með hópnum %3$s af %2$s", + "Removed share of group %2$s" : "Fjarlægði deilingu af hópnum %2$s", + "%2$s removed share of group %3$s" : "%2$s fjarlægði deilingu af hópnum %3$s", + "Shared via link by %2$s" : "Deilt með tengli af %2$s", + "Shared via public link" : "Deilt með almenningstengli", + "Removed public link" : "Fjarlægði almenningstengil", + "%2$s removed public link" : "%2$s fjarlægði almenningstengil", + "Public link expired" : "Almenningstengill er útrunninn", + "Public link of %2$s expired" : "Almenningstengill %2$s er útrunninn", + "Shared by %2$s" : "Deilt af %2$s", + "Shares" : "Sameignir", + "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s", + "Accept" : "Samþykkja", + "Decline" : "Hafna", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", "This share is password-protected" : "Þessi sameign er varin með lykilorði", "The password is wrong. Try again." : "Lykilorðið er rangt. Reyndu aftur.", "Password" : "Lykilorð", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Name" : "Nafn", + "Share time" : "Deilingartími", + "Sorry, this link doesn’t seem to work anymore." : "Því miður, þessi tengill virðist ekki virka lengur.", "Reasons might be:" : "Mögulegar ástæður gætu verið:", "the item was removed" : "atriðið var fjarlægt", + "the link expired" : "tengillinn er útrunninn", "sharing is disabled" : "slökkt er á skráadeilingu", + "For more info, please ask the person who sent this link." : "Til að vita meira skaltu hafa samband við þann sem sendi þér þennan tengil.", "Add to your ownCloud" : "Bæta í þitt eigið ownCloud", - "Download" : "Niðurhal" + "Download" : "Niðurhal", + "Download %s" : "Sækja %s", + "Direct link" : "Beinn tengill", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "Open documentation" : "Opna hjálparskjöl", + "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", + "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Federated Cloud" : "Skýjasamband (federated)", + "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", + "Share it:" : "Deila því:", + "Add to your website" : "Bæta við vefsvæðið þitt", + "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", + "HTML Code:" : "HTML-kóði:" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php index 44d94868a32..057df20a5a4 100644 --- a/apps/files_sharing/tests/api/share20ocstest.php +++ b/apps/files_sharing/tests/api/share20ocstest.php @@ -553,6 +553,11 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn($userFolder); $path = $this->getMock('\OCP\Files\File'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $userFolder->expects($this->once()) ->method('get') ->with('valid-path') @@ -586,6 +591,11 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn($userFolder); $path = $this->getMock('\OCP\Files\File'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $userFolder->expects($this->once()) ->method('get') ->with('valid-path') @@ -632,6 +642,11 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn($userFolder); $path = $this->getMock('\OCP\Files\File'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $userFolder->expects($this->once()) ->method('get') ->with('valid-path') @@ -678,6 +693,11 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn($userFolder); $path = $this->getMock('\OCP\Files\File'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $userFolder->expects($this->once()) ->method('get') ->with('valid-path') @@ -724,6 +744,11 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn($userFolder); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $userFolder->expects($this->once()) ->method('get') ->with('valid-path') @@ -754,6 +779,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -776,6 +806,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -799,6 +834,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\File'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -827,6 +867,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -866,6 +911,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -905,6 +955,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -947,6 +1002,11 @@ class Share20OCSTest extends \Test\TestCase { ])); $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(false); + $path->method('getStorage')->willReturn($storage); $this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf()); $this->rootFolder->method('get')->with('valid-path')->willReturn($path); @@ -961,6 +1021,66 @@ class Share20OCSTest extends \Test\TestCase { $this->assertEquals($expected->getData(), $result->getData()); } + /** + * Test for https://github.com/owncloud/core/issues/22587 + * TODO: Remove once proper solution is in place + */ + public function testCreateReshareOfFederatedMountNoDeletePermissions() { + $share = \OC::$server->getShareManager()->newShare(); + $this->shareManager->method('newShare')->willReturn($share); + + $ocs = $this->getMockBuilder('OCA\Files_Sharing\API\Share20OCS') + ->setConstructorArgs([ + $this->shareManager, + $this->groupManager, + $this->userManager, + $this->request, + $this->rootFolder, + $this->urlGenerator, + $this->currentUser + ])->setMethods(['formatShare']) + ->getMock(); + + $this->request + ->method('getParam') + ->will($this->returnValueMap([ + ['path', null, 'valid-path'], + ['permissions', null, \OCP\Constants::PERMISSION_ALL], + ['shareType', $this->any(), \OCP\Share::SHARE_TYPE_USER], + ['shareWith', null, 'validUser'], + ])); + + $userFolder = $this->getMock('\OCP\Files\Folder'); + $this->rootFolder->expects($this->once()) + ->method('getUserFolder') + ->with('currentUser') + ->willReturn($userFolder); + + $path = $this->getMock('\OCP\Files\Folder'); + $storage = $this->getMock('OCP\Files\Storage'); + $storage->method('instanceOfStorage') + ->with('OCA\Files_Sharing\External\Storage') + ->willReturn(true); + $path->method('getStorage')->willReturn($storage); + $path->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ); + $userFolder->expects($this->once()) + ->method('get') + ->with('valid-path') + ->willReturn($path); + + $this->userManager->method('userExists')->with('validUser')->willReturn(true); + + $this->shareManager + ->expects($this->once()) + ->method('createShare') + ->with($this->callback(function (\OCP\Share\IShare $share) { + return $share->getPermissions() === \OCP\Constants::PERMISSION_READ; + })) + ->will($this->returnArgument(0)); + + $ocs->createShare(); + } + public function testUpdateShareCantAccess() { $share = \OC::$server->getShareManager()->newShare(); diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index fd8e36d71ad..7607ada50ba 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -97,9 +97,9 @@ describe('OCA.Sharing.Util tests', function() { }]); $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder.svg'); - expect($action.find('img').length).toEqual(1); }); it('shows simple share text with share icon', function() { var $action, $tr; @@ -116,9 +116,9 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.find('>span').text().trim()).toEqual('Shared'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); - expect($action.find('img').length).toEqual(1); }); it('shows simple share text with public icon when shared with link', function() { var $action, $tr; @@ -136,9 +136,9 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.find('>span').text().trim()).toEqual('Shared'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(false); + expect($action.find('.icon').hasClass('icon-public')).toEqual(true); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg'); - expect($action.find('img').length).toEqual(1); }); it('shows owner name when owner is available', function() { var $action, $tr; @@ -156,7 +156,8 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.find('>span').text().trim()).toEqual('User One'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); }); it('shows recipients when recipients are available', function() { @@ -175,9 +176,9 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); - expect($action.find('img').length).toEqual(1); }); it('shows share action when shared with user who has no share permission', function() { var $action, $tr; @@ -282,7 +283,8 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('Group One, Group Two, User One, User Two'); expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); it('updates share icon after updating shares of a file', function() { var $action, $tr; @@ -314,7 +316,8 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('User One, User Three, User Two'); expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); it('removes share icon after removing all shares from a file', function() { var $action, $tr; @@ -369,7 +372,8 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('User Two'); expect($action.find('>span').text().trim()).toEqual('User One'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); it('keep share text after unsharing reshare', function() { var $action, $tr; @@ -399,7 +403,8 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).not.toBeDefined(); expect($action.find('>span').text().trim()).toEqual('User One'); - expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); + expect($action.find('.icon').hasClass('icon-share')).toEqual(true); + expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); }); describe('formatRecipients', function() { diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js index 600a8ce2b03..771ea90bc16 100644 --- a/apps/files_trashbin/js/app.js +++ b/apps/files_trashbin/js/app.js @@ -49,7 +49,7 @@ OCA.Trashbin.App = { type: OCA.Files.FileActions.TYPE_INLINE, mime: 'all', permissions: OC.PERMISSION_READ, - icon: OC.imagePath('core', 'actions/history'), + iconClass: 'icon-history', actionHandler: function(filename, context) { var fileList = context.fileList; var tr = fileList.findFileEl(filename); @@ -70,9 +70,7 @@ OCA.Trashbin.App = { displayName: t('files', 'Delete'), mime: 'all', permissions: OC.PERMISSION_READ, - icon: function() { - return OC.imagePath('core', 'actions/delete'); - }, + iconClass: 'icon-delete', render: function(actionSpec, isDefault, context) { var $actionLink = fileActions._makeActionLink(actionSpec, context); $actionLink.attr('original-title', t('files_trashbin', 'Delete permanently')); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index a7c1df93af2..9ea8a9d14c4 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -30,9 +30,8 @@ <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <span id="selectedActionsList" class='selectedActions'> <a href="" class="undelete"> - <img class="svg" alt="" - src="<?php print_unescaped(image_path("core", "actions/history.svg")); ?>" /> - <?php p($l->t('Restore'))?> + <span class="icon icon-history"></span> + <span><?php p($l->t('Restore'))?></span> </a> </span> </div> @@ -41,9 +40,8 @@ <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a> <span class="selectedActions"> <a href="" class="delete-selected"> - <?php p($l->t('Delete'))?> - <img class="svg" alt="" - src="<?php print_unescaped(image_path("core", "actions/delete.svg")); ?>" /> + <span><?php p($l->t('Delete'))?></span> + <span class="icon icon-delete"></span> </a> </span> </th> diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index 00663d5082b..f10d7f16cc8 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -83,7 +83,7 @@ $l = \OC::$server->getL10N('systemtags'); 'id' => 'systemtagsfilter', 'appname' => 'systemtags', 'script' => 'list.php', - 'order' => 9, + 'order' => 25, 'name' => $l->t('Tags') ) ); diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index d0b4c1fce00..40eeeb24811 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -1,8 +1,9 @@ <?xml version="1.0"?> <info> <id>systemtags</id> - <name>System tags</name> - <description>System-wide tags user interface</description> + <name>Collaborative tags</name> + <description>Collaborative tagging functionality which shares tags among users. Great for teams. + (If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)</description> <licence>AGPL</licence> <author>Vincent Petry</author> <default_enable/> diff --git a/apps/systemtags/js/systemtagsinfoview.js b/apps/systemtags/js/systemtagsinfoview.js index 2e808f9a84f..2f01ca7db34 100644 --- a/apps/systemtags/js/systemtagsinfoview.js +++ b/apps/systemtags/js/systemtagsinfoview.js @@ -100,7 +100,7 @@ * This will automatically adjust the tag mapping collection to * container the new name. * - * @param {OC.Backbone.Model} changedTag tag model that has changed + * @param {OC.Backbone.Model} tagId tag model that has changed */ _onTagDeletedGlobally: function(tagId) { // also rename it in the selection, if applicable diff --git a/apps/systemtags/l10n/fr.js b/apps/systemtags/l10n/fr.js index 4d8342b0e1e..d7e1f3b1c05 100644 --- a/apps/systemtags/l10n/fr.js +++ b/apps/systemtags/l10n/fr.js @@ -8,7 +8,7 @@ OC.L10N.register( "Tagged files" : "Fichiers étiquetés", "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", - "No files found for the selected tags" : "Pas de fichier trouvé pour les étiquettes sélectionnées", + "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "No files in here" : "Aucun fichier", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", diff --git a/apps/systemtags/l10n/fr.json b/apps/systemtags/l10n/fr.json index 283f9d7eafa..e4b5296fb20 100644 --- a/apps/systemtags/l10n/fr.json +++ b/apps/systemtags/l10n/fr.json @@ -6,7 +6,7 @@ "Tagged files" : "Fichiers étiquetés", "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", - "No files found for the selected tags" : "Pas de fichier trouvé pour les étiquettes sélectionnées", + "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "No files in here" : "Aucun fichier", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", diff --git a/apps/systemtags/l10n/sl.js b/apps/systemtags/l10n/sl.js index 8a591c4c1ce..87469d3fbd1 100644 --- a/apps/systemtags/l10n/sl.js +++ b/apps/systemtags/l10n/sl.js @@ -1,6 +1,16 @@ OC.L10N.register( "systemtags", { + "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemske oznake</strong> datoteke so bile spremenjene", + "%1$s assigned system tag %3$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s", + "%1$s unassigned system tag %3$s" : "Uporabnik %1$s je odstranil sistemsko oznako %3$s", + "%1$s created system tag %2$s" : "Uporabnik %1$s je ustvaril sistemsko oznako %2$s", + "%1$s deleted system tag %2$s" : "Uporabnik %1$s je izbrisal sistemsko oznako %2$s", + "%1$s updated system tag %3$s to %2$s" : "Uporabnik %1$s je posodobil sistemsko oznako %3$s za %2$s", + "%1$s assigned system tag %3$s to %2$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s za %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "Uporabnik %1$s je prevzel sistemsko oznako %3$s od %2$s", + "%s (not-assignable)" : "%s (nedodeljivo)", + "%s (invisible)" : "%s (nevidno)", "Tags" : "Oznake", "Tagged files" : "Označene datoteke", "Select tags to filter by" : "Izbor oznak za filtriranje", diff --git a/apps/systemtags/l10n/sl.json b/apps/systemtags/l10n/sl.json index 4b5cb6062c9..b768a391c17 100644 --- a/apps/systemtags/l10n/sl.json +++ b/apps/systemtags/l10n/sl.json @@ -1,4 +1,14 @@ { "translations": { + "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemske oznake</strong> datoteke so bile spremenjene", + "%1$s assigned system tag %3$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s", + "%1$s unassigned system tag %3$s" : "Uporabnik %1$s je odstranil sistemsko oznako %3$s", + "%1$s created system tag %2$s" : "Uporabnik %1$s je ustvaril sistemsko oznako %2$s", + "%1$s deleted system tag %2$s" : "Uporabnik %1$s je izbrisal sistemsko oznako %2$s", + "%1$s updated system tag %3$s to %2$s" : "Uporabnik %1$s je posodobil sistemsko oznako %3$s za %2$s", + "%1$s assigned system tag %3$s to %2$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s za %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "Uporabnik %1$s je prevzel sistemsko oznako %3$s od %2$s", + "%s (not-assignable)" : "%s (nedodeljivo)", + "%s (invisible)" : "%s (nevidno)", "Tags" : "Oznake", "Tagged files" : "Označene datoteke", "Select tags to filter by" : "Izbor oznak za filtriranje", diff --git a/apps/updatenotification/l10n/fr.js b/apps/updatenotification/l10n/fr.js index 28fee71cd89..b41a6de202e 100644 --- a/apps/updatenotification/l10n/fr.js +++ b/apps/updatenotification/l10n/fr.js @@ -3,7 +3,7 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", "Updater" : "Mises à jour", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le système de mise à jour inclus dans ownCloud utilise des informations d'identification supplémentaires. Pour voir la page de mise à jour, veuillez cliquer sur le bouton suivant.", + "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le module de mises à jour intégré à ownCloud utilise des informations d'identification supplémentaires. Pour visiter la page du module de mises à jour, cliquez sur le bouton suivant.", "Open updater" : "Ouvrir le système de mise à jour" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/updatenotification/l10n/fr.json b/apps/updatenotification/l10n/fr.json index 0887453e7c4..473d53d11ff 100644 --- a/apps/updatenotification/l10n/fr.json +++ b/apps/updatenotification/l10n/fr.json @@ -1,7 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", "Updater" : "Mises à jour", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le système de mise à jour inclus dans ownCloud utilise des informations d'identification supplémentaires. Pour voir la page de mise à jour, veuillez cliquer sur le bouton suivant.", + "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le module de mises à jour intégré à ownCloud utilise des informations d'identification supplémentaires. Pour visiter la page du module de mises à jour, cliquez sur le bouton suivant.", "Open updater" : "Ouvrir le système de mise à jour" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js index ed3ac95aae5..cec369b3f87 100644 --- a/apps/user_ldap/l10n/is.js +++ b/apps/user_ldap/l10n/is.js @@ -6,6 +6,7 @@ OC.L10N.register( "Test Configuration" : "Prúfa uppsetningu", "Help" : "Hjálp", "Host" : "Netþjónn", + "Port" : "Gátt", "Password" : "Lykilorð", "Continue" : "Halda áfram", "Advanced" : "Ítarlegt" diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json index aa48708e8b6..9d58f777e42 100644 --- a/apps/user_ldap/l10n/is.json +++ b/apps/user_ldap/l10n/is.json @@ -4,6 +4,7 @@ "Test Configuration" : "Prúfa uppsetningu", "Help" : "Hjálp", "Host" : "Netþjónn", + "Port" : "Gátt", "Password" : "Lykilorð", "Continue" : "Halda áfram", "Advanced" : "Ítarlegt" diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js index 24fc6a68e1e..90d0ddb56b0 100644 --- a/apps/user_ldap/l10n/ja.js +++ b/apps/user_ldap/l10n/ja.js @@ -135,6 +135,7 @@ OC.L10N.register( "Group Search Attributes" : "グループ検索属性", "Group-Member association" : "グループとメンバーの関連付け", "Dynamic Group Member URL" : "ダイナミックグループメンバーURL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "グループオブジェクト上のLDAP属性はグループに属するオブジェクトを決定するLDAP検索URLを含みます｡(空の設定はダイナミックグループメンバーシップが機能的に無効になります｡)", "Nested Groups" : "ネストされたグループ", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "オンにすると、グループを含むグループが有効になります。(グループメンバーの属性にDNが含まれる場合のみ利用できます。)", "Paging chunksize" : "ページ分割サイズ", diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json index 1a7d54504e5..3ce515079ae 100644 --- a/apps/user_ldap/l10n/ja.json +++ b/apps/user_ldap/l10n/ja.json @@ -133,6 +133,7 @@ "Group Search Attributes" : "グループ検索属性", "Group-Member association" : "グループとメンバーの関連付け", "Dynamic Group Member URL" : "ダイナミックグループメンバーURL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "グループオブジェクト上のLDAP属性はグループに属するオブジェクトを決定するLDAP検索URLを含みます｡(空の設定はダイナミックグループメンバーシップが機能的に無効になります｡)", "Nested Groups" : "ネストされたグループ", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "オンにすると、グループを含むグループが有効になります。(グループメンバーの属性にDNが含まれる場合のみ利用できます。)", "Paging chunksize" : "ページ分割サイズ", diff --git a/apps/user_ldap/l10n/mk.js b/apps/user_ldap/l10n/mk.js index 1165678b925..39fe8f5da90 100644 --- a/apps/user_ldap/l10n/mk.js +++ b/apps/user_ldap/l10n/mk.js @@ -1,6 +1,7 @@ OC.L10N.register( "user_ldap", { + "Failed to clear the mappings." : "Неуспешно бришење на мапирањстс.", "Select groups" : "Одбери групи", "Confirm Deletion" : "Потврдете го бришењето", "Users" : "Корисници", diff --git a/apps/user_ldap/l10n/mk.json b/apps/user_ldap/l10n/mk.json index 3bd03720893..238bd2a8ebc 100644 --- a/apps/user_ldap/l10n/mk.json +++ b/apps/user_ldap/l10n/mk.json @@ -1,4 +1,5 @@ { "translations": { + "Failed to clear the mappings." : "Неуспешно бришење на мапирањстс.", "Select groups" : "Одбери групи", "Confirm Deletion" : "Потврдете го бришењето", "Users" : "Корисници", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 8444f09fed2..0187bd4345b 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -17,6 +17,7 @@ OC.L10N.register( "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "{nthServer}. Server" : "{nthServer}. strežnik", + "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mode switch" : "Preklop načina", @@ -42,6 +43,9 @@ OC.L10N.register( "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", + "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", + "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", + "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Verify settings" : "Preveri nastavitve", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 8dbb7111a32..11e6d443c49 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -15,6 +15,7 @@ "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "{nthServer}. Server" : "{nthServer}. strežnik", + "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mode switch" : "Preklop načina", @@ -40,6 +41,9 @@ "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", + "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", + "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", + "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Verify settings" : "Preveri nastavitve", diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index bf3b1d50814..0084597836f 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -7,7 +7,7 @@ use GuzzleHttp\Message\ResponseInterface; require __DIR__ . '/../../vendor/autoload.php'; -trait BasicStructure{ +trait BasicStructure { /** @var string */ private $currentUser = ''; @@ -20,6 +20,12 @@ trait BasicStructure{ /** @var ResponseInterface */ private $response = null; + /** @var \GuzzleHttp\Cookie\CookieJar */ + private $cookieJar; + + /** @var string */ + private $requesttoken; + public function __construct($baseUrl, $admin, $regular_user_password) { // Initialize your context here @@ -29,6 +35,7 @@ trait BasicStructure{ $this->localBaseUrl = substr($this->baseUrl, 0, -4); $this->remoteBaseUrl = substr($this->baseUrl, 0, -4); $this->currentServer = 'LOCAL'; + $this->cookieJar = new \GuzzleHttp\Cookie\CookieJar(); // in case of ci deployment we take the server url from the environment $testServerUrl = getenv('TEST_SERVER_URL'); @@ -93,7 +100,6 @@ trait BasicStructure{ /** * @When /^sending "([^"]*)" to "([^"]*)" with$/ - * @param \Behat\Gherkin\Node\TableNode|null $formData */ public function sendingToWith($verb, $url, $body) { $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php" . $url; @@ -136,6 +142,88 @@ trait BasicStructure{ PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode()); } + /** + * @param ResponseInterface $response + */ + private function extracRequestTokenFromResponse(ResponseInterface $response) { + $this->requesttoken = substr(preg_replace('/(.*)data-requesttoken="(.*)">(.*)/sm', '\2', $response->getBody()->getContents()), 0, 89); + } + + /** + * @Given Logging in using web as :user + */ + public function loggingInUsingWebAs($user) { + $loginUrl = substr($this->baseUrl, 0, -5); + // Request a new session and extract CSRF token + $client = new Client(); + $response = $client->get( + $loginUrl, + [ + 'cookies' => $this->cookieJar, + ] + ); + $this->extracRequestTokenFromResponse($response); + + // Login and extract new token + $password = ($user === 'admin') ? 'admin' : '123456'; + $client = new Client(); + $response = $client->post( + $loginUrl, + [ + 'body' => [ + 'user' => $user, + 'password' => $password, + 'requesttoken' => $this->requesttoken, + ], + 'cookies' => $this->cookieJar, + ] + ); + $this->extracRequestTokenFromResponse($response); + } + + /** + * @When Sending a :method to :url with requesttoken + */ + public function sendingAToWithRequesttoken($method, $url) { + $baseUrl = substr($this->baseUrl, 0, -5); + + $client = new Client(); + $request = $client->createRequest( + $method, + $baseUrl . $url, + [ + 'cookies' => $this->cookieJar, + ] + ); + $request->addHeader('requesttoken', $this->requesttoken); + try { + $this->response = $client->send($request); + } catch (\GuzzleHttp\Exception\ClientException $e) { + $this->response = $e->getResponse(); + } + } + + /** + * @When Sending a :method to :url without requesttoken + */ + public function sendingAToWithoutRequesttoken($method, $url) { + $baseUrl = substr($this->baseUrl, 0, -5); + + $client = new Client(); + $request = $client->createRequest( + $method, + $baseUrl . $url, + [ + 'cookies' => $this->cookieJar, + ] + ); + try { + $this->response = $client->send($request); + } catch (\GuzzleHttp\Exception\ClientException $e) { + $this->response = $e->getResponse(); + } + } + public static function removeFile($path, $filename){ if (file_exists("$path" . "$filename")) { unlink("$path" . "$filename"); diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index e16de8b6b11..bfd52ec6605 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -506,3 +506,23 @@ Feature: sharing And file "myfile.txt" of user "user0" is shared with user "user1" When User "user1" uploads file "data/textfile.txt" to "/myfile.txt" Then the HTTP status code should be "204" + + Scenario: Don't allow sharing of the root + Given user "user0" exists + And As an "user0" + When creating a share with + | path | / | + | shareType | 3 | + Then the OCS status code should be "403" + + Scenario: Allow modification of reshare + Given user "user0" exists + And user "user1" exists + And user "user2" exists + And user "user0" created a folder "/TMP" + And file "TMP" of user "user0" is shared with user "user1" + And file "TMP" of user "user1" is shared with user "user2" + And As an "user1" + When Updating last share with + | permissions | 1 | + Then the OCS status code should be "100" diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature index c424f77afd5..c4623a01ba2 100644 --- a/build/integration/features/webdav-related.feature +++ b/build/integration/features/webdav-related.feature @@ -62,9 +62,46 @@ Feature: sharing |X-XSS-Protection|1; mode=block| And Downloaded content should start with "Welcome to your ownCloud account!" + Scenario: Doing a GET with a web login should work without CSRF token on the new backend + Given Logging in using web as "admin" + When Sending a "GET" to "/remote.php/dav/files/admin/welcome.txt" without requesttoken + Then Downloaded content should start with "Welcome to your ownCloud account!" + Then the HTTP status code should be "200" + Scenario: Doing a GET with a web login should work with CSRF token on the new backend + Given Logging in using web as "admin" + When Sending a "GET" to "/remote.php/dav/files/admin/welcome.txt" with requesttoken + Then Downloaded content should start with "Welcome to your ownCloud account!" + Then the HTTP status code should be "200" + Scenario: Doing a PROPFIND with a web login should not work without CSRF token on the new backend + Given Logging in using web as "admin" + When Sending a "PROPFIND" to "/remote.php/dav/files/admin/welcome.txt" without requesttoken + Then the HTTP status code should be "401" + Scenario: Doing a PROPFIND with a web login should work with CSRF token on the new backend + Given Logging in using web as "admin" + When Sending a "PROPFIND" to "/remote.php/dav/files/admin/welcome.txt" with requesttoken + Then the HTTP status code should be "207" + Scenario: Doing a GET with a web login should work without CSRF token on the old backend + Given Logging in using web as "admin" + When Sending a "GET" to "/remote.php/webdav/welcome.txt" without requesttoken + Then Downloaded content should start with "Welcome to your ownCloud account!" + Then the HTTP status code should be "200" + Scenario: Doing a GET with a web login should work with CSRF token on the old backend + Given Logging in using web as "admin" + When Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken + Then Downloaded content should start with "Welcome to your ownCloud account!" + Then the HTTP status code should be "200" + Scenario: Doing a PROPFIND with a web login should not work without CSRF token on the old backend + Given Logging in using web as "admin" + When Sending a "PROPFIND" to "/remote.php/webdav/welcome.txt" without requesttoken + Then the HTTP status code should be "401" + + Scenario: Doing a PROPFIND with a web login should work with CSRF token on the old backend + Given Logging in using web as "admin" + When Sending a "PROPFIND" to "/remote.php/webdav/welcome.txt" with requesttoken + Then the HTTP status code should be "207" diff --git a/core/css/apps.css b/core/css/apps.css index 9afd7044345..c4e2d11b6fc 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -642,6 +642,7 @@ em { .popovermenu .menuitem, .popovermenu .menuitem>span { cursor: pointer; + vertical-align: middle; } .popovermenu .menuitem { @@ -694,6 +695,7 @@ em { width: 16px; height: 16px; margin-right: 10px; + vertical-align: middle; } .popovermenu .menuitem { diff --git a/core/css/icons.css b/core/css/icons.css index 359c55e4dc5..b746436ed5f 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -231,6 +231,9 @@ .icon-view-close { background-image: url('../img/actions/view-close.svg'); } +.icon-view-download { + background-image: url('../img/actions/view-download.svg'); +} .icon-view-next { background-image: url('../img/actions/view-next.svg'); } diff --git a/core/img/actions/view-download.png b/core/img/actions/view-download.png Binary files differnew file mode 100644 index 00000000000..29e1b6fec70 --- /dev/null +++ b/core/img/actions/view-download.png diff --git a/core/img/actions/view-download.svg b/core/img/actions/view-download.svg new file mode 100644 index 00000000000..471109757c9 --- /dev/null +++ b/core/img/actions/view-download.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.6" width="1.6" y="-.3" x="-.3"> + <feGaussianBlur stdDeviation="1.75"/> + </filter> + </defs> + <g transform="matrix(1.4286 0 0 1.4286 4.5714 -1476)" filter="url(#a)" stroke="#000"> + <path d="m6 1037.4h4v7h5l-7 7-7-7h5z" stroke="#000"/> + </g> + <g fill="#fff" transform="matrix(1.4286 0 0 1.4286 4.5714 -1476)"> + <path d="m6 1037.4h4v7h5l-7 7-7-7h5z" fill="#fff"/> + </g> +</svg> diff --git a/core/js/share.js b/core/js/share.js index 9539e92e09b..61483f4cf4d 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -106,15 +106,15 @@ OC.Share = _.extend(OC.Share || {}, { } // TODO: iterating over the files might be more efficient for (item in OC.Share.statuses){ - var image = OC.imagePath('core', 'actions/share'); + var iconClass = 'icon-share'; var data = OC.Share.statuses[item]; var hasLink = data.link; // Links override shared in terms of icon display if (hasLink) { - image = OC.imagePath('core', 'actions/public'); + iconClass = 'icon-public'; } if (itemType !== 'file' && itemType !== 'folder') { - $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); + $('a.share[data-item="'+item+'"] .icon').removeClass('icon-share icon-public').addClass(iconClass); } else { // TODO: ultimately this part should be moved to files_sharing app var file = $fileList.find('tr[data-id="'+item+'"]'); @@ -160,23 +160,24 @@ OC.Share = _.extend(OC.Share || {}, { var shares = false; var link = false; var image = OC.imagePath('core', 'actions/share'); + var iconClass = ''; $.each(OC.Share.itemShares, function(index) { if (OC.Share.itemShares[index]) { if (index == OC.Share.SHARE_TYPE_LINK) { if (OC.Share.itemShares[index] == true) { shares = true; - image = OC.imagePath('core', 'actions/public'); + iconClass = 'icon-public'; link = true; return; } } else if (OC.Share.itemShares[index].length > 0) { shares = true; - image = OC.imagePath('core', 'actions/share'); + iconClass = 'icon-share'; } } }); if (itemType != 'file' && itemType != 'folder') { - $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center'); + $('a.share[data-item="'+itemSource+'"] .icon').removeClass('icon-share icon-public').addClass(iconClass); } else { var $tr = $('tr').filterAttr('data-id', String(itemSource)); if ($tr.length > 0) { @@ -255,12 +256,12 @@ OC.Share = _.extend(OC.Share || {}, { markFileAsShared: function($tr, hasShares, hasLink) { var action = $tr.find('.fileactions .action[data-action="Share"]'); var type = $tr.data('type'); - var img = action.find('img'); + var icon = action.find('.icon'); var message; var recipients; var owner = $tr.attr('data-share-owner'); var shareFolderIcon; - var image = OC.imagePath('core', 'actions/share'); + var iconClass = 'icon-share'; action.removeClass('shared-style'); // update folder icon if (type === 'dir' && (hasShares || hasLink || owner)) { @@ -299,18 +300,18 @@ OC.Share = _.extend(OC.Share || {}, { else if (recipients) { message = t('core', 'Shared with {recipients}', {recipients: this._formatShareList(recipients.split(", ")).join(", ")}, 0, {escape: false}); } - action.html('<span> ' + message + '</span>').prepend(img); + action.html('<span> ' + message + '</span>').prepend(icon); if (owner || recipients) { action.find('.remoteAddress').tipsy({gravity: 's'}); } } else { - action.html('<span></span>').prepend(img); + action.html('<span></span>').prepend(icon); } if (hasLink) { - image = OC.imagePath('core', 'actions/public'); + iconClass = 'icon-public'; } - img.attr('src', image); + icon.removeClass('icon-share icon-public').addClass(iconClass); }, /** * diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index e8976bb26e6..49580cc888b 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -17,7 +17,7 @@ '<ul id="shareWithList" class="shareWithList">' + '{{#each sharees}}' + ' <li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' + - ' <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' + + ' <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually">{{unshareLabel}}</span></a>' + ' {{#if avatarEnabled}}' + ' <div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' + ' {{/if}}' + @@ -140,7 +140,6 @@ mailNotificationEnabled: this.configModel.isMailNotificationEnabled(), notifyByMailLabel: t('core', 'notify by email'), unshareLabel: t('core', 'Unshare'), - unshareImage: OC.imagePath('core', 'actions/delete'), canShareLabel: t('core', 'can share'), canEditLabel: t('core', 'can edit'), createPermissionLabel: t('core', 'create'), diff --git a/core/js/systemtags/systemtagsinputfield.js b/core/js/systemtags/systemtagsinputfield.js index a64e5386102..148d52b57dd 100644 --- a/core/js/systemtags/systemtagsinputfield.js +++ b/core/js/systemtags/systemtagsinputfield.js @@ -375,7 +375,7 @@ this.$el.find('[title]').tooltip({placement: 'bottom'}); this.$tagsField = this.$el.find('[name=tags]'); this.$tagsField.select2({ - placeholder: t('core', 'Global tags'), + placeholder: t('core', 'Collaborative tags'), containerCssClass: 'systemtags-select2-container', dropdownCssClass: 'systemtags-select2-dropdown', closeOnSelect: false, diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 777a811f70d..885a1eefec4 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimum \"{seconds}\" sekund. Pro vylepšení bezpečnosti doporučujeme povolit HSTS dle popisu v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Přistupujete na tuto stránku přes protokol HTTP. Důrazně doporučujeme nakonfigurovat server tak, aby vyžadoval použití HTTPS jak je popsáno v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.", "Shared" : "Sdílené", "Shared with {recipients}" : "Sdíleno s {recipients}", @@ -181,7 +182,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Smazat", "Rename" : "Přejmenovat", - "Global tags" : "Globální tagy", + "Collaborative tags" : "Tagy spolupráce", "The object type is not specified." : "Není určen typ objektu.", "Enter new" : "Zadat nový", "Add" : "Přidat", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 917f74a85ce..187ebcc2802 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimum \"{seconds}\" sekund. Pro vylepšení bezpečnosti doporučujeme povolit HSTS dle popisu v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Přistupujete na tuto stránku přes protokol HTTP. Důrazně doporučujeme nakonfigurovat server tak, aby vyžadoval použití HTTPS jak je popsáno v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.", "Shared" : "Sdílené", "Shared with {recipients}" : "Sdíleno s {recipients}", @@ -179,7 +180,7 @@ "({scope})" : "({scope})", "Delete" : "Smazat", "Rename" : "Přejmenovat", - "Global tags" : "Globální tagy", + "Collaborative tags" : "Tagy spolupráce", "The object type is not specified." : "Není určen typ objektu.", "Enter new" : "Zadat nový", "Add" : "Přidat", diff --git a/core/l10n/de.js b/core/l10n/de.js index dd025bd8754..52f88b36734 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Löschen", "Rename" : "Umbenennen", - "Global tags" : "globale Tags", + "Collaborative tags" : "Gemeinschaftliche Tags", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de.json b/core/l10n/de.json index ace41892bdb..5f8b163c678 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Löschen", "Rename" : "Umbenennen", - "Global tags" : "globale Tags", + "Collaborative tags" : "Gemeinschaftliche Tags", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 0e5311706f9..15a7b0a6035 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -167,8 +167,10 @@ OC.L10N.register( "Error while sending notification" : "Fehler beim Senden der Benachrichtigung", "not assignable" : "nicht zuweisbar", "invisible" : "unsichtbar", + "({scope})" : "({scope})", "Delete" : "Löschen", "Rename" : "Umbenennen", + "Collaborative tags" : "Gemeinschaftliche Tags", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 04f83d229fd..6fc700754e9 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -165,8 +165,10 @@ "Error while sending notification" : "Fehler beim Senden der Benachrichtigung", "not assignable" : "nicht zuweisbar", "invisible" : "unsichtbar", + "({scope})" : "({scope})", "Delete" : "Löschen", "Rename" : "Umbenennen", + "Collaborative tags" : "Gemeinschaftliche Tags", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 3fd70e33eed..bac2f7222b6 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Error occurred whilst checking server setup", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Shared", "Shared with {recipients}" : "Shared with {recipients}", @@ -184,7 +185,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Delete", "Rename" : "Rename", - "Global tags" : "Global tags", "The object type is not specified." : "The object type is not specified.", "Enter new" : "Enter new", "Add" : "Add", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index c67219d4963..6139aea21d0 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Error occurred whilst checking server setup", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Shared", "Shared with {recipients}" : "Shared with {recipients}", @@ -182,7 +183,6 @@ "({scope})" : "({scope})", "Delete" : "Delete", "Rename" : "Rename", - "Global tags" : "Global tags", "The object type is not specified." : "The object type is not specified.", "Enter new" : "Enter new", "Add" : "Add", diff --git a/core/l10n/eo.js b/core/l10n/eo.js index b019fdfd8a8..7aba923dfca 100644 --- a/core/l10n/eo.js +++ b/core/l10n/eo.js @@ -135,7 +135,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Forigi", "Rename" : "Alinomigi", - "Global tags" : "Mallokaj etikedoj", "The object type is not specified." : "Ne indikiĝis tipo de la objekto.", "Enter new" : "Enigu novan", "Add" : "Aldoni", diff --git a/core/l10n/eo.json b/core/l10n/eo.json index 2bd5efceb9e..410529d45ac 100644 --- a/core/l10n/eo.json +++ b/core/l10n/eo.json @@ -133,7 +133,6 @@ "({scope})" : "({scope})", "Delete" : "Forigi", "Rename" : "Alinomigi", - "Global tags" : "Mallokaj etikedoj", "The object type is not specified." : "Ne indikiĝis tipo de la objekto.", "Enter new" : "Enigu novan", "Add" : "Aldoni", diff --git a/core/l10n/es.js b/core/l10n/es.js index 1f8aef14cc0..d37bc2f60e3 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -180,7 +180,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Eliminar", "Rename" : "Renombrar", - "Global tags" : "Categorías globales", "The object type is not specified." : "El tipo de objeto no está especificado.", "Enter new" : "Ingresar nueva", "Add" : "Agregar", diff --git a/core/l10n/es.json b/core/l10n/es.json index e1647816720..512a096391b 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -178,7 +178,6 @@ "({scope})" : "({scope})", "Delete" : "Eliminar", "Rename" : "Renombrar", - "Global tags" : "Categorías globales", "The object type is not specified." : "El tipo de objeto no está especificado.", "Enter new" : "Ingresar nueva", "Add" : "Agregar", diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js index 3945f99474e..21595418ea5 100644 --- a/core/l10n/et_EE.js +++ b/core/l10n/et_EE.js @@ -151,7 +151,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Kustuta", "Rename" : "Nimeta ümber", - "Global tags" : "Üldised sildid", "The object type is not specified." : "Objekti tüüp pole määratletud.", "Enter new" : "Sisesta uus", "Add" : "Lisa", diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json index ceef5d9ff95..021cd28fb13 100644 --- a/core/l10n/et_EE.json +++ b/core/l10n/et_EE.json @@ -149,7 +149,6 @@ "({scope})" : "({scope})", "Delete" : "Kustuta", "Rename" : "Nimeta ümber", - "Global tags" : "Üldised sildid", "The object type is not specified." : "Objekti tüüp pole määratletud.", "Enter new" : "Sisesta uus", "Add" : "Lisa", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 0818ecf43f7..c6550a1733c 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekunniksi. Suosittelemme lisäturvan vuoksi ottamaan HSTS:n käyttöön <a href=\"{docUrl}\">turvallisuusohjeiden</a> mukaisesti.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.", "Shared" : "Jaettu", "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Poista", "Rename" : "Nimeä uudelleen", - "Global tags" : "Yleiset tunnisteet", + "Collaborative tags" : "Yhteistyölliset tunnisteet", "The object type is not specified." : "The object type is not specified.", "Enter new" : "Kirjoita uusi", "Add" : "Lisää", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 9d3062460f4..58f2edb8402 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekunniksi. Suosittelemme lisäturvan vuoksi ottamaan HSTS:n käyttöön <a href=\"{docUrl}\">turvallisuusohjeiden</a> mukaisesti.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.", "Shared" : "Jaettu", "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Poista", "Rename" : "Nimeä uudelleen", - "Global tags" : "Yleiset tunnisteet", + "Collaborative tags" : "Yhteistyölliset tunnisteet", "The object type is not specified." : "The object type is not specified.", "Enter new" : "Kirjoita uusi", "Add" : "Lisää", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 274b0f9b24e..15ff13d1b1d 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -184,7 +184,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Supprimer", "Rename" : "Renommer", - "Global tags" : "Étiquettes globales", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 71797c87d08..55d603f9b9f 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -182,7 +182,6 @@ "({scope})" : "({scope})", "Delete" : "Supprimer", "Rename" : "Renommer", - "Global tags" : "Étiquettes globales", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", diff --git a/core/l10n/he.js b/core/l10n/he.js index d51298de6a5..9a4dca6db4b 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "שגיאה אירעה בזמן בדיקת התקנת השרת", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "כנראה וניתן לגשת אל תיקיית data והקבצים שלך מהאינטרנט. קובץ .htaccess אינו עובד. אנו ממליצים בכל תוקף שתגדיר את השרת בצורה כזאת שלא ניתן יהיה לגשת לתיקיית ה- data או להעביר את תיקיית ה- dta מחוץ לנתיב המסמכים של שרת האינטרנט.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "כותרת ה- HTTP \"{header}\" אינה מוגדרת להיות שווה ל- \"{expected}\". הדבר מהווה פוטנציאל סיכון אבטחה או פגיעה בפרטיות ואנו ממליצים לתקן את הגדרה זו.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "כותרת HTTP \"Strict-Transport-Security\" אינה מוגדרת לפחות \"{seconds}\" שניות. להגברת האבטחה אנו ממליצים לאפשר HSTS כפי שמוסבר ב- <a href=\"{docUrl}\">טיפים לאבטחה</a> שלנו.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "הנך נכנס לאתר באמצעות פרוטוקול HTTP. אנו ממליצים מאוד להגדיר את השרת לעבוד עם פרוטוקול HTTPS במקום כפי שמוסבר ב- <a href=\"{docUrl}\">טיפים לאבטחה</a> שלנו.", "Shared" : "שותף", "Shared with {recipients}" : "שיתוף עם {recipients}", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "מחיקה", "Rename" : "שינוי שם", - "Global tags" : "תגיות גלובליות", + "Collaborative tags" : "תגיות שיתופיות", "The object type is not specified." : "סוג הפריט לא צוין.", "Enter new" : "הכנסת חדש", "Add" : "הוספה", diff --git a/core/l10n/he.json b/core/l10n/he.json index 9b1e2ab8367..0cc3a80da20 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "שגיאה אירעה בזמן בדיקת התקנת השרת", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "כנראה וניתן לגשת אל תיקיית data והקבצים שלך מהאינטרנט. קובץ .htaccess אינו עובד. אנו ממליצים בכל תוקף שתגדיר את השרת בצורה כזאת שלא ניתן יהיה לגשת לתיקיית ה- data או להעביר את תיקיית ה- dta מחוץ לנתיב המסמכים של שרת האינטרנט.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "כותרת ה- HTTP \"{header}\" אינה מוגדרת להיות שווה ל- \"{expected}\". הדבר מהווה פוטנציאל סיכון אבטחה או פגיעה בפרטיות ואנו ממליצים לתקן את הגדרה זו.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "כותרת HTTP \"Strict-Transport-Security\" אינה מוגדרת לפחות \"{seconds}\" שניות. להגברת האבטחה אנו ממליצים לאפשר HSTS כפי שמוסבר ב- <a href=\"{docUrl}\">טיפים לאבטחה</a> שלנו.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "הנך נכנס לאתר באמצעות פרוטוקול HTTP. אנו ממליצים מאוד להגדיר את השרת לעבוד עם פרוטוקול HTTPS במקום כפי שמוסבר ב- <a href=\"{docUrl}\">טיפים לאבטחה</a> שלנו.", "Shared" : "שותף", "Shared with {recipients}" : "שיתוף עם {recipients}", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "מחיקה", "Rename" : "שינוי שם", - "Global tags" : "תגיות גלובליות", + "Collaborative tags" : "תגיות שיתופיות", "The object type is not specified." : "סוג הפריט לא צוין.", "Enter new" : "הכנסת חדש", "Add" : "הוספה", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index 2687483fd67..305fd814052 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -173,7 +173,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Törlés", "Rename" : "Átnevezés", - "Global tags" : "Globális címke", "The object type is not specified." : "Az objektum típusa nincs megadva.", "Enter new" : "Új beírása", "Add" : "Hozzáadás", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index 63df19c5cf5..9c6818ca349 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -171,7 +171,6 @@ "({scope})" : "({scope})", "Delete" : "Törlés", "Rename" : "Átnevezés", - "Global tags" : "Globális címke", "The object type is not specified." : "Az objektum típusa nincs megadva.", "Enter new" : "Új beírása", "Add" : "Hozzáadás", diff --git a/core/l10n/is.js b/core/l10n/is.js index df38b2f47f6..40388ee163e 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -182,7 +182,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Eyða", "Rename" : "Endurnefna", - "Global tags" : "Almenn merki", "The object type is not specified." : "Tegund hlutar ekki tilgreind", "Enter new" : "Sláðu inn nýtt", "Add" : "Bæta við", diff --git a/core/l10n/is.json b/core/l10n/is.json index e6b8b6aee3c..cef73059881 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -180,7 +180,6 @@ "({scope})" : "({scope})", "Delete" : "Eyða", "Rename" : "Endurnefna", - "Global tags" : "Almenn merki", "The object type is not specified." : "Tegund hlutar ekki tilgreind", "Enter new" : "Sláðu inn nýtt", "Add" : "Bæta við", diff --git a/core/l10n/it.js b/core/l10n/it.js index e8f605a8421..c5abb478002 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore di almeno \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sei connesso a questo sito tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere invece l'utilizzo del protocollo HTTPS, come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.", "Shared" : "Condiviso", "Shared with {recipients}" : "Condiviso con {recipients}", @@ -178,13 +179,13 @@ OC.L10N.register( "Error removing share" : "Errore durante la rimozione della condivisione", "Warning" : "Avviso", "Error while sending notification" : "Errore durante l'invio della notifica", - "Non-existing tag #{tag}" : "Tag #{tag} inesistente", + "Non-existing tag #{tag}" : "Etichetta #{tag} inesistente", "not assignable" : "non assegnabile", "invisible" : "invisibile", "({scope})" : "({scope})", "Delete" : "Elimina", "Rename" : "Rinomina", - "Global tags" : "Tag globali", + "Collaborative tags" : "Etichette collaborative", "The object type is not specified." : "Il tipo di oggetto non è specificato.", "Enter new" : "Inserisci nuovo", "Add" : "Aggiungi", diff --git a/core/l10n/it.json b/core/l10n/it.json index 600240a139b..a8a463449c9 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore di almeno \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sei connesso a questo sito tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere invece l'utilizzo del protocollo HTTPS, come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.", "Shared" : "Condiviso", "Shared with {recipients}" : "Condiviso con {recipients}", @@ -176,13 +177,13 @@ "Error removing share" : "Errore durante la rimozione della condivisione", "Warning" : "Avviso", "Error while sending notification" : "Errore durante l'invio della notifica", - "Non-existing tag #{tag}" : "Tag #{tag} inesistente", + "Non-existing tag #{tag}" : "Etichetta #{tag} inesistente", "not assignable" : "non assegnabile", "invisible" : "invisibile", "({scope})" : "({scope})", "Delete" : "Elimina", "Rename" : "Rinomina", - "Global tags" : "Tag globali", + "Collaborative tags" : "Etichette collaborative", "The object type is not specified." : "Il tipo di oggetto non è specificato.", "Enter new" : "Inserisci nuovo", "Add" : "Aggiungi", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 018425888dc..fb20050bb7e 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">セキュリティのコツ</a>を参照して、HSTS を有効にすることをおすすめします。", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP経由でアクセスしています。<a href=\"{docUrl}\">security tips</a>を参照して、代わりにHTTPSを使用するようサーバーを設定することを強くおすすめします。 instead as described in our .", "Shared" : "共有中", "Shared with {recipients}" : "{recipients} と共有", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "削除", "Rename" : "名前の変更", - "Global tags" : "グローバルタグ", + "Collaborative tags" : "コラボタグ", "The object type is not specified." : "オブジェクトタイプが指定されていません。", "Enter new" : "新規に入力", "Add" : "追加", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 2282e805ba0..72e81c3d195 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">セキュリティのコツ</a>を参照して、HSTS を有効にすることをおすすめします。", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP経由でアクセスしています。<a href=\"{docUrl}\">security tips</a>を参照して、代わりにHTTPSを使用するようサーバーを設定することを強くおすすめします。 instead as described in our .", "Shared" : "共有中", "Shared with {recipients}" : "{recipients} と共有", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "削除", "Rename" : "名前の変更", - "Global tags" : "グローバルタグ", + "Collaborative tags" : "コラボタグ", "The object type is not specified." : "オブジェクトタイプが指定されていません。", "Enter new" : "新規に入力", "Add" : "追加", diff --git a/core/l10n/mk.js b/core/l10n/mk.js index 0b23329eff2..5f66c0cfa8d 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -143,6 +143,8 @@ OC.L10N.register( "Share with users or groups …" : "Сподели со корисници или групи ...", "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...", "Warning" : "Предупредување", + "not assignable" : "не може да се додаде", + "invisible" : "невидлив", "Delete" : "Избриши", "Rename" : "Преименувај", "The object type is not specified." : "Не е специфициран типот на објект.", @@ -154,6 +156,7 @@ OC.L10N.register( "Hello world!" : "Здраво свету!", "sunny" : "сончево", "Hello {name}" : "Здраво {name}", + "_download %n file_::_download %n files_" : ["преземи %n датотеки","преземи %n датотеки"], "An error occurred." : "Се случи грешка", "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "Personal" : "Лично", @@ -173,11 +176,18 @@ OC.L10N.register( "Cheers!" : "Поздрав!", "Internal Server Error" : "Интерна серверска грешка", "Technical details" : "Технички детали", + "Type: %s" : "Тип: %s", + "Code: %s" : "Код: %s", + "Message: %s" : "Порака: %s", + "File: %s" : "Датотека: %s", + "Line: %s" : "Линија: %s", + "Security warning" : "Безбедносно предупредување", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", "Username" : "Корисничко име", "Data folder" : "Фолдер со податоци", "Configure the database" : "Конфигурирај ја базата", + "Only %s is available." : "Само %s е достапно.", "Database user" : "Корисник на база", "Database password" : "Лозинка на база", "Database name" : "Име на база", @@ -205,6 +215,7 @@ OC.L10N.register( "Reset password" : "Ресетирај лозинка", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", "Thank you for your patience." : "Благодариме на вашето трпение.", - "These apps will be updated:" : "Следните апликации чќе бидат надградени:" + "These apps will be updated:" : "Следните апликации чќе бидат надградени:", + "Start update" : "Започни ја надградбата" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 1fec5b4d9c7..2dceeb1fe5f 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -141,6 +141,8 @@ "Share with users or groups …" : "Сподели со корисници или групи ...", "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...", "Warning" : "Предупредување", + "not assignable" : "не може да се додаде", + "invisible" : "невидлив", "Delete" : "Избриши", "Rename" : "Преименувај", "The object type is not specified." : "Не е специфициран типот на објект.", @@ -152,6 +154,7 @@ "Hello world!" : "Здраво свету!", "sunny" : "сончево", "Hello {name}" : "Здраво {name}", + "_download %n file_::_download %n files_" : ["преземи %n датотеки","преземи %n датотеки"], "An error occurred." : "Се случи грешка", "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "Personal" : "Лично", @@ -171,11 +174,18 @@ "Cheers!" : "Поздрав!", "Internal Server Error" : "Интерна серверска грешка", "Technical details" : "Технички детали", + "Type: %s" : "Тип: %s", + "Code: %s" : "Код: %s", + "Message: %s" : "Порака: %s", + "File: %s" : "Датотека: %s", + "Line: %s" : "Линија: %s", + "Security warning" : "Безбедносно предупредување", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", "Username" : "Корисничко име", "Data folder" : "Фолдер со податоци", "Configure the database" : "Конфигурирај ја базата", + "Only %s is available." : "Само %s е достапно.", "Database user" : "Корисник на база", "Database password" : "Лозинка на база", "Database name" : "Име на база", @@ -203,6 +213,7 @@ "Reset password" : "Ресетирај лозинка", "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", "Thank you for your patience." : "Благодариме на вашето трпение.", - "These apps will be updated:" : "Следните апликации чќе бидат надградени:" + "These apps will be updated:" : "Следните апликации чќе бидат надградени:", + "Start update" : "Започни ја надградбата" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index e9d124e3c60..f013409ecfe 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du aksesserer denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", "Shared" : "Delt", "Shared with {recipients}" : "Delt med {recipients}", @@ -184,7 +185,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Slett", "Rename" : "Gi nytt navn", - "Global tags" : "Globale merkelapper", "The object type is not specified." : "Objekttypen er ikke spesifisert.", "Enter new" : "Oppgi ny", "Add" : "Legg til", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index d9e9e977208..929f89a4afe 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du aksesserer denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.", "Shared" : "Delt", "Shared with {recipients}" : "Delt med {recipients}", @@ -182,7 +183,6 @@ "({scope})" : "({scope})", "Delete" : "Slett", "Rename" : "Gi nytt navn", - "Global tags" : "Globale merkelapper", "The object type is not specified." : "Objekttypen er ikke spesifisert.", "Enter new" : "Oppgi ny", "Add" : "Legg til", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 38658839b2d..c96c087d5fd 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Gedeeld", "Shared with {recipients}" : "Gedeeld met {recipients}", @@ -184,7 +185,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Verwijder", "Rename" : "Naam wijzigen", - "Global tags" : "Globale tags", "The object type is not specified." : "Het object type is niet gespecificeerd.", "Enter new" : "Opgeven nieuw", "Add" : "Toevoegen", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 85adc648c37..056b0697602 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Gedeeld", "Shared with {recipients}" : "Gedeeld met {recipients}", @@ -182,7 +183,6 @@ "({scope})" : "({scope})", "Delete" : "Verwijder", "Rename" : "Naam wijzigen", - "Global tags" : "Globale tags", "The object type is not specified." : "Het object type is niet gespecificeerd.", "Enter new" : "Opgeven nieuw", "Add" : "Toevoegen", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index c2c7a37c1ed..3a8aaf429ee 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{seconds}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Compartilhado", "Shared with {recipients}" : "Compartilhado com {recipients}", @@ -184,7 +185,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Eliminar", "Rename" : "Renomear", - "Global tags" : "Etiquetas Globais", "The object type is not specified." : "O tipo de objeto não foi especificado.", "Enter new" : "Entrar uma nova", "Add" : "Adicionar", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index f26041a82cd..968bb3f3fd4 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{seconds}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Compartilhado", "Shared with {recipients}" : "Compartilhado com {recipients}", @@ -182,7 +183,6 @@ "({scope})" : "({scope})", "Delete" : "Eliminar", "Rename" : "Renomear", - "Global tags" : "Etiquetas Globais", "The object type is not specified." : "O tipo de objeto não foi especificado.", "Enter new" : "Entrar uma nova", "Add" : "Adicionar", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index 40db9b1a643..e40a01e6afc 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho HTTP \"Strict-Transport-Security\" não está configurado para um mínimo de \"{seconds}\" segundos. Para uma segurança melhorada recomendados a ativação do HSTS como descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está a aceder a este site via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS, em vez do que está descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Partilhado", "Shared with {recipients}" : "Partilhado com {recipients}", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Apagar", "Rename" : "Renomear", - "Global tags" : "Etiquetas gerais", + "Collaborative tags" : "Etiquetas colaborativas", "The object type is not specified." : "O tipo de objeto não está especificado.", "Enter new" : "Introduza novo", "Add" : "Adicionar", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index c341bcbfbf3..a5f3b8aef77 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho HTTP \"Strict-Transport-Security\" não está configurado para um mínimo de \"{seconds}\" segundos. Para uma segurança melhorada recomendados a ativação do HSTS como descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está a aceder a este site via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS, em vez do que está descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Partilhado", "Shared with {recipients}" : "Partilhado com {recipients}", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Apagar", "Rename" : "Renomear", - "Global tags" : "Etiquetas gerais", + "Collaborative tags" : "Etiquetas colaborativas", "The object type is not specified." : "O tipo de objeto não está especificado.", "Enter new" : "Introduza novo", "Add" : "Adicionar", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 4a4c575f64e..3e96f1275b6 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -184,7 +184,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Удалить", "Rename" : "Переименовать", - "Global tags" : "Глобальные теги", "The object type is not specified." : "Тип объекта не указан", "Enter new" : "Ввести новое", "Add" : "Добавить", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index aa02ab2730a..b3534d4fc6e 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -182,7 +182,6 @@ "({scope})" : "({scope})", "Delete" : "Удалить", "Rename" : "Переименовать", - "Global tags" : "Глобальные теги", "The object type is not specified." : "Тип объекта не указан", "Enter new" : "Ввести новое", "Add" : "Добавить", diff --git a/core/l10n/sq.js b/core/l10n/sq.js index e86e2985227..01359e4d6dd 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Drejtoria juaj e të dhënave dhe kartelat tuaja ka shumë mundësi të jenë të arritshme që nga interneti. Kartela .htaccess s’funksionon. Këshillojmë me forcë që ta formësoni shërbyesin tuaj web në një mënyrë që drejtoria e të dhënave të mos lejojë më hyrje, ose ta zhvendosni drejtorinë e të dhënave jashtë rrënjës së dokumenteve të shërbyesit web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Kryet HTTP \"{header}\" s’është formësuar të jetë i njëjtë me \"{expected}\". Ky është një rrezik potencial sigurie dhe privatësie dhe këshillojmë të ndreqet ky rregullim.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Kryet HTTP \"Strict-Transport-Security\" s’është formësuar të paktën \"{seconds}\". Për siguri të thelluar këshillojmë aktivizimin e HSTS-së, siç përshkruhet te <a href=\"{docUrl}\">këshillat tona mbi sigurinë</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Po e përdorni këtë sajt përmes HTTP-je. Këshillojmë me forcë ta formësoni shërbyesin tuaj të kërkojë medoemos përdorimin e HTTPS-së, siç përshkruhet te <a href=\"{docUrl}\">këshillat tona mbi sigurinë</a>.", "Shared" : "Ndarë", "Shared with {recipients}" : "Ndarë me {recipients}", @@ -184,7 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Fshije", "Rename" : "Riemërtoje", - "Global tags" : "Etiketa globale", + "Collaborative tags" : "Etiketa bashkëpunimi", "The object type is not specified." : "S’është specifikuar lloji i objektit.", "Enter new" : "Jep të ri", "Add" : "Shtoni", diff --git a/core/l10n/sq.json b/core/l10n/sq.json index f7419ea1b42..aa5d502a95b 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Drejtoria juaj e të dhënave dhe kartelat tuaja ka shumë mundësi të jenë të arritshme që nga interneti. Kartela .htaccess s’funksionon. Këshillojmë me forcë që ta formësoni shërbyesin tuaj web në një mënyrë që drejtoria e të dhënave të mos lejojë më hyrje, ose ta zhvendosni drejtorinë e të dhënave jashtë rrënjës së dokumenteve të shërbyesit web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Kryet HTTP \"{header}\" s’është formësuar të jetë i njëjtë me \"{expected}\". Ky është një rrezik potencial sigurie dhe privatësie dhe këshillojmë të ndreqet ky rregullim.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Kryet HTTP \"Strict-Transport-Security\" s’është formësuar të paktën \"{seconds}\". Për siguri të thelluar këshillojmë aktivizimin e HSTS-së, siç përshkruhet te <a href=\"{docUrl}\">këshillat tona mbi sigurinë</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Po e përdorni këtë sajt përmes HTTP-je. Këshillojmë me forcë ta formësoni shërbyesin tuaj të kërkojë medoemos përdorimin e HTTPS-së, siç përshkruhet te <a href=\"{docUrl}\">këshillat tona mbi sigurinë</a>.", "Shared" : "Ndarë", "Shared with {recipients}" : "Ndarë me {recipients}", @@ -182,7 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Fshije", "Rename" : "Riemërtoje", - "Global tags" : "Etiketa globale", + "Collaborative tags" : "Etiketa bashkëpunimi", "The object type is not specified." : "S’është specifikuar lloji i objektit.", "Enter new" : "Jep të ri", "Add" : "Shtoni", diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 456ed5e441a..fb9005d526d 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -180,7 +180,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "ลบ", "Rename" : "เปลี่ยนชื่อ", - "Global tags" : "แท็กทั่วไป", "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Enter new" : "ใส่ข้อมูลใหม่", "Add" : "เพิ่ม", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 7e15c3cd590..38dcbee715a 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -178,7 +178,6 @@ "({scope})" : "({scope})", "Delete" : "ลบ", "Rename" : "เปลี่ยนชื่อ", - "Global tags" : "แท็กทั่วไป", "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Enter new" : "ใส่ข้อมูลใหม่", "Add" : "เพิ่ม", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index 09f875e1456..1e0600e7996 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -181,7 +181,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Sil", "Rename" : "Yeniden adlandır", - "Global tags" : "Genel etiketler", "The object type is not specified." : "Nesne türü belirtilmemiş.", "Enter new" : "Yeni girin", "Add" : "Ekle", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index f62fdd0c56c..36e12f3176b 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -179,7 +179,6 @@ "({scope})" : "({scope})", "Delete" : "Sil", "Rename" : "Yeniden adlandır", - "Global tags" : "Genel etiketler", "The object type is not specified." : "Nesne türü belirtilmemiş.", "Enter new" : "Yeni girin", "Add" : "Ekle", diff --git a/core/l10n/uk.js b/core/l10n/uk.js index 66af883c9bf..60594fbf889 100644 --- a/core/l10n/uk.js +++ b/core/l10n/uk.js @@ -6,19 +6,25 @@ OC.L10N.register( "Turned on maintenance mode" : "Увімкнено режим технічного обслуговування", "Turned off maintenance mode" : "Вимкнено режим технічного обслуговування", "Maintenance mode is kept active" : "Режим обслуговування залишається активним", + "Updating database schema" : "Оновлення схеми бази даних", "Updated database" : "Базу даних оновлено", "Checked database schema update" : "Перевірено оновлення схеми бази даних", + "Checking updates of apps" : "Перевірка оновлень додатків", "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків", "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s", "Repair warning: " : "Попередження відновлення:", "Repair error: " : "Помилка відновлення:", + "Starting code integrity check" : "Початок перевірки цілісності коду", + "Finished code integrity check" : "Завершено перевірку цілісності коду", "Following apps have been disabled: %s" : "Наступні додатки були вимкнені: %s", "Already up to date" : "Актуально", + "Please select a file." : "Будь ласка, оберіть файл.", "File is too big" : "Файл занадто великий", "Invalid file provided" : "Надано невірний файл", "No image or file provided" : "Зображення або файлу не надано", "Unknown filetype" : "Невідомий тип файлу", "Invalid image" : "Невірне зображення", + "An error occurred. Please contact your admin." : "Виникла помилка. Будь ласка, зв'яжіться з вашим адміністратором.", "No temporary profile picture available, try again" : "Тимчасове зображення профілю недоступне, спробуйте ще раз", "No crop data provided" : "Не вказана інформація про кадрування", "No valid crop data provided" : "Не вказані коректні дані про кадрування", @@ -142,13 +148,16 @@ OC.L10N.register( "change" : "змінити", "delete" : "видалити", "access control" : "контроль доступу", + "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", + "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", "Share with users or groups …" : "Поширити серед користувачів або груп ...", "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...", "Warning" : "Попередження", "Error while sending notification" : "Помилка при надсиланні повідомлення", + "({scope})" : "({scope})", "Delete" : "Видалити", "Rename" : "Перейменувати", "The object type is not specified." : "Не визначено тип об'єкту.", @@ -164,6 +173,7 @@ OC.L10N.register( "Hello {name}" : "Привіт {name}", "_download %n file_::_download %n files_" : ["завантаження %n файлу","завантаження %n файлів","завантаження %n файлів"], "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.", + "An error occurred." : "Виникла помилка.", "Please reload the page." : "Будь ласка, перезавантажте сторінку.", "The update was unsuccessful. " : "Оновлення завершилось невдачею.", "The update was successful. There were warnings." : "Оновлення виконалось успішно, але були попередження.", @@ -237,6 +247,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", + "Wrong password." : "Невірний пароль.", "Alternative Logins" : "Альтернативні імена користувача", "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}", "New password" : "Новий пароль", diff --git a/core/l10n/uk.json b/core/l10n/uk.json index 4684f90e173..2f9f5d5e269 100644 --- a/core/l10n/uk.json +++ b/core/l10n/uk.json @@ -4,19 +4,25 @@ "Turned on maintenance mode" : "Увімкнено режим технічного обслуговування", "Turned off maintenance mode" : "Вимкнено режим технічного обслуговування", "Maintenance mode is kept active" : "Режим обслуговування залишається активним", + "Updating database schema" : "Оновлення схеми бази даних", "Updated database" : "Базу даних оновлено", "Checked database schema update" : "Перевірено оновлення схеми бази даних", + "Checking updates of apps" : "Перевірка оновлень додатків", "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків", "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s", "Repair warning: " : "Попередження відновлення:", "Repair error: " : "Помилка відновлення:", + "Starting code integrity check" : "Початок перевірки цілісності коду", + "Finished code integrity check" : "Завершено перевірку цілісності коду", "Following apps have been disabled: %s" : "Наступні додатки були вимкнені: %s", "Already up to date" : "Актуально", + "Please select a file." : "Будь ласка, оберіть файл.", "File is too big" : "Файл занадто великий", "Invalid file provided" : "Надано невірний файл", "No image or file provided" : "Зображення або файлу не надано", "Unknown filetype" : "Невідомий тип файлу", "Invalid image" : "Невірне зображення", + "An error occurred. Please contact your admin." : "Виникла помилка. Будь ласка, зв'яжіться з вашим адміністратором.", "No temporary profile picture available, try again" : "Тимчасове зображення профілю недоступне, спробуйте ще раз", "No crop data provided" : "Не вказана інформація про кадрування", "No valid crop data provided" : "Не вказані коректні дані про кадрування", @@ -140,13 +146,16 @@ "change" : "змінити", "delete" : "видалити", "access control" : "контроль доступу", + "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", + "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", "Share with users or groups …" : "Поширити серед користувачів або груп ...", "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...", "Warning" : "Попередження", "Error while sending notification" : "Помилка при надсиланні повідомлення", + "({scope})" : "({scope})", "Delete" : "Видалити", "Rename" : "Перейменувати", "The object type is not specified." : "Не визначено тип об'єкту.", @@ -162,6 +171,7 @@ "Hello {name}" : "Привіт {name}", "_download %n file_::_download %n files_" : ["завантаження %n файлу","завантаження %n файлів","завантаження %n файлів"], "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.", + "An error occurred." : "Виникла помилка.", "Please reload the page." : "Будь ласка, перезавантажте сторінку.", "The update was unsuccessful. " : "Оновлення завершилось невдачею.", "The update was successful. There were warnings." : "Оновлення виконалось успішно, але були попередження.", @@ -235,6 +245,7 @@ "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", + "Wrong password." : "Невірний пароль.", "Alternative Logins" : "Альтернативні імена користувача", "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}", "New password" : "Новий пароль", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 2a8e9c19f8b..15dd1090e2f 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -16,6 +16,10 @@ OC.L10N.register( "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", + "Set log level to debug" : "设置日志级别为 调试", + "Reset log level" : "重设日志级别", + "Starting code integrity check" : "开始代码完整性检查", + "Finished code integrity check" : "代码完整性检查完成", "%s (3rdparty)" : "%s (第三方)", "%s (incompatible)" : "%s (不兼容)", "Following apps have been disabled: %s" : "下列应用已经被禁用：%s", @@ -34,6 +38,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码", "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期", "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。", "%s password reset" : "重置 %s 的密码", "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。", "Sunday" : "星期日", @@ -81,8 +86,10 @@ OC.L10N.register( "Oct." : "十月", "Nov." : "十一月", "Dec." : "十二月", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>", "Settings" : "设置", "Saving..." : "保存中...", + "Dismiss" : "忽略", "seconds ago" : "几秒前", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？", @@ -113,6 +120,7 @@ OC.L10N.register( "Strong password" : "强密码", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" href=\"{docLink}\">文档</a> 。", "Error occurred while checking server setup" : "当检查服务器启动时出错", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。", @@ -170,7 +178,6 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "删除", "Rename" : "重命名", - "Global tags" : "全局标签", "The object type is not specified." : "未指定对象类型。", "Enter new" : "输入新...", "Add" : "增加", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index eff826383d4..cc75e35fd9e 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -14,6 +14,10 @@ "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s", "Repair warning: " : "修复警告：", "Repair error: " : "修复错误：", + "Set log level to debug" : "设置日志级别为 调试", + "Reset log level" : "重设日志级别", + "Starting code integrity check" : "开始代码完整性检查", + "Finished code integrity check" : "代码完整性检查完成", "%s (3rdparty)" : "%s (第三方)", "%s (incompatible)" : "%s (不兼容)", "Following apps have been disabled: %s" : "下列应用已经被禁用：%s", @@ -32,6 +36,7 @@ "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码", "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期", "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。", "%s password reset" : "重置 %s 的密码", "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。", "Sunday" : "星期日", @@ -79,8 +84,10 @@ "Oct." : "十月", "Nov." : "十一月", "Dec." : "十二月", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>", "Settings" : "设置", "Saving..." : "保存中...", + "Dismiss" : "忽略", "seconds ago" : "几秒前", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？", @@ -111,6 +118,7 @@ "Strong password" : "强密码", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" href=\"{docLink}\">文档</a> 。", "Error occurred while checking server setup" : "当检查服务器启动时出错", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。", @@ -168,7 +176,6 @@ "({scope})" : "({scope})", "Delete" : "删除", "Rename" : "重命名", - "Global tags" : "全局标签", "The object type is not specified." : "未指定对象类型。", "Enter new" : "输入新...", "Add" : "增加", diff --git a/db_structure.xml b/db_structure.xml index b1242171127..99541a4f901 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -1541,8 +1541,7 @@ <notnull>true</notnull> <length>64</length> </field> -<!-- - TODO: finalize indexes when all queries are done + <index> <name>comments_parent_id_index</name> <unique>false</unique> @@ -1553,15 +1552,11 @@ </index> <index> - <name>comments_actor_index</name> + <name>comments_topmost_parent_id_idx</name> <unique>false</unique> <field> - <name>actor_type</name> - <sorting>ascending</sorting> - </field> - <field> - <name>actor_id</name> - <sorting>ascending</sorting> + <name>topmost_parent_id</name> + <sorting>descending</sorting> </field> </index> @@ -1581,7 +1576,19 @@ <sorting>descending</sorting> </field> </index> ---> + + <index> + <name>comments_actor_index</name> + <unique>false</unique> + <field> + <name>actor_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>actor_id</name> + <sorting>ascending</sorting> + </field> + </index> </declaration> @@ -1626,6 +1633,36 @@ <length>64</length> </field> + <index> + <name>comments_marker_object_index</name> + <unique>false</unique> + <field> + <name>object_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>object_id</name> + <sorting>ascending</sorting> + </field> + </index> + + <index> + <name>comments_marker_index</name> + <unique>true</unique> + <field> + <name>user_id</name> + <sorting>descending</sorting> + </field> + <field> + <name>object_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>object_id</name> + <sorting>ascending</sorting> + </field> + </index> + </declaration> </table> diff --git a/lib/l10n/es.js b/lib/l10n/es.js index e0ade5c7b5d..75b36ab32ef 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -60,6 +60,7 @@ OC.L10N.register( "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", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "La App no se puede instalar debido a que la versión de info.xml no es la misma que la versión reportada por 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, recarge la página.", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index d77247e08a0..2affeef676f 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -58,6 +58,7 @@ "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", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "La App no se puede instalar debido a que la versión de info.xml no es la misma que la versión reportada por 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, recarge la página.", diff --git a/lib/l10n/is.js b/lib/l10n/is.js index d2c3602e070..490f6dda4c3 100644 --- a/lib/l10n/is.js +++ b/lib/l10n/is.js @@ -17,6 +17,8 @@ OC.L10N.register( "Authentication error" : "Villa við auðkenningu", "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.", "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\"", - "Apps" : "Forrit" + "Apps" : "Forrit", + "A valid username must be provided" : "Skráðu inn gilt notandanafn", + "A valid password must be provided" : "Skráðu inn gilt lykilorð" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/lib/l10n/is.json b/lib/l10n/is.json index 100409a868b..a44b0f74512 100644 --- a/lib/l10n/is.json +++ b/lib/l10n/is.json @@ -15,6 +15,8 @@ "Authentication error" : "Villa við auðkenningu", "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.", "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\"", - "Apps" : "Forrit" + "Apps" : "Forrit", + "A valid username must be provided" : "Skráðu inn gilt notandanafn", + "A valid password must be provided" : "Skráðu inn gilt lykilorð" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js index 0129d33517f..0c7143b15b6 100644 --- a/lib/l10n/mk.js +++ b/lib/l10n/mk.js @@ -1,6 +1,7 @@ OC.L10N.register( "lib", { + "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!", "Help" : "Помош", "Personal" : "Лично", "Users" : "Корисници", diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json index 3a05e15b74b..5b1926c14c6 100644 --- a/lib/l10n/mk.json +++ b/lib/l10n/mk.json @@ -1,4 +1,5 @@ { "translations": { + "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!", "Help" : "Помош", "Personal" : "Лично", "Users" : "Корисници", diff --git a/lib/private/app.php b/lib/private/app.php index 49d4e942a09..787029b653b 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -87,7 +87,7 @@ class OC_App { /** * loads all apps * - * @param array $types + * @param string[] | string | null $types * @return bool * * This function walks through the ownCloud directory and loads all apps diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php index 9b33e947557..d24ecb6f96c 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -197,6 +197,11 @@ class Manager implements IManager { throw new \InvalidArgumentException('Path should be either a file or a folder'); } + // And you can't share your rootfolder + if ($this->rootFolder->getUserFolder($share->getSharedBy())->getPath() === $share->getNode()->getPath()) { + throw new \InvalidArgumentException('You can\'t share your root folder'); + } + // Check if we actually have share permissions if (!$share->getNode()->isShareable()) { $message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getPath()]); @@ -224,7 +229,7 @@ class Manager implements IManager { * Validate if the expiration date fits the system settings * * @param \OCP\Share\IShare $share The share to validate the expiration date of - * @return \OCP\Share\IShare The expiration date or null if $expireDate was null and it is not required + * @return \OCP\Share\IShare The modified share object * @throws GenericShareException * @throws \InvalidArgumentException * @throws \Exception @@ -245,6 +250,20 @@ class Manager implements IManager { } } + // If expiredate is empty set a default one if there is a default + $fullId = null; + try { + $fullId = $share->getFullId(); + } catch (\UnexpectedValueException $e) { + // This is a new share + } + + if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) { + $expirationDate = new \DateTime(); + $expirationDate->setTime(0,0,0); + $expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D')); + } + // If we enforce the expiration date check that is does not exceed if ($this->shareApiLinkDefaultExpireDateEnforced()) { if ($expirationDate === null) { @@ -260,27 +279,13 @@ class Manager implements IManager { } } - // If expiredate is empty set a default one if there is a default - $fullId = null; - try { - $fullId = $share->getFullId(); - } catch (\UnexpectedValueException $e) { - // This is a new share - } - - if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) { - $expirationDate = new \DateTime(); - $expirationDate->setTime(0,0,0); - $expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D')); - } - $accepted = true; $message = ''; \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [ 'expirationDate' => &$expirationDate, 'accepted' => &$accepted, 'message' => &$message, - 'passwordSet' => $share->getPassword() === null, + 'passwordSet' => $share->getPassword() !== null, ]); if (!$accepted) { @@ -289,7 +294,7 @@ class Manager implements IManager { $share->setExpirationDate($expirationDate); - return $expirationDate; + return $share; } /** @@ -1074,7 +1079,8 @@ class Manager implements IManager { * @return bool */ public function shareApiLinkDefaultExpireDateEnforced() { - return $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes'; + return $this->shareApiLinkDefaultExpireDate() && + $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes'; } /** diff --git a/lib/private/updater.php b/lib/private/updater.php index 78457ba3a80..4f74481562b 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -324,9 +324,6 @@ class Updater extends BasicEmitter { if ($this->updateStepEnabled) { $this->doCoreUpgrade(); - // install new shipped apps on upgrade - OC_Installer::installShippedApps(); - // update all shipped apps $disabledApps = $this->checkAppsRequirements(); $this->doAppUpgrade(); @@ -334,6 +331,9 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps($disabledApps); + // install new shipped apps on upgrade + OC_App::loadApps('authentication'); + OC_Installer::installShippedApps(); // post-upgrade repairs $repair = new Repair(Repair::getRepairSteps()); diff --git a/lib/public/comments/commentsevent.php b/lib/public/comments/commentsevent.php index 13110154479..3101c4e6c50 100644 --- a/lib/public/comments/commentsevent.php +++ b/lib/public/comments/commentsevent.php @@ -45,7 +45,7 @@ class CommentsEvent extends Event { * * @param string $event * @param IComment $comment - * @since 9.0.IComment + * @since 9.0.0 */ public function __construct($event, IComment $comment) { $this->event = $event; diff --git a/ocs-provider/provider.php b/ocs-provider/provider.php index 921362b9e50..396b5b23fc6 100644 --- a/ocs-provider/provider.php +++ b/ocs-provider/provider.php @@ -40,7 +40,6 @@ class Provider extends \OCP\AppFramework\Controller { */ public function buildProviderList() { $services = [ - 'version' => 2, 'PRIVATE_DATA' => [ 'version' => 1, 'endpoints' => [ @@ -87,6 +86,9 @@ class Provider extends \OCP\AppFramework\Controller { ]; } - return new \OCP\AppFramework\Http\JSONResponse($services); + return new \OCP\AppFramework\Http\JSONResponse([ + 'version' => 2, + 'services' => $services, + ]); } } diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index ce3488730ac..12401b6e78a 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.", "Update to %s" : "Aktualizovat na %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Je dostupná %n čekající aktualizace aplikace","Jsou dostupné %n čekající aktualizace aplikací","Je dostupných %n čekajících aktualizací aplikací"], "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Silné heslo", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nelze smazat {objName}", + "Error creating group: {message}" : "Chyba vytvoření skupiny: {message}", "A valid group name must be provided" : "Musíte zadat platný název skupiny", "deleted {groupName}" : "smazána {groupName}", "undo" : "vrátit zpět", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "přidat skupinu", "Changing the password will result in data loss, because data recovery is not available for this user" : "Změna hesla bude mít za následek ztrátu dat, protože jejich obnova není pro tohoto uživatele dostupná.", "A valid username must be provided" : "Musíte zadat platné uživatelské jméno", + "Error creating user: {message}" : "Chyba vytvoření uživatele: {message}", "A valid password must be provided" : "Musíte zadat platné heslo", "A valid email must be provided" : "Musíte zadat platný email", "__language_name__" : "Česky", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Je nainstalován %1$s nižší verze než %2$s, z důvodu lepší stability a výkonu doporučujeme aktualizovat na novější verzi %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transakční uzamykání souborů je vypnuto, což může vést k problémům s \"race\" podmínkami. Pro zabránění těmto problémům povolte 'filelocking.enabled' v souboru config.php. Více informací lze nalézt v <a target=\"_blank\" href=\"%s\">dokumentaci ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Dokumentace pro administrátory", "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", + "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejnižší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejvyšší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index d0258b33dd1..194d54be9ad 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.", "Update to %s" : "Aktualizovat na %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Je dostupná %n čekající aktualizace aplikace","Jsou dostupné %n čekající aktualizace aplikací","Je dostupných %n čekajících aktualizací aplikací"], "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -91,6 +92,7 @@ "Strong password" : "Silné heslo", "Groups" : "Skupiny", "Unable to delete {objName}" : "Nelze smazat {objName}", + "Error creating group: {message}" : "Chyba vytvoření skupiny: {message}", "A valid group name must be provided" : "Musíte zadat platný název skupiny", "deleted {groupName}" : "smazána {groupName}", "undo" : "vrátit zpět", @@ -100,6 +102,7 @@ "add group" : "přidat skupinu", "Changing the password will result in data loss, because data recovery is not available for this user" : "Změna hesla bude mít za následek ztrátu dat, protože jejich obnova není pro tohoto uživatele dostupná.", "A valid username must be provided" : "Musíte zadat platné uživatelské jméno", + "Error creating user: {message}" : "Chyba vytvoření uživatele: {message}", "A valid password must be provided" : "Musíte zadat platné heslo", "A valid email must be provided" : "Musíte zadat platný email", "__language_name__" : "Česky", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Je nainstalován %1$s nižší verze než %2$s, z důvodu lepší stability a výkonu doporučujeme aktualizovat na novější verzi %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transakční uzamykání souborů je vypnuto, což může vést k problémům s \"race\" podmínkami. Pro zabránění těmto problémům povolte 'filelocking.enabled' v souboru config.php. Více informací lze nalézt v <a target=\"_blank\" href=\"%s\">dokumentaci ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Dokumentace pro administrátory", "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", + "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejnižší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tato aplikace nemá přiřazenou nejvyšší verzi ownCloud. Toto povede k chybě v ownCloud 11 a vyšším.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index dc27c40ab5c..4b31645a479 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Starkes Passwort", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", + "Error creating group: {message}" : "Fehler beim Erstellen der Gruppe: {message}", "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden", "deleted {groupName}" : "{groupName} gelöscht", "undo" : "rückgängig machen", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "Gruppe hinzufügen", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", + "Error creating user: {message}" : "Fehler beim Anlegen des Benutzers: {message}", "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", "__language_name__" : "Deutsch (Persönlich)", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktiviere 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Dokumentation für Administratoren", "Show description …" : "Beschreibung anzeigen…", "Hide description …" : "Beschreibung ausblenden…", + "This app has an update available." : "Es ist eine Aktualisierung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine minimale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Die App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index b5b33ea9061..8c569efc9ca 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", @@ -91,6 +92,7 @@ "Strong password" : "Starkes Passwort", "Groups" : "Gruppen", "Unable to delete {objName}" : "Löschen von {objName} nicht möglich", + "Error creating group: {message}" : "Fehler beim Erstellen der Gruppe: {message}", "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden", "deleted {groupName}" : "{groupName} gelöscht", "undo" : "rückgängig machen", @@ -100,6 +102,7 @@ "add group" : "Gruppe hinzufügen", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", + "Error creating user: {message}" : "Fehler beim Anlegen des Benutzers: {message}", "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", "__language_name__" : "Deutsch (Persönlich)", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktiviere 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", @@ -206,6 +210,7 @@ "Admin documentation" : "Dokumentation für Administratoren", "Show description …" : "Beschreibung anzeigen…", "Hide description …" : "Beschreibung ausblenden…", + "This app has an update available." : "Es ist eine Aktualisierung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine minimale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Die App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 9304bb1f6ba..8c9dacc1893 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -201,6 +201,7 @@ OC.L10N.register( "Admin documentation" : "Dokumentation für Administratoren", "Show description …" : "Beschreibung anzeigen…", "Hide description …" : "Beschreibung ausblenden…", + "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 20216ddb436..97bff28a782 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -199,6 +199,7 @@ "Admin documentation" : "Dokumentation für Administratoren", "Show description …" : "Beschreibung anzeigen…", "Hide description …" : "Beschreibung ausblenden…", + "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index b332af42cb5..934630f9106 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.", "Update to %s" : "Update to %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["You have %n app update pending","You have %n app updates pending"], "Please wait...." : "Please wait....", "Error while disabling app" : "Error whilst disabling app", "Disable" : "Disable", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Strong password", "Groups" : "Groups", "Unable to delete {objName}" : "Unable to delete {objName}", + "Error creating group: {message}" : "Error creating group: {message}", "A valid group name must be provided" : "A valid group name must be provided", "deleted {groupName}" : "deleted {groupName}", "undo" : "undo", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "add group", "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user", "A valid username must be provided" : "A valid username must be provided", + "Error creating user: {message}" : "Error creating user: {message}", "A valid password must be provided" : "A valid password must be provided", "A valid email must be provided" : "A valid email must be provided", "__language_name__" : "English (British English)", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information.", "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Admin documentation", "Show description …" : "Show description …", "Hide description …" : "Hide description …", + "This app has an update available." : "This app has an update available.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 87fdd5bd188..37903d528d4 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.", "Update to %s" : "Update to %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["You have %n app update pending","You have %n app updates pending"], "Please wait...." : "Please wait....", "Error while disabling app" : "Error whilst disabling app", "Disable" : "Disable", @@ -91,6 +92,7 @@ "Strong password" : "Strong password", "Groups" : "Groups", "Unable to delete {objName}" : "Unable to delete {objName}", + "Error creating group: {message}" : "Error creating group: {message}", "A valid group name must be provided" : "A valid group name must be provided", "deleted {groupName}" : "deleted {groupName}", "undo" : "undo", @@ -100,6 +102,7 @@ "add group" : "add group", "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user", "A valid username must be provided" : "A valid username must be provided", + "Error creating user: {message}" : "Error creating user: {message}", "A valid password must be provided" : "A valid password must be provided", "A valid email must be provided" : "A valid email must be provided", "__language_name__" : "English (British English)", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information.", "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Admin documentation", "Show description …" : "Show description …", "Hide description …" : "Hide description …", + "This app has an update available." : "This app has an update available.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index eddbe9276b2..aaa74f20dce 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Tiene %n actualización de app pendiente","Tiene %n actualizaciones de app pendientes"], "Please wait...." : "Espere, por favor....", "Error while disabling app" : "Error mientras se desactivaba la aplicación", "Disable" : "Desactivar", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Contraseña muy buena", "Groups" : "Grupos", "Unable to delete {objName}" : "No es posible eliminar {objName}", + "Error creating group: {message}" : "Error creando el grupo: {message}", "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ", "deleted {groupName}" : "{groupName} eliminado", "undo" : "deshacer", @@ -102,6 +104,7 @@ OC.L10N.register( "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: {message}" : "Error creando el usuario: {message}", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "A valid email must be provided" : "Se debe brindar una dirección de correo electrónico válida ", "__language_name__" : "Castellano", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "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.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s una versión inferior %2$s está instalada, por razones de estabilidad y rendimiento, se recomienda actualizar a la versión %1$s más reciente .", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta desactivado, esto pruede provocar problemas con \"race conditions\". Activa 'filelocking.enabled' en config.php para evitar estos problemas. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Documentación de administrador", "Show description …" : "Mostrar descripción…", "Hide description …" : "Ocultar descripción…", + "This app has an update available." : "Está app tiene una actualización pendiente.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión mínima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión máxima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index c38fa8c105a..a2d23f026fc 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Tiene %n actualización de app pendiente","Tiene %n actualizaciones de app pendientes"], "Please wait...." : "Espere, por favor....", "Error while disabling app" : "Error mientras se desactivaba la aplicación", "Disable" : "Desactivar", @@ -91,6 +92,7 @@ "Strong password" : "Contraseña muy buena", "Groups" : "Grupos", "Unable to delete {objName}" : "No es posible eliminar {objName}", + "Error creating group: {message}" : "Error creando el grupo: {message}", "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ", "deleted {groupName}" : "{groupName} eliminado", "undo" : "deshacer", @@ -100,6 +102,7 @@ "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: {message}" : "Error creando el usuario: {message}", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "A valid email must be provided" : "Se debe brindar una dirección de correo electrónico válida ", "__language_name__" : "Castellano", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "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.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s una versión inferior %2$s está instalada, por razones de estabilidad y rendimiento, se recomienda actualizar a la versión %1$s más reciente .", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta desactivado, esto pruede provocar problemas con \"race conditions\". Activa 'filelocking.enabled' en config.php para evitar estos problemas. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Documentación de administrador", "Show description …" : "Mostrar descripción…", "Hide description …" : "Ocultar descripción…", + "This app has an update available." : "Está app tiene una actualización pendiente.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión mínima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicación no tiene ninguna versión máxima de ownCloud asignada. Este será un error en ownCloud 11 y posteriores.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 5f13165d69c..0f87c75d68a 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -66,6 +66,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.", "Update to %s" : "Päivitä versioon %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["%n sovelluspäivitys odottaa","%n sovelluspäivitystä odottaa"], "Please wait...." : "Odota hetki...", "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä", "Disable" : "Poista käytöstä", @@ -92,6 +93,7 @@ OC.L10N.register( "Strong password" : "Vahva salasana", "Groups" : "Ryhmät", "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui", + "Error creating group: {message}" : "Virhe ryhmää luotaessa: {message}", "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi", "deleted {groupName}" : "poistettu {groupName}", "undo" : "kumoa", @@ -101,6 +103,7 @@ OC.L10N.register( "add group" : "lisää ryhmä", "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla", "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus", + "Error creating user: {message}" : "Virhe käyttäjää luotaessa: {message}", "A valid password must be provided" : "Anna kelvollinen salasana", "A valid email must be provided" : "Tarvitaan kelvollinen sähköpostiosoite", "__language_name__" : "_kielen_nimi_", @@ -119,6 +122,7 @@ OC.L10N.register( "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.", "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 18d23b0d464..19f964fa583 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -64,6 +64,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.", "Update to %s" : "Päivitä versioon %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["%n sovelluspäivitys odottaa","%n sovelluspäivitystä odottaa"], "Please wait...." : "Odota hetki...", "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä", "Disable" : "Poista käytöstä", @@ -90,6 +91,7 @@ "Strong password" : "Vahva salasana", "Groups" : "Ryhmät", "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui", + "Error creating group: {message}" : "Virhe ryhmää luotaessa: {message}", "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi", "deleted {groupName}" : "poistettu {groupName}", "undo" : "kumoa", @@ -99,6 +101,7 @@ "add group" : "lisää ryhmä", "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla", "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus", + "Error creating user: {message}" : "Virhe käyttäjää luotaessa: {message}", "A valid password must be provided" : "Anna kelvollinen salasana", "A valid email must be provided" : "Tarvitaan kelvollinen sähköpostiosoite", "__language_name__" : "_kielen_nimi_", @@ -117,6 +120,7 @@ "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.", "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 3e29fe0a353..e31af341abd 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -93,6 +93,7 @@ OC.L10N.register( "Strong password" : "Mot de passe de forte sécurité", "Groups" : "Groupes", "Unable to delete {objName}" : "Impossible de supprimer {objName}", + "Error creating group: {message}" : "Erreur lors de la création du groupe : {message}", "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide", "deleted {groupName}" : "{groupName} supprimé", "undo" : "annuler", @@ -208,6 +209,7 @@ OC.L10N.register( "Admin documentation" : "Documentation administrateur", "Show description …" : "Afficher la description...", "Hide description …" : "Masquer la description", + "This app has an update available." : "Cette application a une mise à jour disponible.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud minimale requise. Cela provoquera une erreur dans ownCloud 11+", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud maximale requise. Cela provoquera une erreur dans ownCloud 11+", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index deba98c7e19..e3a0c5e0f4b 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -91,6 +91,7 @@ "Strong password" : "Mot de passe de forte sécurité", "Groups" : "Groupes", "Unable to delete {objName}" : "Impossible de supprimer {objName}", + "Error creating group: {message}" : "Erreur lors de la création du groupe : {message}", "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide", "deleted {groupName}" : "{groupName} supprimé", "undo" : "annuler", @@ -206,6 +207,7 @@ "Admin documentation" : "Documentation administrateur", "Show description …" : "Afficher la description...", "Hide description …" : "Masquer la description", + "This app has an update available." : "Cette application a une mise à jour disponible.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud minimale requise. Cela provoquera une erreur dans ownCloud 11+", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Cette app ne spécifie pas de version d'ownCloud maximale requise. Cela provoquera une erreur dans ownCloud 11+", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", diff --git a/settings/l10n/he.js b/settings/l10n/he.js index d0192d05a0d..a97d3af2816 100644 --- a/settings/l10n/he.js +++ b/settings/l10n/he.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.", "Update to %s" : "עדכון ל- %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["ממתין עבורך %n עדכון יישום","ממתינים עבורך %n עדכוני יישום"], "Please wait...." : "נא להמתין…", "Error while disabling app" : "אירעה שגיאה בעת נטרול היישום", "Disable" : "ניטרול", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "סיסמא חזקה", "Groups" : "קבוצות", "Unable to delete {objName}" : "לא ניתן למחיקה {objName}", + "Error creating group: {message}" : "שגיאה ביצירת קבוצה: {message}", "A valid group name must be provided" : "יש לספק שם קבוצה תקני", "deleted {groupName}" : "נמחק {groupName}", "undo" : "ביטול", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "הוספת קבוצה", "Changing the password will result in data loss, because data recovery is not available for this user" : "שינוי הסיסמא יגרום איבוד מידע, וזאת בגלל ששחזור מידע אינו זמין למשתמש זה", "A valid username must be provided" : "יש לספק שם משתמש תקני", + "Error creating user: {message}" : "שגיאה ביצירת משתמש: {message}", "A valid password must be provided" : "יש לספק סיסמא תקנית", "A valid email must be provided" : "יש לספק כתובת דואר אלקטרוני תקנית", "__language_name__" : "עברית", @@ -124,6 +127,7 @@ 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.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "השרת רץ על גבי חלונות של מיקוסופט. אנו ממליצים בחום על לינוקס לחווית משתמש מיטבית.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s מתחת לגרסה %2$s מותקנת, מסיבות יציבות וביצועים אנו ממליצים לעדכן לגרסה חדשה יותר גרסה %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "מודול ה- PHP מסוג 'fileinfo' חסר. אנו ממליצים בחום לאפשר מודול זה כדי לקבל תוצאות מיטביות עם גילוי mime-type.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "נעילת קובץ Transactional מנוטרלת, זה עלול להוביל לבעיות עם race conditions. יש לאפשר 'filelocking.enabled' בקובץ config.php כדי למנוע בעיות אלו. ראו <a target=\"_blank\" href=\"%s\">מסמכים אלו ↗</a> למידע נוסף.", "System locale can not be set to a one which supports UTF-8." : "הגדרות שפה לא יכולות להקבע ככאלה שתומכות ב- UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "תיעוד מנהל", "Show description …" : "הצגת תיאור ...", "Hide description …" : "הסתרת תיאור ...", + "This app has an update available." : "ליישום זה קיים עדכון זמין.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מינמלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מקסימלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.", "This app cannot be installed because the following dependencies are not fulfilled:" : "לא ניתן להתקין את יישום זה כיוון שייחסי התלות הבאים לא התקיימו:", diff --git a/settings/l10n/he.json b/settings/l10n/he.json index e7c07908e18..b7bc85ad2b4 100644 --- a/settings/l10n/he.json +++ b/settings/l10n/he.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.", "Update to %s" : "עדכון ל- %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["ממתין עבורך %n עדכון יישום","ממתינים עבורך %n עדכוני יישום"], "Please wait...." : "נא להמתין…", "Error while disabling app" : "אירעה שגיאה בעת נטרול היישום", "Disable" : "ניטרול", @@ -91,6 +92,7 @@ "Strong password" : "סיסמא חזקה", "Groups" : "קבוצות", "Unable to delete {objName}" : "לא ניתן למחיקה {objName}", + "Error creating group: {message}" : "שגיאה ביצירת קבוצה: {message}", "A valid group name must be provided" : "יש לספק שם קבוצה תקני", "deleted {groupName}" : "נמחק {groupName}", "undo" : "ביטול", @@ -100,6 +102,7 @@ "add group" : "הוספת קבוצה", "Changing the password will result in data loss, because data recovery is not available for this user" : "שינוי הסיסמא יגרום איבוד מידע, וזאת בגלל ששחזור מידע אינו זמין למשתמש זה", "A valid username must be provided" : "יש לספק שם משתמש תקני", + "Error creating user: {message}" : "שגיאה ביצירת משתמש: {message}", "A valid password must be provided" : "יש לספק סיסמא תקנית", "A valid email must be provided" : "יש לספק כתובת דואר אלקטרוני תקנית", "__language_name__" : "עברית", @@ -122,6 +125,7 @@ "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.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "השרת רץ על גבי חלונות של מיקוסופט. אנו ממליצים בחום על לינוקס לחווית משתמש מיטבית.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s מתחת לגרסה %2$s מותקנת, מסיבות יציבות וביצועים אנו ממליצים לעדכן לגרסה חדשה יותר גרסה %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "מודול ה- PHP מסוג 'fileinfo' חסר. אנו ממליצים בחום לאפשר מודול זה כדי לקבל תוצאות מיטביות עם גילוי mime-type.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "נעילת קובץ Transactional מנוטרלת, זה עלול להוביל לבעיות עם race conditions. יש לאפשר 'filelocking.enabled' בקובץ config.php כדי למנוע בעיות אלו. ראו <a target=\"_blank\" href=\"%s\">מסמכים אלו ↗</a> למידע נוסף.", "System locale can not be set to a one which supports UTF-8." : "הגדרות שפה לא יכולות להקבע ככאלה שתומכות ב- UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "תיעוד מנהל", "Show description …" : "הצגת תיאור ...", "Hide description …" : "הסתרת תיאור ...", + "This app has an update available." : "ליישום זה קיים עדכון זמין.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מינמלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "ליישום זה לא הוקצתה גרסה מקסימלית של ownCloud. מצב זה יהיה שגוי בגרסה 11 או מאוחרת יותר של ownCloud.", "This app cannot be installed because the following dependencies are not fulfilled:" : "לא ניתן להתקין את יישום זה כיוון שייחסי התלות הבאים לא התקיימו:", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index 8cdcdae7eb4..d3827344284 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -1,44 +1,188 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", + "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar", + "Sharing" : "Deiling", + "Server-side encryption" : "Dulritun á þjóni", "External Storage" : "Ytri gagnageymsla", + "Cron" : "CRON", + "Email server" : "Póstþjónn", + "Log" : "Annáll", + "Tips & tricks" : "Ábendingar og góð ráð", + "Updates" : "Uppfærslur", + "Couldn't remove app." : "Gat ekki fjarlægt forrit.", "Language changed" : "Tungumáli breytt", "Invalid request" : "Ógild fyrirspurn", "Authentication error" : "Villa við auðkenningu", "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp", - "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s", + "Unable to add user to group %s" : "Ekki tókst að bæta notanda við hópinn %s", "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s", + "Couldn't update app." : "Gat ekki uppfært forrit.", + "Wrong password" : "Rangt lykilorð", + "No user supplied" : "Enginn notandi gefinn", + "Unable to change password" : "Ekki tókst að breyta lykilorði", + "Enabled" : "Virkt", + "Not enabled" : "Óvirkt", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "A problem occurred, please check your log files (Error: %s)" : "Vandamál kom upp, skoðaðu yfir annálana þína (Villa: %s)", + "Migration Completed" : "Yfirfærslu lokið", + "Group already exists." : "Hópur er þegar til.", + "Unable to add group." : "Ekki tókst að bæta hóp við.", + "Unable to delete group." : "Get ekki eytt hópi.", "Saved" : "Vistað", + "test email settings" : "prófa tölvupóststillingar", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)", "Email sent" : "Tölvupóstur sendur", - "Email saved" : "Netfang vistað", + "You need to set your user email before being able to send test emails." : "Þú verður að gefa upp netfangið þitt svo að þú getir sent prófunarpósta.", + "Invalid mail address" : "Ógilt tölvupóstfang", + "A user with that name already exists." : "Nú þegar til notandi með þetta nafn.", + "Unable to create user." : "Gat ekki búið til notanda.", + "Your %s account was created" : "%s notandaaðgangurinn þinn var búinn til", + "Unable to delete user." : "Get ekki eytt notanda.", + "Forbidden" : "Bannað", + "Invalid user" : "Ógildur notandi", + "Unable to change mail address" : "Get ekki breytt tölvupóstfangi", + "Email saved" : "Tölvupóstfang vistað", + "Your full name has been changed." : "Fullu nafni þínu hefur verið breytt.", + "Unable to change full name" : "Get ekki breytt fullu nafni", + "Add trusted domain" : "Bæta við treystu léni", + "Migration started …" : "Yfirfærsla hafin...", + "Sending..." : "Sendi...", + "Official" : "Opinbert", + "Approved" : "Samþykkt", + "Experimental" : "Á tilraunastigi", "All" : "Allt", + "Update to %s" : "Uppfæra í %s", "Please wait...." : "Andartak....", + "Error while disabling app" : "Villa við að afvirkja forrit", "Disable" : "Gera óvirkt", "Enable" : "Virkja", + "Error while enabling app" : "Villa við að virkja forrit", "Updating...." : "Uppfæri...", + "Error while updating app" : "Villa við að uppfæra forrit", "Updated" : "Uppfært", + "Uninstalling ...." : "Tek út uppsetningu ....", + "Error while uninstalling app" : "Villa við að fjarlægja forrit", + "Uninstall" : "Henda út", + "App update" : "Uppfærsla forrits", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", + "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", + "An error occurred: {message}" : "Villa kom upp: {message}", + "Select a profile picture" : "Veldu einkennismynd", "Very weak password" : "Mjög veikt lykilorð", "Weak password" : "Veikt lykilorð", "So-so password" : "Svo-svo lykilorð", "Good password" : "Gott lykilorð", "Strong password" : "Sterkt lykilorð", "Groups" : "Hópar", + "Unable to delete {objName}" : "Get ekki eytt {objName}", + "A valid group name must be provided" : "Skráðu inn gilt heiti á hópi", + "deleted {groupName}" : "eyddi {groupName}", "undo" : "afturkalla", + "no group" : "enginn hópur", "never" : "aldrei", - "__language_name__" : "__nafn_tungumáls__", + "deleted {userName}" : "eyddi {userName}", + "add group" : "bæta við hópi", + "A valid username must be provided" : "Skráðu inn gilt notandanafn", + "A valid password must be provided" : "Skráðu inn gilt lykilorð", + "A valid email must be provided" : "Skráðu inn gilt tölvupóstfang", + "__language_name__" : "Íslenska", + "Personal info" : "Persónulegar upplýsingar", + "Sync clients" : "Samstilla biðlara", + "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)", + "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir", + "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir", + "Errors and fatal issues" : "Villur og alvarlegar aðvaranir", + "Fatal issues only" : "Einungis alvarlegar aðvaranir", "None" : "Ekkert", - "Encryption" : "Dulkóðun", + "Login" : "Innskráning", + "Plain" : "Einfalt", + "SSL" : "SSL", + "TLS" : "TLS", + "All checks passed." : "Stóðst allar prófanir.", + "Open documentation" : "Opna hjálparskjöl", + "Expire after " : "Rennur út eftir ", + "days" : "daga", + "Allow resharing" : "Leyfa endurdeilingu", + "Enable server-side encryption" : "Virkja dulritun á þjóni", + "Enable encryption" : "Virkja dulritun", + "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:", + "Start migration" : "Hefja yfirfærslu", + "This is used for sending out notifications." : "Þetta er notað til að senda út tilkynningar.", + "Send mode" : "Sendihamur", + "Encryption" : "Dulritun", + "From address" : "Frá vistfangi", + "mail" : "póstur", + "Authentication method" : "Auðkenningarmáti", + "Authentication required" : "Auðkenningar krafist", "Server address" : "Host nafn netþjóns", + "Port" : "Gátt", + "Credentials" : "Auðkenni", + "SMTP Username" : "SMTP-notandanafn", + "SMTP Password" : "SMTP-lykilorð", + "Store credentials" : "Geyma auðkenni", + "Test email settings" : "Prófa tölvupóststillingar", + "Send email" : "Senda tölvupóst", + "Download logfile" : "Sækja annál", "More" : "Meira", "Less" : "Minna", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!", + "What to log" : "Hvað á að skrá í annál", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.", + "How to do backups" : "Hvernig á að taka öryggisafrit", + "Advanced monitoring" : "Ítarleg vöktun", + "Performance tuning" : "Fínstilling afkasta", + "Improving the config.php" : "Bæting á config.php skránni", + "Theming" : "Þemu", + "Hardening and security guidance" : "Brynjun og öryggisleiðbeiningar", "Version" : "Útgáfa", - "Cheers!" : "Skál!", + "Developer documentation" : "Skjölun fyrir þróunaraðila", + "Experimental applications ahead" : "Forrit á tilraunastigi fyrst", + "by %s" : "frá %s", + "%s-licensed" : "%s-notkunarleyfi", + "Documentation:" : "Hjálparskjöl:", + "User documentation" : "Hjálparskjöl notenda", + "Admin documentation" : "Hjálparskjöl kerfisstjóra", + "Show description …" : "Birta lýsingu …", + "Hide description …" : "Fela lýsingu …", + "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:", + "Enable only for specific groups" : "Einungis fyrir sérstaka hópa", + "Uninstall App" : "Fjarlægja/Henda út forriti", + "Enable experimental apps" : "Virkja forrit á tilraunastigi", + "SSL Root Certificates" : "SSL-rótarskilríki", + "Common Name" : "Almennt heiti", + "Valid until" : "Gildir til", + "Issued By" : "Gefið út af", + "Valid until %s" : "Gildir til %s", + "Import root certificate" : "Flytja inn rótarskilríki", + "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>" : "Hæ þú,<br><br>bara að láta þig vita að þú átt núna %s aðgang.<br><br>Notandanafnið þitt: %s<br>Tengstu honum: <a href=\"%s\">%s</a><br><br>", + "Cheers!" : "Til hamingju!", + "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hæ þú,\n\nbara að láta þig vita að þú átt núna %s aðgang.\n\nNotandanafnið þitt: %s\nTengstu honum: %s\n\n", + "Administrator documentation" : "Hjálparskjöl stjórnanda", + "Online documentation" : "Handbækur/skjölun á netinu", "Forum" : "Vefspjall", + "Issue tracker" : "Skrásetjari (tracker)", + "Commercial support" : "Gjaldskyld tækniaðstoð", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Þú notar <strong>%s</strong> frá <strong>%s</strong>", + "Profile picture" : "Einkennismynd", + "Upload new" : "Senda inn nýtt", + "Select from Files" : "Veldu skrár", + "Remove image" : "Fjarlægja mynd", + "png or jpg, max. 20 MB" : "png eða jpg, hám. 20 MB", + "Picture provided by original account" : "Mynd frá upprunalegum aðgangi", "Cancel" : "Hætta við", + "Choose as profile picture" : "Veldu sem einkennismynd", + "Full name" : "Fullt nafn", + "No display name set" : "Ekkert birtingarnafn sett", "Email" : "Netfang", "Your email address" : "Netfangið þitt", + "For password recovery and notifications" : "Fyrir tilkynningar og endurheimtingu lykilorðs", + "No email address set" : "Ekkert tölvupóstfang sett", + "You are member of the following groups:" : "Þú ert meðlimur eftirfarandi hópa:", "Password" : "Lykilorð", "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu", "Current password" : "Núverandi lykilorð", @@ -46,11 +190,38 @@ OC.L10N.register( "Change password" : "Breyta lykilorði", "Language" : "Tungumál", "Help translate" : "Hjálpa við þýðingu", - "Username" : "Notendanafn", + "Desktop client" : "Skjáborðsforrit", + "Android app" : "Android-forrit", + "iOS app" : "iOS-forrit", + "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!", + "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur", + "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}ownCloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu.", + "Show storage location" : "Birta staðsetningu gagnageymslu", + "Show last log in" : "Birta síðustu innskráningu", + "Show user backend" : "Birta bakenda notanda", + "Send email to new user" : "Senda tölvupóst til nýs notanda", + "Show email address" : "Birta tölvupóstfang", + "Username" : "Notandanafn", + "E-Mail" : "Tölvupóstfang", "Create" : "Búa til", + "Admin Recovery Password" : "Endurheimtulykilorð kerfisstjóra", + "Add Group" : "Bæta við hópi", "Group" : "Hópur", + "Everyone" : "Allir", + "Admins" : "Kerfisstjórar", + "Default Quota" : "Sjálfgefinn kvóti", + "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Settu inn geymslukvóta (t.d.: \"512 MB\" eða \"12 GB\")", "Unlimited" : "Ótakmarkað", "Other" : "Annað", + "Full Name" : "Fullt nafn", + "Group Admin for" : "Hópstjóri fyrir", + "Quota" : "Kvóti", + "Storage Location" : "Staðsetning gagnageymslu", + "User Backend" : "Bakendi notanda", + "Last Login" : "Síðasta innskráning", + "change full name" : "breyta fullu nafni", + "set new password" : "setja nýtt lykilorð", + "change email address" : "breyta tölvupóstfangi", "Default" : "Sjálfgefið" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/settings/l10n/is.json b/settings/l10n/is.json index d8f33110ec1..21ea332f688 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -1,42 +1,186 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", + "Security & setup warnings" : "Öryggi og aðvaranir vegna uppsetningar", + "Sharing" : "Deiling", + "Server-side encryption" : "Dulritun á þjóni", "External Storage" : "Ytri gagnageymsla", + "Cron" : "CRON", + "Email server" : "Póstþjónn", + "Log" : "Annáll", + "Tips & tricks" : "Ábendingar og góð ráð", + "Updates" : "Uppfærslur", + "Couldn't remove app." : "Gat ekki fjarlægt forrit.", "Language changed" : "Tungumáli breytt", "Invalid request" : "Ógild fyrirspurn", "Authentication error" : "Villa við auðkenningu", "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp", - "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s", + "Unable to add user to group %s" : "Ekki tókst að bæta notanda við hópinn %s", "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s", + "Couldn't update app." : "Gat ekki uppfært forrit.", + "Wrong password" : "Rangt lykilorð", + "No user supplied" : "Enginn notandi gefinn", + "Unable to change password" : "Ekki tókst að breyta lykilorði", + "Enabled" : "Virkt", + "Not enabled" : "Óvirkt", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "A problem occurred, please check your log files (Error: %s)" : "Vandamál kom upp, skoðaðu yfir annálana þína (Villa: %s)", + "Migration Completed" : "Yfirfærslu lokið", + "Group already exists." : "Hópur er þegar til.", + "Unable to add group." : "Ekki tókst að bæta hóp við.", + "Unable to delete group." : "Get ekki eytt hópi.", "Saved" : "Vistað", + "test email settings" : "prófa tölvupóststillingar", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vandamál kom upp við að senda tölvupóst. Farðu yfir stillingarnar þínar. (Villa: %s)", "Email sent" : "Tölvupóstur sendur", - "Email saved" : "Netfang vistað", + "You need to set your user email before being able to send test emails." : "Þú verður að gefa upp netfangið þitt svo að þú getir sent prófunarpósta.", + "Invalid mail address" : "Ógilt tölvupóstfang", + "A user with that name already exists." : "Nú þegar til notandi með þetta nafn.", + "Unable to create user." : "Gat ekki búið til notanda.", + "Your %s account was created" : "%s notandaaðgangurinn þinn var búinn til", + "Unable to delete user." : "Get ekki eytt notanda.", + "Forbidden" : "Bannað", + "Invalid user" : "Ógildur notandi", + "Unable to change mail address" : "Get ekki breytt tölvupóstfangi", + "Email saved" : "Tölvupóstfang vistað", + "Your full name has been changed." : "Fullu nafni þínu hefur verið breytt.", + "Unable to change full name" : "Get ekki breytt fullu nafni", + "Add trusted domain" : "Bæta við treystu léni", + "Migration started …" : "Yfirfærsla hafin...", + "Sending..." : "Sendi...", + "Official" : "Opinbert", + "Approved" : "Samþykkt", + "Experimental" : "Á tilraunastigi", "All" : "Allt", + "Update to %s" : "Uppfæra í %s", "Please wait...." : "Andartak....", + "Error while disabling app" : "Villa við að afvirkja forrit", "Disable" : "Gera óvirkt", "Enable" : "Virkja", + "Error while enabling app" : "Villa við að virkja forrit", "Updating...." : "Uppfæri...", + "Error while updating app" : "Villa við að uppfæra forrit", "Updated" : "Uppfært", + "Uninstalling ...." : "Tek út uppsetningu ....", + "Error while uninstalling app" : "Villa við að fjarlægja forrit", + "Uninstall" : "Henda út", + "App update" : "Uppfærsla forrits", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", + "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", + "An error occurred: {message}" : "Villa kom upp: {message}", + "Select a profile picture" : "Veldu einkennismynd", "Very weak password" : "Mjög veikt lykilorð", "Weak password" : "Veikt lykilorð", "So-so password" : "Svo-svo lykilorð", "Good password" : "Gott lykilorð", "Strong password" : "Sterkt lykilorð", "Groups" : "Hópar", + "Unable to delete {objName}" : "Get ekki eytt {objName}", + "A valid group name must be provided" : "Skráðu inn gilt heiti á hópi", + "deleted {groupName}" : "eyddi {groupName}", "undo" : "afturkalla", + "no group" : "enginn hópur", "never" : "aldrei", - "__language_name__" : "__nafn_tungumáls__", + "deleted {userName}" : "eyddi {userName}", + "add group" : "bæta við hópi", + "A valid username must be provided" : "Skráðu inn gilt notandanafn", + "A valid password must be provided" : "Skráðu inn gilt lykilorð", + "A valid email must be provided" : "Skráðu inn gilt tölvupóstfang", + "__language_name__" : "Íslenska", + "Personal info" : "Persónulegar upplýsingar", + "Sync clients" : "Samstilla biðlara", + "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)", + "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir", + "Warnings, errors and fatal issues" : "Viðvaranir, villur og alvarlegar aðvaranir", + "Errors and fatal issues" : "Villur og alvarlegar aðvaranir", + "Fatal issues only" : "Einungis alvarlegar aðvaranir", "None" : "Ekkert", - "Encryption" : "Dulkóðun", + "Login" : "Innskráning", + "Plain" : "Einfalt", + "SSL" : "SSL", + "TLS" : "TLS", + "All checks passed." : "Stóðst allar prófanir.", + "Open documentation" : "Opna hjálparskjöl", + "Expire after " : "Rennur út eftir ", + "days" : "daga", + "Allow resharing" : "Leyfa endurdeilingu", + "Enable server-side encryption" : "Virkja dulritun á þjóni", + "Enable encryption" : "Virkja dulritun", + "Select default encryption module:" : "Veldu sjálfgefna dulritunareiningu:", + "Start migration" : "Hefja yfirfærslu", + "This is used for sending out notifications." : "Þetta er notað til að senda út tilkynningar.", + "Send mode" : "Sendihamur", + "Encryption" : "Dulritun", + "From address" : "Frá vistfangi", + "mail" : "póstur", + "Authentication method" : "Auðkenningarmáti", + "Authentication required" : "Auðkenningar krafist", "Server address" : "Host nafn netþjóns", + "Port" : "Gátt", + "Credentials" : "Auðkenni", + "SMTP Username" : "SMTP-notandanafn", + "SMTP Password" : "SMTP-lykilorð", + "Store credentials" : "Geyma auðkenni", + "Test email settings" : "Prófa tölvupóststillingar", + "Send email" : "Senda tölvupóst", + "Download logfile" : "Sækja annál", "More" : "Meira", "Less" : "Minna", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!", + "What to log" : "Hvað á að skrá í annál", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.", + "How to do backups" : "Hvernig á að taka öryggisafrit", + "Advanced monitoring" : "Ítarleg vöktun", + "Performance tuning" : "Fínstilling afkasta", + "Improving the config.php" : "Bæting á config.php skránni", + "Theming" : "Þemu", + "Hardening and security guidance" : "Brynjun og öryggisleiðbeiningar", "Version" : "Útgáfa", - "Cheers!" : "Skál!", + "Developer documentation" : "Skjölun fyrir þróunaraðila", + "Experimental applications ahead" : "Forrit á tilraunastigi fyrst", + "by %s" : "frá %s", + "%s-licensed" : "%s-notkunarleyfi", + "Documentation:" : "Hjálparskjöl:", + "User documentation" : "Hjálparskjöl notenda", + "Admin documentation" : "Hjálparskjöl kerfisstjóra", + "Show description …" : "Birta lýsingu …", + "Hide description …" : "Fela lýsingu …", + "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:", + "Enable only for specific groups" : "Einungis fyrir sérstaka hópa", + "Uninstall App" : "Fjarlægja/Henda út forriti", + "Enable experimental apps" : "Virkja forrit á tilraunastigi", + "SSL Root Certificates" : "SSL-rótarskilríki", + "Common Name" : "Almennt heiti", + "Valid until" : "Gildir til", + "Issued By" : "Gefið út af", + "Valid until %s" : "Gildir til %s", + "Import root certificate" : "Flytja inn rótarskilríki", + "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>" : "Hæ þú,<br><br>bara að láta þig vita að þú átt núna %s aðgang.<br><br>Notandanafnið þitt: %s<br>Tengstu honum: <a href=\"%s\">%s</a><br><br>", + "Cheers!" : "Til hamingju!", + "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hæ þú,\n\nbara að láta þig vita að þú átt núna %s aðgang.\n\nNotandanafnið þitt: %s\nTengstu honum: %s\n\n", + "Administrator documentation" : "Hjálparskjöl stjórnanda", + "Online documentation" : "Handbækur/skjölun á netinu", "Forum" : "Vefspjall", + "Issue tracker" : "Skrásetjari (tracker)", + "Commercial support" : "Gjaldskyld tækniaðstoð", + "You are using <strong>%s</strong> of <strong>%s</strong>" : "Þú notar <strong>%s</strong> frá <strong>%s</strong>", + "Profile picture" : "Einkennismynd", + "Upload new" : "Senda inn nýtt", + "Select from Files" : "Veldu skrár", + "Remove image" : "Fjarlægja mynd", + "png or jpg, max. 20 MB" : "png eða jpg, hám. 20 MB", + "Picture provided by original account" : "Mynd frá upprunalegum aðgangi", "Cancel" : "Hætta við", + "Choose as profile picture" : "Veldu sem einkennismynd", + "Full name" : "Fullt nafn", + "No display name set" : "Ekkert birtingarnafn sett", "Email" : "Netfang", "Your email address" : "Netfangið þitt", + "For password recovery and notifications" : "Fyrir tilkynningar og endurheimtingu lykilorðs", + "No email address set" : "Ekkert tölvupóstfang sett", + "You are member of the following groups:" : "Þú ert meðlimur eftirfarandi hópa:", "Password" : "Lykilorð", "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu", "Current password" : "Núverandi lykilorð", @@ -44,11 +188,38 @@ "Change password" : "Breyta lykilorði", "Language" : "Tungumál", "Help translate" : "Hjálpa við þýðingu", - "Username" : "Notendanafn", + "Desktop client" : "Skjáborðsforrit", + "Android app" : "Android-forrit", + "iOS app" : "iOS-forrit", + "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!", + "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur", + "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}ownCloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu.", + "Show storage location" : "Birta staðsetningu gagnageymslu", + "Show last log in" : "Birta síðustu innskráningu", + "Show user backend" : "Birta bakenda notanda", + "Send email to new user" : "Senda tölvupóst til nýs notanda", + "Show email address" : "Birta tölvupóstfang", + "Username" : "Notandanafn", + "E-Mail" : "Tölvupóstfang", "Create" : "Búa til", + "Admin Recovery Password" : "Endurheimtulykilorð kerfisstjóra", + "Add Group" : "Bæta við hópi", "Group" : "Hópur", + "Everyone" : "Allir", + "Admins" : "Kerfisstjórar", + "Default Quota" : "Sjálfgefinn kvóti", + "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Settu inn geymslukvóta (t.d.: \"512 MB\" eða \"12 GB\")", "Unlimited" : "Ótakmarkað", "Other" : "Annað", + "Full Name" : "Fullt nafn", + "Group Admin for" : "Hópstjóri fyrir", + "Quota" : "Kvóti", + "Storage Location" : "Staðsetning gagnageymslu", + "User Backend" : "Bakendi notanda", + "Last Login" : "Síðasta innskráning", + "change full name" : "breyta fullu nafni", + "set new password" : "setja nýtt lykilorð", + "change email address" : "breyta tölvupóstfangi", "Default" : "Sjálfgefið" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 4114b67c3cd..e5c2301564a 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.", "Update to %s" : "Aggiornato a %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Hai %n aggiornamento di applicazione in corso","Hai %n aggiornamenti di applicazione in corso"], "Please wait...." : "Attendere...", "Error while disabling app" : "Errore durante la disattivazione", "Disable" : "Disabilita", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Password forte", "Groups" : "Gruppi", "Unable to delete {objName}" : "Impossibile eliminare {objName}", + "Error creating group: {message}" : "Errore durante la creazione del gruppo: {message}", "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo", "deleted {groupName}" : "{groupName} eliminato", "undo" : "annulla", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "aggiungi gruppo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente", "A valid username must be provided" : "Deve essere fornito un nome utente valido", + "Error creating user: {message}" : "Errore durante la creazione dell'utente: {message}", "A valid password must be provided" : "Deve essere fornita una password valida", "A valid email must be provided" : "Deve essere fornito un indirizzo email valido", "__language_name__" : "Italiano", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare a una versione di %1$s più recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.", "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Documentazione di amministrazione", "Show description …" : "Mostra descrizione...", "Hide description …" : "Nascondi descrizione...", + "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione minima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione massima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Questa applicazione non può essere installata perché le seguenti dipendenze non sono soddisfatte:", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 33c71867ac1..d1f76ea48b8 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.", "Update to %s" : "Aggiornato a %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Hai %n aggiornamento di applicazione in corso","Hai %n aggiornamenti di applicazione in corso"], "Please wait...." : "Attendere...", "Error while disabling app" : "Errore durante la disattivazione", "Disable" : "Disabilita", @@ -91,6 +92,7 @@ "Strong password" : "Password forte", "Groups" : "Gruppi", "Unable to delete {objName}" : "Impossibile eliminare {objName}", + "Error creating group: {message}" : "Errore durante la creazione del gruppo: {message}", "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo", "deleted {groupName}" : "{groupName} eliminato", "undo" : "annulla", @@ -100,6 +102,7 @@ "add group" : "aggiungi gruppo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente", "A valid username must be provided" : "Deve essere fornito un nome utente valido", + "Error creating user: {message}" : "Errore durante la creazione dell'utente: {message}", "A valid password must be provided" : "Deve essere fornita una password valida", "A valid email must be provided" : "Deve essere fornito un indirizzo email valido", "__language_name__" : "Italiano", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare a una versione di %1$s più recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.", "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Documentazione di amministrazione", "Show description …" : "Mostra descrizione...", "Hide description …" : "Nascondi descrizione...", + "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione minima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Questa applicazione non ha una versione massima di ownCloud assegnata. Ciò costituirà un errore in ownCloud 11 e successive.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Questa applicazione non può essere installata perché le seguenti dipendenze non sono soddisfatte:", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 5bc71433925..8a967e876ed 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。", "Update to %s" : "%sにアップデート", + "_You have %n app update pending_::_You have %n app updates pending_" : ["%n 個のアプリのアップデートを保留中"], "Please wait...." : "しばらくお待ちください...", "Error while disabling app" : "アプリ無効化中にエラーが発生", "Disable" : "無効", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "強いパスワード", "Groups" : "グループ", "Unable to delete {objName}" : "{objName} を削除できません", + "Error creating group: {message}" : "グループの作成エラー: {message}", "A valid group name must be provided" : "有効なグループ名を指定する必要があります", "deleted {groupName}" : "{groupName} を削除しました", "undo" : "元に戻す", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "グループを追加", "Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。", "A valid username must be provided" : "有効なユーザー名を指定する必要があります", + "Error creating user: {message}" : "ユーザ作成エラー {message}", "A valid password must be provided" : "有効なパスワードを指定する必要があります", "A valid email must be provided" : "有効なメールアドレスを指定する必要があります", "__language_name__" : "Japanese (日本語)", @@ -124,6 +127,7 @@ 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 等のキャッシュ/アクセラレーターが原因かもしれません。", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%2$s よりも古いバージョンの %1$s がインストールされています。安定した稼働とパフォーマンスの観点から、新しいバージョンの %1$s にアップデートすることをお勧めします。", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "トランザクションファイルのロックが無効になっており、競合時に問題となる可能性があります。これらの問題を回避するには、config.php 中の'filelocking.enabled'を有効にしてください。詳細については、<a target=\"_blank\" href=\"%s\">ドキュメント↗ </a>を参照してください。", "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "管理者ドキュメント", "Show description …" : "説明を表示 ...", "Hide description …" : "説明を隠す ...", + "This app has an update available." : "このアプリでアップデートが利用できます.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.", "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index bedfe96e95b..129140292ad 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。", "Update to %s" : "%sにアップデート", + "_You have %n app update pending_::_You have %n app updates pending_" : ["%n 個のアプリのアップデートを保留中"], "Please wait...." : "しばらくお待ちください...", "Error while disabling app" : "アプリ無効化中にエラーが発生", "Disable" : "無効", @@ -91,6 +92,7 @@ "Strong password" : "強いパスワード", "Groups" : "グループ", "Unable to delete {objName}" : "{objName} を削除できません", + "Error creating group: {message}" : "グループの作成エラー: {message}", "A valid group name must be provided" : "有効なグループ名を指定する必要があります", "deleted {groupName}" : "{groupName} を削除しました", "undo" : "元に戻す", @@ -100,6 +102,7 @@ "add group" : "グループを追加", "Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。", "A valid username must be provided" : "有効なユーザー名を指定する必要があります", + "Error creating user: {message}" : "ユーザ作成エラー {message}", "A valid password must be provided" : "有効なパスワードを指定する必要があります", "A valid email must be provided" : "有効なメールアドレスを指定する必要があります", "__language_name__" : "Japanese (日本語)", @@ -122,6 +125,7 @@ "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 等のキャッシュ/アクセラレーターが原因かもしれません。", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%2$s よりも古いバージョンの %1$s がインストールされています。安定した稼働とパフォーマンスの観点から、新しいバージョンの %1$s にアップデートすることをお勧めします。", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "トランザクションファイルのロックが無効になっており、競合時に問題となる可能性があります。これらの問題を回避するには、config.php 中の'filelocking.enabled'を有効にしてください。詳細については、<a target=\"_blank\" href=\"%s\">ドキュメント↗ </a>を参照してください。", "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。", @@ -206,6 +210,7 @@ "Admin documentation" : "管理者ドキュメント", "Show description …" : "説明を表示 ...", "Hide description …" : "説明を隠す ...", + "This app has an update available." : "このアプリでアップデートが利用できます.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません．ownCloud 11 以降でエラーが発生する可能性があります.", "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:", diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js index 538ead4c4f8..3d60ec08be5 100644 --- a/settings/l10n/mk.js +++ b/settings/l10n/mk.js @@ -48,6 +48,7 @@ OC.L10N.register( "Email saved" : "Електронската пошта е снимена", "Your full name has been changed." : "Вашето целосно име е променето.", "Unable to change full name" : "Не можам да го променам целото име", + "Add trusted domain" : "Додади доверлив домејн", "Migration started …" : "Миграцијата е започнаа ...", "Sending..." : "Испраќам...", "Official" : "Официјален", @@ -55,6 +56,7 @@ OC.L10N.register( "Experimental" : "Експериментален", "All" : "Сите", "No apps found for your version" : "За вашата верзија не се пронајдени апликации", + "Update to %s" : "Надгради на %s", "Please wait...." : "Ве молам почекајте ...", "Error while disabling app" : "Грешка при исклучувањето на апликацијата", "Disable" : "Оневозможи", @@ -79,6 +81,7 @@ OC.L10N.register( "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", "A valid group name must be provided" : "Мора да се обезбеди валидно име на група", + "deleted {groupName}" : "избришано {groupName}", "undo" : "врати", "no group" : "нема група", "never" : "никогаш", diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json index ab377c57f35..c5ab77d47b5 100644 --- a/settings/l10n/mk.json +++ b/settings/l10n/mk.json @@ -46,6 +46,7 @@ "Email saved" : "Електронската пошта е снимена", "Your full name has been changed." : "Вашето целосно име е променето.", "Unable to change full name" : "Не можам да го променам целото име", + "Add trusted domain" : "Додади доверлив домејн", "Migration started …" : "Миграцијата е започнаа ...", "Sending..." : "Испраќам...", "Official" : "Официјален", @@ -53,6 +54,7 @@ "Experimental" : "Експериментален", "All" : "Сите", "No apps found for your version" : "За вашата верзија не се пронајдени апликации", + "Update to %s" : "Надгради на %s", "Please wait...." : "Ве молам почекајте ...", "Error while disabling app" : "Грешка при исклучувањето на апликацијата", "Disable" : "Оневозможи", @@ -77,6 +79,7 @@ "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", "A valid group name must be provided" : "Мора да се обезбеди валидно име на група", + "deleted {groupName}" : "избришано {groupName}", "undo" : "врати", "no group" : "нема група", "never" : "никогаш", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index 352c8a0b9d0..4ffc9b0ed81 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av pålitelige utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.", "Update to %s" : "Oppdater til %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du har %n app-oppdatering som venter","Du har %n app-oppdateringer som venter"], "Please wait...." : "Vennligst vent...", "Error while disabling app" : "Deaktivering av app feilet", "Disable" : "Deaktiver ", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Sterkt passord", "Groups" : "Grupper", "Unable to delete {objName}" : "Kan ikke slette {objName}", + "Error creating group: {message}" : "Feil ved oppretting av gruppe: {message}", "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis", "deleted {groupName}" : "slettet {groupName}", "undo" : "angre", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "legg til gruppe", "Changing the password will result in data loss, because data recovery is not available for this user" : "Forandring av passordet vil føre til tap av data, fordi datagjennoppretting er utilgjengelig for denne brukeren", "A valid username must be provided" : "Oppgi et gyldig brukernavn", + "Error creating user: {message}" : "Feil ved oppretting av bruker: {message}", "A valid password must be provided" : "Oppgi et gyldig passord", "A valid email must be provided" : "En gyldig e-postadresse må oppgis", "__language_name__" : "__language_name__", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.", "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Admin-dokumentasjon", "Show description …" : "Vis beskrivelse …", "Hide description …" : "Skjul beskrivelse …", + "This app has an update available." : "En oppdatering er tilgjengelig for denne appen.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen minimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen maksimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 7d16df7b764..e51b89c938c 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av pålitelige utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.", "Update to %s" : "Oppdater til %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du har %n app-oppdatering som venter","Du har %n app-oppdateringer som venter"], "Please wait...." : "Vennligst vent...", "Error while disabling app" : "Deaktivering av app feilet", "Disable" : "Deaktiver ", @@ -91,6 +92,7 @@ "Strong password" : "Sterkt passord", "Groups" : "Grupper", "Unable to delete {objName}" : "Kan ikke slette {objName}", + "Error creating group: {message}" : "Feil ved oppretting av gruppe: {message}", "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis", "deleted {groupName}" : "slettet {groupName}", "undo" : "angre", @@ -100,6 +102,7 @@ "add group" : "legg til gruppe", "Changing the password will result in data loss, because data recovery is not available for this user" : "Forandring av passordet vil føre til tap av data, fordi datagjennoppretting er utilgjengelig for denne brukeren", "A valid username must be provided" : "Oppgi et gyldig brukernavn", + "Error creating user: {message}" : "Feil ved oppretting av bruker: {message}", "A valid password must be provided" : "Oppgi et gyldig passord", "A valid email must be provided" : "En gyldig e-postadresse må oppgis", "__language_name__" : "__language_name__", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.", "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Admin-dokumentasjon", "Show description …" : "Vis beskrivelse …", "Hide description …" : "Skjul beskrivelse …", + "This app has an update available." : "En oppdatering er tilgjengelig for denne appen.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen minimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denne appen har ingen maksimumsversjon av ownCloud. Dette vil være en feil i ownCloud 11 og senere.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 53a47b1b687..3f0b0dc9a16 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.", "Update to %s" : "Bijgewerkt naar %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"], "Please wait...." : "Even geduld a.u.b.", "Error while disabling app" : "Fout tijdens het uitzetten van het programma", "Disable" : "Uitschakelen", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Sterk wachtwoord", "Groups" : "Groepen", "Unable to delete {objName}" : "Kan {objName} niet verwijderen", + "Error creating group: {message}" : "Fout bij aanmaken groep: {message}", "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven", "deleted {groupName}" : "verwijderd {groupName}", "undo" : "ongedaan maken", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "Nieuwe groep", "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is", "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven", + "Error creating user: {message}" : "Fout bij aanmaken gebruiker: {message}", "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven", "A valid email must be provided" : "Er moet een geldig e-mailadres worden opgegeven", "__language_name__" : "Nederlands", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Beheerdocumentatie", "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", + "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index b4777949f8d..c329c81306e 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.", "Update to %s" : "Bijgewerkt naar %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"], "Please wait...." : "Even geduld a.u.b.", "Error while disabling app" : "Fout tijdens het uitzetten van het programma", "Disable" : "Uitschakelen", @@ -91,6 +92,7 @@ "Strong password" : "Sterk wachtwoord", "Groups" : "Groepen", "Unable to delete {objName}" : "Kan {objName} niet verwijderen", + "Error creating group: {message}" : "Fout bij aanmaken groep: {message}", "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven", "deleted {groupName}" : "verwijderd {groupName}", "undo" : "ongedaan maken", @@ -100,6 +102,7 @@ "add group" : "Nieuwe groep", "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is", "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven", + "Error creating user: {message}" : "Fout bij aanmaken gebruiker: {message}", "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven", "A valid email must be provided" : "Er moet een geldig e-mailadres worden opgegeven", "__language_name__" : "Nederlands", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", @@ -206,6 +210,7 @@ "Admin documentation" : "Beheerdocumentatie", "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", + "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index a27e3b98bac..a0191800165 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.", "Update to %s" : "Atualizado para %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Você tem %n atualização pendente","Você tem %n atualizações pendentes"], "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Erro enquanto desabilitava o aplicativo", "Disable" : "Desabilitar", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Senha forte", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível excluir {objName}", + "Error creating group: {message}" : "Erro criando o grupo: {message}", "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido", "deleted {groupName}" : "eliminado {groupName}", "undo" : "desfazer", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "adicionar grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponível para este usuário", "A valid username must be provided" : "Forneça um nome de usuário válido", + "Error creating user: {message}" : "Erro criando o usuário: {message}", "A valid password must be provided" : "Forneça uma senha válida", "A valid email must be provided" : "Deve ser informado um e-mail válido", "__language_name__" : "__language_name__", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado, por razões de estabilidade e desempenho recomendamos a atualização para uma nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Documentação para Administração", "Show description …" : "Mostrar descrição ...", "Hide description …" : "Esconder descrição ...", + "This app has an update available." : "Este aplicativo tem uma atualização disponível.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma versão ownCloud mínima. Isto será um erro no ownCloud 11 e posterior.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma versão ownCloud máxima. Isto será um erro no ownCloud 11 e posterior.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Este aplicativo não pode ser instalado porque as seguintes dependências não forão cumpridas:", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index b9272d9da44..5bd3233cebc 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.", "Update to %s" : "Atualizado para %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Você tem %n atualização pendente","Você tem %n atualizações pendentes"], "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Erro enquanto desabilitava o aplicativo", "Disable" : "Desabilitar", @@ -91,6 +92,7 @@ "Strong password" : "Senha forte", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível excluir {objName}", + "Error creating group: {message}" : "Erro criando o grupo: {message}", "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido", "deleted {groupName}" : "eliminado {groupName}", "undo" : "desfazer", @@ -100,6 +102,7 @@ "add group" : "adicionar grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponível para este usuário", "A valid username must be provided" : "Forneça um nome de usuário válido", + "Error creating user: {message}" : "Erro criando o usuário: {message}", "A valid password must be provided" : "Forneça uma senha válida", "A valid email must be provided" : "Deve ser informado um e-mail válido", "__language_name__" : "__language_name__", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado, por razões de estabilidade e desempenho recomendamos a atualização para uma nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Documentação para Administração", "Show description …" : "Mostrar descrição ...", "Hide description …" : "Esconder descrição ...", + "This app has an update available." : "Este aplicativo tem uma atualização disponível.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma versão ownCloud mínima. Isto será um erro no ownCloud 11 e posterior.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Este aplicativo não tem atribuída nenhuma versão ownCloud máxima. Isto será um erro no ownCloud 11 e posterior.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Este aplicativo não pode ser instalado porque as seguintes dependências não forão cumpridas:", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index ab0ad694386..8682f62598d 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.", "Update to %s" : "Actualizar para %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Você tem %n atualização de aplicação pendente","Você tem %n atualizações de aplicações pendentes"], "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Ocorreu um erro enquanto desativava a app", "Disable" : "Desativar", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Palavra-passe forte", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível apagar {objNome}", + "Error creating group: {message}" : "Erro ao criar grupo: {message}", "A valid group name must be provided" : "Deve ser indicado um nome de grupo válido", "deleted {groupName}" : "{groupName} apagado", "undo" : "Anular", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "Adicionar grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "A alteração da palavra-passe resultará na perda de dados, porque a recuperação de dados não está disponível para este utilizador", "A valid username must be provided" : "Deve ser indicado um nome de utilizador válido", + "Error creating user: {message}" : "Erro ao criar utilizador: {message}", "A valid password must be provided" : "Deve ser indicada uma palavra-passe válida", "A valid email must be provided" : "Deve ser fornecido um email válido", "__language_name__" : "__language_name__", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor está a correr Microsoft Windows. Nós recomendamos Linux para uma experiência de utilizador optimizada.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado. Por motivos de estabilidade e desempenho, recomendamos que atualize para a nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacionais está desativado, isto poderá levar a problemas com condições de corrida. Ative 'filelocking.enabled' no config.php para evitar estes problemas. Consulte a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.", "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Documentação do Administrador", "Show description …" : "Mostrar descrição ...", "Hide description …" : "Esconder descrição ...", + "This app has an update available." : "Esta aplicação tem uma atualização disponível.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão mínima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão máxima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 66d0f6bf57d..2930684f5cb 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.", "Update to %s" : "Actualizar para %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Você tem %n atualização de aplicação pendente","Você tem %n atualizações de aplicações pendentes"], "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Ocorreu um erro enquanto desativava a app", "Disable" : "Desativar", @@ -91,6 +92,7 @@ "Strong password" : "Palavra-passe forte", "Groups" : "Grupos", "Unable to delete {objName}" : "Não é possível apagar {objNome}", + "Error creating group: {message}" : "Erro ao criar grupo: {message}", "A valid group name must be provided" : "Deve ser indicado um nome de grupo válido", "deleted {groupName}" : "{groupName} apagado", "undo" : "Anular", @@ -100,6 +102,7 @@ "add group" : "Adicionar grupo", "Changing the password will result in data loss, because data recovery is not available for this user" : "A alteração da palavra-passe resultará na perda de dados, porque a recuperação de dados não está disponível para este utilizador", "A valid username must be provided" : "Deve ser indicado um nome de utilizador válido", + "Error creating user: {message}" : "Erro ao criar utilizador: {message}", "A valid password must be provided" : "Deve ser indicada uma palavra-passe válida", "A valid email must be provided" : "Deve ser fornecido um email válido", "__language_name__" : "__language_name__", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor está a correr Microsoft Windows. Nós recomendamos Linux para uma experiência de utilizador optimizada.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado. Por motivos de estabilidade e desempenho, recomendamos que atualize para a nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacionais está desativado, isto poderá levar a problemas com condições de corrida. Ative 'filelocking.enabled' no config.php para evitar estes problemas. Consulte a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.", "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Documentação do Administrador", "Show description …" : "Mostrar descrição ...", "Hide description …" : "Esconder descrição ...", + "This app has an update available." : "Esta aplicação tem uma atualização disponível.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão mínima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Esta aplicação não tem uma versão máxima de ownCloud atribuída. Isto será um erro no ownCloud 11 e seguintes.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index d608b0db054..ac5f3d9ea1b 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -27,20 +27,20 @@ OC.L10N.register( "Unable to change password" : "Ni mogoče spremeniti gesla", "Enabled" : "Omogočeno", "Not enabled" : "Ni omogočeno", - "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "A problem occurred, please check your log files (Error: %s)" : "Pojavila se je težava. Prosimo, preverite dnevniške zapise (Napaka: %s)", - "Migration Completed" : "Selitev zaključena", + "Federated Cloud Sharing" : "Souporaba s prenosom dovoljenj", + "A problem occurred, please check your log files (Error: %s)" : "Prišlo je do napake. Preverite dnevniške zapise (napaka: %s).", + "Migration Completed" : "Selitev je končana", "Group already exists." : "Skupina že obstaja.", "Unable to add group." : "Ni mogoče dodati skupine", "Unable to delete group." : "Ni mogoče izbrisati skupine.", - "log-level out of allowed range" : "stopnja zapisovanja izven območja", + "log-level out of allowed range" : "stopnja zapisovanja je izven dovoljenega območja", "Saved" : "Shranjeno", "test email settings" : "preizkusi nastavitve elektronske pošte", - "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je pojavila težava. Preglejte nastavitve. (Napaka: %s)", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je prišlo do napake. Preverite nastavitve (napaka: %s).", "Email sent" : "Elektronska pošta je poslana", "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.", "Invalid mail address" : "Neveljaven elektronski naslov", - "A user with that name already exists." : "Uporabnik s takim imenom že obstaja.", + "A user with that name already exists." : "Uporabnik s tem imenom že obstaja.", "Unable to create user." : "Ni mogoče ustvariti uporabnika.", "Your %s account was created" : "Račun %s je uspešno ustvarjen.", "Unable to delete user." : "Ni mogoče izbrisati uporabnika", @@ -52,8 +52,8 @@ OC.L10N.register( "Unable to change full name" : "Ni mogoče spremeniti polnega imena", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?", "Add trusted domain" : "Dodaj varno domeno", - "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.", - "Migration started …" : "Selitev pognana...", + "Migration in progress. Please wait until the migration is finished" : "V teku je selitev. Počakajte, da se zaključi.", + "Migration started …" : "Selitev je začeta ...", "Sending..." : "Poteka pošiljanje ...", "Official" : "Uradno", "Approved" : "Odobreno", @@ -61,6 +61,7 @@ OC.L10N.register( "All" : "Vsi", "No apps found for your version" : "Ni aplikacij za vašo verzijo", "Update to %s" : "Posodobi na %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Na čakanju je %n posodobitev","Na čakanju sta %n posodobitvi","Na čakanju so %n posodobitve","Na čakanju je %n posodobitev"], "Please wait...." : "Počakajte ...", "Error while disabling app" : "Napaka onemogočanja programa", "Disable" : "Onemogoči", @@ -75,6 +76,7 @@ OC.L10N.register( "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacija je bila vključena in zahteva še posodobitev. Preusmerjeni boste na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje aplikacije", "No apps found for \"{query}\"" : "Ne najdem aplikacije za \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.", "Valid until {date}" : "Veljavno do {date}", "Delete" : "Izbriši", "An error occurred: {message}" : "Prišlo je do napake: {message}", @@ -86,6 +88,7 @@ OC.L10N.register( "Strong password" : "Odlično geslo", "Groups" : "Skupine", "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}", + "Error creating group: {message}" : "Napaka ustvarjanja skupine: {message}", "A valid group name must be provided" : "Navedeno mora biti veljavno ime skupine", "deleted {groupName}" : "izbrisano {groupName}", "undo" : "razveljavi", @@ -95,6 +98,7 @@ OC.L10N.register( "add group" : "dodaj skupino", "Changing the password will result in data loss, because data recovery is not available for this user" : "Sprememba gesla bo povzročila izgubo podatkov, ker obnova podatkov za tega uporabnika ni na voljo.", "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime", + "Error creating user: {message}" : "Napaka ustvarjanja uporabnika: {message}", "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "A valid email must be provided" : "Naveden mora biti veljaven naslov elektronske pošte.", "__language_name__" : "Slovenščina", @@ -115,7 +119,7 @@ OC.L10N.register( "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.", "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.", "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.", - "All checks passed." : "Vsa prejerjanja so pozitivna.", + "All checks passed." : "Vsa preverjanja so uspešno zaključena.", "Open documentation" : "Odprta dokumentacija", "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe", "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami", @@ -137,7 +141,8 @@ OC.L10N.register( "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.", "Enable server-side encryption" : "Omogoči šifriranje na strežniku", "Enable encryption" : "Omogoči šifriranje", - "Start migration" : "Zaženite selitev", + "Select default encryption module:" : "Izbor privzetega modula za šifriranje:", + "Start migration" : "Začni selitev", "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.", "Send mode" : "Način pošiljanja", "Encryption" : "Šifriranje", @@ -157,16 +162,17 @@ OC.L10N.register( "More" : "Več", "Less" : "Manj", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Datoteeka dnevniškega zapisa je večja od 100MB. Prenos lahko traja dlje!", + "What to log" : "Kaj naj se beleži?", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena baza je SQLite. Za večje namestitve priporočamo prehod na drugačno bazo.", "How to do backups" : "Kako ustvariti varnostne kopije", "Advanced monitoring" : "Napredno sledenje", "Performance tuning" : "Optimizacija izvajanja", - "Improving the config.php" : "Izboljšanje config.php", + "Improving the config.php" : "Izboljšave v config.php", "Theming" : "Teme", - "Hardening and security guidance" : "Varovanje in varnostni napotki", + "Hardening and security guidance" : "Varnost in varnostni napotki", "Version" : "Različica", - "Developer documentation" : "Razvojniška dokumentacija", - "Experimental applications ahead" : "Testne aplikacija", + "Developer documentation" : "Dokumentacija za razvijalce", + "Experimental applications ahead" : "Preizkusni programi", "Documentation:" : "Dokumentacija:", "User documentation" : "Uporabniška dokumentacija", "Admin documentation" : "Skrbniška dokumentacija", @@ -175,7 +181,7 @@ OC.L10N.register( "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", - "Enable experimental apps" : "Omogoči testne aplikacije", + "Enable experimental apps" : "Omogoči preizkusne programe", "SSL Root Certificates" : "Korenska potrdila SSL", "Common Name" : "Splošno ime", "Valid until" : "Veljavno do", @@ -189,7 +195,7 @@ OC.L10N.register( "Online documentation" : "Spletna dokumentacija", "Forum" : "Forum", "Issue tracker" : "Spremljanje težav", - "Commercial support" : "Komercialna podpora", + "Commercial support" : "Podpora strankam", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Uporabljate <strong>%s</strong> od <strong>%s</strong>", "Profile picture" : "Slika profila", "Upload new" : "Pošlji novo", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index 1e786de33dd..9143af21655 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -25,20 +25,20 @@ "Unable to change password" : "Ni mogoče spremeniti gesla", "Enabled" : "Omogočeno", "Not enabled" : "Ni omogočeno", - "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "A problem occurred, please check your log files (Error: %s)" : "Pojavila se je težava. Prosimo, preverite dnevniške zapise (Napaka: %s)", - "Migration Completed" : "Selitev zaključena", + "Federated Cloud Sharing" : "Souporaba s prenosom dovoljenj", + "A problem occurred, please check your log files (Error: %s)" : "Prišlo je do napake. Preverite dnevniške zapise (napaka: %s).", + "Migration Completed" : "Selitev je končana", "Group already exists." : "Skupina že obstaja.", "Unable to add group." : "Ni mogoče dodati skupine", "Unable to delete group." : "Ni mogoče izbrisati skupine.", - "log-level out of allowed range" : "stopnja zapisovanja izven območja", + "log-level out of allowed range" : "stopnja zapisovanja je izven dovoljenega območja", "Saved" : "Shranjeno", "test email settings" : "preizkusi nastavitve elektronske pošte", - "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je pojavila težava. Preglejte nastavitve. (Napaka: %s)", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je prišlo do napake. Preverite nastavitve (napaka: %s).", "Email sent" : "Elektronska pošta je poslana", "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.", "Invalid mail address" : "Neveljaven elektronski naslov", - "A user with that name already exists." : "Uporabnik s takim imenom že obstaja.", + "A user with that name already exists." : "Uporabnik s tem imenom že obstaja.", "Unable to create user." : "Ni mogoče ustvariti uporabnika.", "Your %s account was created" : "Račun %s je uspešno ustvarjen.", "Unable to delete user." : "Ni mogoče izbrisati uporabnika", @@ -50,8 +50,8 @@ "Unable to change full name" : "Ni mogoče spremeniti polnega imena", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?", "Add trusted domain" : "Dodaj varno domeno", - "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.", - "Migration started …" : "Selitev pognana...", + "Migration in progress. Please wait until the migration is finished" : "V teku je selitev. Počakajte, da se zaključi.", + "Migration started …" : "Selitev je začeta ...", "Sending..." : "Poteka pošiljanje ...", "Official" : "Uradno", "Approved" : "Odobreno", @@ -59,6 +59,7 @@ "All" : "Vsi", "No apps found for your version" : "Ni aplikacij za vašo verzijo", "Update to %s" : "Posodobi na %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Na čakanju je %n posodobitev","Na čakanju sta %n posodobitvi","Na čakanju so %n posodobitve","Na čakanju je %n posodobitev"], "Please wait...." : "Počakajte ...", "Error while disabling app" : "Napaka onemogočanja programa", "Disable" : "Onemogoči", @@ -73,6 +74,7 @@ "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacija je bila vključena in zahteva še posodobitev. Preusmerjeni boste na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje aplikacije", "No apps found for \"{query}\"" : "Ne najdem aplikacije za \"{query}\"", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.", "Valid until {date}" : "Veljavno do {date}", "Delete" : "Izbriši", "An error occurred: {message}" : "Prišlo je do napake: {message}", @@ -84,6 +86,7 @@ "Strong password" : "Odlično geslo", "Groups" : "Skupine", "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}", + "Error creating group: {message}" : "Napaka ustvarjanja skupine: {message}", "A valid group name must be provided" : "Navedeno mora biti veljavno ime skupine", "deleted {groupName}" : "izbrisano {groupName}", "undo" : "razveljavi", @@ -93,6 +96,7 @@ "add group" : "dodaj skupino", "Changing the password will result in data loss, because data recovery is not available for this user" : "Sprememba gesla bo povzročila izgubo podatkov, ker obnova podatkov za tega uporabnika ni na voljo.", "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime", + "Error creating user: {message}" : "Napaka ustvarjanja uporabnika: {message}", "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "A valid email must be provided" : "Naveden mora biti veljaven naslov elektronske pošte.", "__language_name__" : "Slovenščina", @@ -113,7 +117,7 @@ "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.", "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.", "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.", - "All checks passed." : "Vsa prejerjanja so pozitivna.", + "All checks passed." : "Vsa preverjanja so uspešno zaključena.", "Open documentation" : "Odprta dokumentacija", "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe", "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami", @@ -135,7 +139,8 @@ "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.", "Enable server-side encryption" : "Omogoči šifriranje na strežniku", "Enable encryption" : "Omogoči šifriranje", - "Start migration" : "Zaženite selitev", + "Select default encryption module:" : "Izbor privzetega modula za šifriranje:", + "Start migration" : "Začni selitev", "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.", "Send mode" : "Način pošiljanja", "Encryption" : "Šifriranje", @@ -155,16 +160,17 @@ "More" : "Več", "Less" : "Manj", "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Datoteeka dnevniškega zapisa je večja od 100MB. Prenos lahko traja dlje!", + "What to log" : "Kaj naj se beleži?", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena baza je SQLite. Za večje namestitve priporočamo prehod na drugačno bazo.", "How to do backups" : "Kako ustvariti varnostne kopije", "Advanced monitoring" : "Napredno sledenje", "Performance tuning" : "Optimizacija izvajanja", - "Improving the config.php" : "Izboljšanje config.php", + "Improving the config.php" : "Izboljšave v config.php", "Theming" : "Teme", - "Hardening and security guidance" : "Varovanje in varnostni napotki", + "Hardening and security guidance" : "Varnost in varnostni napotki", "Version" : "Različica", - "Developer documentation" : "Razvojniška dokumentacija", - "Experimental applications ahead" : "Testne aplikacija", + "Developer documentation" : "Dokumentacija za razvijalce", + "Experimental applications ahead" : "Preizkusni programi", "Documentation:" : "Dokumentacija:", "User documentation" : "Uporabniška dokumentacija", "Admin documentation" : "Skrbniška dokumentacija", @@ -173,7 +179,7 @@ "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", - "Enable experimental apps" : "Omogoči testne aplikacije", + "Enable experimental apps" : "Omogoči preizkusne programe", "SSL Root Certificates" : "Korenska potrdila SSL", "Common Name" : "Splošno ime", "Valid until" : "Veljavno do", @@ -187,7 +193,7 @@ "Online documentation" : "Spletna dokumentacija", "Forum" : "Forum", "Issue tracker" : "Spremljanje težav", - "Commercial support" : "Komercialna podpora", + "Commercial support" : "Podpora strankam", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Uporabljate <strong>%s</strong> od <strong>%s</strong>", "Profile picture" : "Slika profila", "Upload new" : "Pošlji novo", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index f68c12f09a6..b88700a6092 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -67,6 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.", "Update to %s" : "Përditësoje me %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Keni %n përditësim aplikacioni në pritje","Keni %n përditësime aplikacionesh në pritje"], "Please wait...." : "Ju lutemi, prisni…", "Error while disabling app" : "Gabim në çaktivizimin e aplikacionit", "Disable" : "Çaktivizoje", @@ -93,6 +94,7 @@ OC.L10N.register( "Strong password" : "Fjalëkalim i fortë", "Groups" : "Grupe", "Unable to delete {objName}" : "S’arrin të fshijë {objName}", + "Error creating group: {message}" : "Gabim gjatë krijimit të grupit: {message}", "A valid group name must be provided" : "Duhet dhënë një emër i vlefshëm grupi", "deleted {groupName}" : "u fshi {groupName}", "undo" : "zhbëje", @@ -102,6 +104,7 @@ OC.L10N.register( "add group" : "shto grup", "Changing the password will result in data loss, because data recovery is not available for this user" : "Ndryshimi i fjalëkalimit do të sjellë humbje të dhënash, ngaqë rikthimi i të dhënave s’është i përdorshëm për këtë përdorues", "A valid username must be provided" : "Duhet dhënë një emër të vlefshëm përdoruesi", + "Error creating user: {message}" : "Gabim gjatë krijimit të përdoruesit: {message}", "A valid password must be provided" : "Duhet dhënë një fjalëkalim i vlefshëm", "A valid email must be provided" : "Duhet dhënë një email i vlefshëm", "__language_name__" : "Shqip", @@ -124,6 +127,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Duket se PHP-ja është rregulluar që të heqë blloqe të brendshme dokumentimi. Kjo do t’i bëjë të papërdrshme disa aplikacione bazë.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Shërbyesi juaj xhiron nën Microsoft Windows. Këshillojmë fort Linux-in për punim optimal nga ana e përdoruesit.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Ka të instaluar %1$s nën versionin %2$s, për arsye qëndrueshmërie dhe performance këshillojmë të përditësohet me një version %1$s më të ri.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me forcë ta aktivizoni këtë modul, për të patur përfundimet më të mira në zbulim llojesh MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Kyçja e kartelave gjatë transaksioneve është e çaktivizuar, kjo mund të sjellë probleme me gjendje <em>race conditions</em>. Që të shmangni këto probleme, aktivizoni 'filelocking.enabled' te config.php. Për më tepër të dhëna, shihni <a target=\"_blank\" href=\"%s\">dokumentimin ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Si vendore sistemi nuk mund të caktohet një që mbulon UTF-8.", @@ -208,6 +212,7 @@ OC.L10N.register( "Admin documentation" : "Dokumentim për përgjegjësit", "Show description …" : "Shfaq përshkrim …", "Hide description …" : "Fshihe përshkrimin …", + "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version minimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version maksimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ky aplikacion s’mund të instalohet, ngaqë për të nuk plotësohen varësitë vijuese:", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index f5844dc01e9..4b16830a03f 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -65,6 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.", "Update to %s" : "Përditësoje me %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Keni %n përditësim aplikacioni në pritje","Keni %n përditësime aplikacionesh në pritje"], "Please wait...." : "Ju lutemi, prisni…", "Error while disabling app" : "Gabim në çaktivizimin e aplikacionit", "Disable" : "Çaktivizoje", @@ -91,6 +92,7 @@ "Strong password" : "Fjalëkalim i fortë", "Groups" : "Grupe", "Unable to delete {objName}" : "S’arrin të fshijë {objName}", + "Error creating group: {message}" : "Gabim gjatë krijimit të grupit: {message}", "A valid group name must be provided" : "Duhet dhënë një emër i vlefshëm grupi", "deleted {groupName}" : "u fshi {groupName}", "undo" : "zhbëje", @@ -100,6 +102,7 @@ "add group" : "shto grup", "Changing the password will result in data loss, because data recovery is not available for this user" : "Ndryshimi i fjalëkalimit do të sjellë humbje të dhënash, ngaqë rikthimi i të dhënave s’është i përdorshëm për këtë përdorues", "A valid username must be provided" : "Duhet dhënë një emër të vlefshëm përdoruesi", + "Error creating user: {message}" : "Gabim gjatë krijimit të përdoruesit: {message}", "A valid password must be provided" : "Duhet dhënë një fjalëkalim i vlefshëm", "A valid email must be provided" : "Duhet dhënë një email i vlefshëm", "__language_name__" : "Shqip", @@ -122,6 +125,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Duket se PHP-ja është rregulluar që të heqë blloqe të brendshme dokumentimi. Kjo do t’i bëjë të papërdrshme disa aplikacione bazë.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Shërbyesi juaj xhiron nën Microsoft Windows. Këshillojmë fort Linux-in për punim optimal nga ana e përdoruesit.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Ka të instaluar %1$s nën versionin %2$s, për arsye qëndrueshmërie dhe performance këshillojmë të përditësohet me një version %1$s më të ri.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me forcë ta aktivizoni këtë modul, për të patur përfundimet më të mira në zbulim llojesh MIME.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Kyçja e kartelave gjatë transaksioneve është e çaktivizuar, kjo mund të sjellë probleme me gjendje <em>race conditions</em>. Që të shmangni këto probleme, aktivizoni 'filelocking.enabled' te config.php. Për më tepër të dhëna, shihni <a target=\"_blank\" href=\"%s\">dokumentimin ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Si vendore sistemi nuk mund të caktohet një që mbulon UTF-8.", @@ -206,6 +210,7 @@ "Admin documentation" : "Dokumentim për përgjegjësit", "Show description …" : "Shfaq përshkrim …", "Hide description …" : "Fshihe përshkrimin …", + "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version minimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Ky aplikacion nuk ka të përcaktuar version maksimum për ownCloud-in. Kjo do të përbëjë një gabim për ownCloud 11 dhe të mëvonshëm.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ky aplikacion s’mund të instalohet, ngaqë për të nuk plotësohen varësitë vijuese:", diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 14378899e92..5fc3c60cf66 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -72,7 +72,7 @@ if($_['displayNameChangeSupported']) { <?php } else { ?> -<div class="section"> +<div id="displaynameform" class="section"> <h2><?php echo $l->t('Full name');?></h2> <span><?php if(isset($_['displayName'][0])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> </div> @@ -81,7 +81,7 @@ if($_['displayNameChangeSupported']) { ?> <?php -if($_['passwordChangeSupported']) { +if($_['displayNameChangeSupported']) { ?> <form id="lostpassword" class="section"> <h2> @@ -96,7 +96,7 @@ if($_['passwordChangeSupported']) { <?php } else { ?> -<div class="section"> +<div id="lostpassword" class="section"> <h2><?php echo $l->t('Email'); ?></h2> <span><?php if(isset($_['email'][0])) { p($_['email']); } else { p($l->t('No email address set')); }?></span> </div> diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php index c41f0754396..4f23dd0e6d0 100644 --- a/tests/lib/share20/managertest.php +++ b/tests/lib/share20/managertest.php @@ -644,6 +644,15 @@ class ManagerTest extends \Test\TestCase { $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $limitedPermssions, $group0, $user0, $user0, 17, null, null), 'Cannot increase permissions of path', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_LINK, $limitedPermssions, null, $user0, $user0, 3, null, null), 'Cannot increase permissions of path', true]; + $rootFolder = $this->getMock('\OCP\Files\Folder'); + $rootFolder->method('isShareable')->willReturn(true); + $rootFolder->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL); + $rootFolder->method('getPath')->willReturn('myrootfolder'); + + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_USER, $rootFolder, $user2, $user0, $user0, 30, null, null), 'You can\'t share your root folder', true]; + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $rootFolder, $group0, $user0, $user0, 2, null, null), 'You can\'t share your root folder', true]; + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_LINK, $rootFolder, null, $user0, $user0, 16, null, null), 'You can\'t share your root folder', true]; + $allPermssions = $this->getMock('\OCP\Files\Folder'); $allPermssions->method('isShareable')->willReturn(true); $allPermssions->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL); @@ -677,6 +686,11 @@ class ManagerTest extends \Test\TestCase { ['group0', true], ])); + $userFolder = $this->getMock('\OCP\Files\Folder'); + $userFolder->method('getPath')->willReturn('myrootfolder'); + $this->rootFolder->method('getUserFolder')->willReturn($userFolder); + + try { $this->invokePrivate($this->manager, 'generalCreateChecks', [$share]); $thrown = false; @@ -692,6 +706,32 @@ class ManagerTest extends \Test\TestCase { } /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage You can't share your root folder + */ + public function testGeneralCheckShareRoot() { + $thrown = null; + + $this->userManager->method('userExists')->will($this->returnValueMap([ + ['user0', true], + ['user1', true], + ])); + + $userFolder = $this->getMock('\OCP\Files\Folder'); + $userFolder->method('isSubNode')->with($userFolder)->willReturn(false); + $this->rootFolder->method('getUserFolder')->willReturn($userFolder); + + $share = $this->manager->newShare(); + + $share->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setSharedWith('user0') + ->setSharedBy('user1') + ->setNode($userFolder); + + $this->invokePrivate($this->manager, 'generalCreateChecks', [$share]); + } + + /** * @expectedException \OCP\Share\Exceptions\GenericShareException * @expectedExceptionMessage Expiration date is in the past */ @@ -713,15 +753,51 @@ class ManagerTest extends \Test\TestCase { */ public function testvalidateExpirationDateEnforceButNotSet() { $share = $this->manager->newShare(); + $share->setProviderId('foo')->setId('bar'); $this->config->method('getAppValue') ->will($this->returnValueMap([ + ['core', 'shareapi_default_expire_date', 'no', 'yes'], ['core', 'shareapi_enforce_expire_date', 'no', 'yes'], ])); $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); } + public function testvalidateExpirationDateEnforceButNotEnabledAndNotSet() { + $share = $this->manager->newShare(); + $share->setProviderId('foo')->setId('bar'); + + $this->config->method('getAppValue') + ->will($this->returnValueMap([ + ['core', 'shareapi_enforce_expire_date', 'no', 'yes'], + ])); + + $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); + + $this->assertNull($share->getExpirationDate()); + } + + public function testvalidateExpirationDateEnforceButNotSetNewShare() { + $share = $this->manager->newShare(); + + $this->config->method('getAppValue') + ->will($this->returnValueMap([ + ['core', 'shareapi_enforce_expire_date', 'no', 'yes'], + ['core', 'shareapi_expire_after_n_days', '7', '3'], + ['core', 'shareapi_default_expire_date', 'no', 'yes'], + ])); + + $expected = new \DateTime(); + $expected->setTime(0,0,0); + $expected->add(new \DateInterval('P3D')); + + $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); + + $this->assertNotNull($share->getExpirationDate()); + $this->assertEquals($expected, $share->getExpirationDate()); + } + public function testvalidateExpirationDateEnforceToFarIntoFuture() { // Expire date in the past $future = new \DateTime(); @@ -769,9 +845,9 @@ class ManagerTest extends \Test\TestCase { return $data['expirationDate'] == $future; })); - $future = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); + $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); - $this->assertEquals($expected, $future); + $this->assertEquals($expected, $share->getExpirationDate()); } public function testvalidateExpirationDateNoDateNoDefaultNull() { @@ -787,26 +863,27 @@ class ManagerTest extends \Test\TestCase { $hookListner = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock(); \OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListner, 'listener'); $hookListner->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) { - return $data['expirationDate'] == $expected; + return $data['expirationDate'] == $expected && $data['passwordSet'] === false; })); - $res = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); + $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); - $this->assertEquals($expected, $res); + $this->assertEquals($expected, $share->getExpirationDate()); } public function testvalidateExpirationDateNoDateNoDefault() { $hookListner = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock(); \OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListner, 'listener'); $hookListner->expects($this->once())->method('listener')->with($this->callback(function ($data) { - return $data['expirationDate'] === null; + return $data['expirationDate'] === null && $data['passwordSet'] === true; })); $share = $this->manager->newShare(); + $share->setPassword('password'); - $date = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); + $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]); - $this->assertNull($date); + $this->assertNull($share->getExpirationDate()); } public function testvalidateExpirationDateNoDateDefault() { diff --git a/tests/ocs-provider/provider.php b/tests/ocs-provider/provider.php index 07d66b36258..17f557b16b5 100644 --- a/tests/ocs-provider/provider.php +++ b/tests/ocs-provider/provider.php @@ -57,12 +57,14 @@ class OcsProviderTest extends \Test\TestCase { $expected = new \OCP\AppFramework\Http\JSONResponse( [ 'version' => 2, - 'PRIVATE_DATA' => [ - 'version' => 1, - 'endpoints' => [ - 'store' => '/ocs/v2.php/privatedata/setattribute', - 'read' => '/ocs/v2.php/privatedata/getattribute', - 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + 'services' => [ + 'PRIVATE_DATA' => [ + 'version' => 1, + 'endpoints' => [ + 'store' => '/ocs/v2.php/privatedata/setattribute', + 'read' => '/ocs/v2.php/privatedata/getattribute', + 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + ], ], ], ] @@ -91,25 +93,27 @@ class OcsProviderTest extends \Test\TestCase { $expected = new \OCP\AppFramework\Http\JSONResponse( [ 'version' => 2, - 'PRIVATE_DATA' => [ - 'version' => 1, - 'endpoints' => [ - 'store' => '/ocs/v2.php/privatedata/setattribute', - 'read' => '/ocs/v2.php/privatedata/getattribute', - 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + 'services' => [ + 'PRIVATE_DATA' => [ + 'version' => 1, + 'endpoints' => [ + 'store' => '/ocs/v2.php/privatedata/setattribute', + 'read' => '/ocs/v2.php/privatedata/getattribute', + 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + ], ], - ], - 'FEDERATED_SHARING' => [ - 'version' => 1, - 'endpoints' => [ - 'share' => '/ocs/v2.php/cloud/shares', - 'webdav' => '/public.php/webdav/', + 'FEDERATED_SHARING' => [ + 'version' => 1, + 'endpoints' => [ + 'share' => '/ocs/v2.php/cloud/shares', + 'webdav' => '/public.php/webdav/', + ], ], - ], - 'SHARING' => [ - 'version' => 1, - 'endpoints' => [ - 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', + 'SHARING' => [ + 'version' => 1, + 'endpoints' => [ + 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', + ], ], ], ] @@ -127,39 +131,41 @@ class OcsProviderTest extends \Test\TestCase { $expected = new \OCP\AppFramework\Http\JSONResponse( [ 'version' => 2, - 'PRIVATE_DATA' => [ - 'version' => 1, - 'endpoints' => [ - 'store' => '/ocs/v2.php/privatedata/setattribute', - 'read' => '/ocs/v2.php/privatedata/getattribute', - 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + 'services' => [ + 'PRIVATE_DATA' => [ + 'version' => 1, + 'endpoints' => [ + 'store' => '/ocs/v2.php/privatedata/setattribute', + 'read' => '/ocs/v2.php/privatedata/getattribute', + 'delete' => '/ocs/v2.php/privatedata/deleteattribute', + ], ], - ], - 'FEDERATED_SHARING' => [ - 'version' => 1, - 'endpoints' => [ - 'share' => '/ocs/v2.php/cloud/shares', - 'webdav' => '/public.php/webdav/', + 'FEDERATED_SHARING' => [ + 'version' => 1, + 'endpoints' => [ + 'share' => '/ocs/v2.php/cloud/shares', + 'webdav' => '/public.php/webdav/', + ], ], - ], - 'SHARING' => [ - 'version' => 1, - 'endpoints' => [ - 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', + 'SHARING' => [ + 'version' => 1, + 'endpoints' => [ + 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', + ], ], - ], - 'ACTIVITY' => [ - 'version' => 1, - 'endpoints' => [ - 'list' => '/ocs/v2.php/cloud/activity', + 'ACTIVITY' => [ + 'version' => 1, + 'endpoints' => [ + 'list' => '/ocs/v2.php/cloud/activity', + ], ], - ], - 'PROVISIONING' => [ - 'version' => 1, - 'endpoints' => [ - 'user' => '/ocs/v2.php/cloud/users', - 'groups' => '/ocs/v2.php/cloud/groups', - 'apps' => '/ocs/v2.php/cloud/apps', + 'PROVISIONING' => [ + 'version' => 1, + 'endpoints' => [ + 'user' => '/ocs/v2.php/cloud/users', + 'groups' => '/ocs/v2.php/cloud/groups', + 'apps' => '/ocs/v2.php/cloud/apps', + ], ], ], ] diff --git a/version.php b/version.php index 4ae94717c3d..d7b80142144 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 0, 0, 13); +$OC_Version = array(9, 0, 0, 15); // The human readable string $OC_VersionString = '9.0.0 beta 2'; |
