summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Command/Upgrade.php10
-rw-r--r--core/Controller/ContactsMenuController.php17
-rw-r--r--core/css/inputs.scss5
-rw-r--r--core/css/share.scss19
-rw-r--r--core/js/core.json1
-rw-r--r--core/js/jquery.contactsmenu.js117
-rw-r--r--core/js/merged-template-prepend.json3
-rw-r--r--core/js/sharedialogresharerinfoview.js5
-rw-r--r--core/js/sharedialogshareelistview.js15
-rw-r--r--core/js/shareitemmodel.js14
-rw-r--r--core/js/tests/specs/jquery.contactsmenuSpec.js213
-rw-r--r--core/js/tests/specs/shareitemmodelSpec.js61
-rw-r--r--core/l10n/de.js13
-rw-r--r--core/l10n/de.json13
-rw-r--r--core/l10n/de_DE.js13
-rw-r--r--core/l10n/de_DE.json13
-rw-r--r--core/l10n/es_MX.js18
-rw-r--r--core/l10n/es_MX.json18
-rw-r--r--core/l10n/fi.js5
-rw-r--r--core/l10n/fi.json5
-rw-r--r--core/l10n/fr.js8
-rw-r--r--core/l10n/fr.json8
-rw-r--r--core/l10n/is.js29
-rw-r--r--core/l10n/is.json29
-rw-r--r--core/l10n/nb.js32
-rw-r--r--core/l10n/nb.json32
-rw-r--r--core/l10n/nl.js18
-rw-r--r--core/l10n/nl.json18
-rw-r--r--core/l10n/pl.js21
-rw-r--r--core/l10n/pl.json21
-rw-r--r--core/l10n/pt_BR.js13
-rw-r--r--core/l10n/pt_BR.json13
-rw-r--r--core/l10n/ru.js15
-rw-r--r--core/l10n/ru.json15
-rw-r--r--core/l10n/tr.js13
-rw-r--r--core/l10n/tr.json13
-rw-r--r--core/routes.php1
37 files changed, 855 insertions, 22 deletions
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index aec74849fea..2e518f52e21 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -87,12 +87,6 @@ class Upgrade extends Command {
*/
protected function execute(InputInterface $input, OutputInterface $output) {
- $skip3rdPartyAppsDisable = false;
-
- if ($input->getOption('no-app-disable')) {
- $skip3rdPartyAppsDisable = true;
- }
-
if(\OC::checkUpgrade(false)) {
if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
// Prepend each line with a little timestamp
@@ -107,7 +101,9 @@ class Upgrade extends Command {
$this->logger
);
- $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable);
+ if ($input->getOption('no-app-disable')) {
+ $updater->setSkip3rdPartyAppsDisable(true);
+ }
$dispatcher = \OC::$server->getEventDispatcher();
$progress = new ProgressBar($output);
$progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%");
diff --git a/core/Controller/ContactsMenuController.php b/core/Controller/ContactsMenuController.php
index b0e0e0c6a77..bbb990f1a4f 100644
--- a/core/Controller/ContactsMenuController.php
+++ b/core/Controller/ContactsMenuController.php
@@ -26,6 +26,7 @@ namespace OC\Core\Controller;
use OC\Contacts\ContactsMenu\Manager;
use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\IUserSession;
@@ -59,4 +60,20 @@ class ContactsMenuController extends Controller {
return $this->manager->getEntries($this->userSession->getUser(), $filter);
}
+ /**
+ * @NoAdminRequired
+ *
+ * @param integer $shareType
+ * @param string $shareWith
+ * @return JSONResponse
+ */
+ public function findOne($shareType, $shareWith) {
+ $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
+
+ if ($contact) {
+ return $contact;
+ } else {
+ return new JSONResponse([], Http::STATUS_NOT_FOUND);
+ }
+ }
}
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index e76e5bea150..13a164e13f2 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -206,7 +206,6 @@ input {
height: 1px;
overflow: hidden;
+ label {
- padding: 6px 0;
user-select: none;
}
&:disabled + label,
@@ -220,8 +219,8 @@ input {
width: 12px;
vertical-align: middle;
border-radius: 50%;
- margin: 6px;
- margin-top: -2px;
+ margin: 3px;
+ margin-top: 1px;
border: 1px solid nc-lighten($color-main-text, 53%);
}
&:not(:disabled):not(:checked) + label:hover:before,
diff --git a/core/css/share.scss b/core/css/share.scss
index 552e20c80cc..2e1c99b6f41 100644
--- a/core/css/share.scss
+++ b/core/css/share.scss
@@ -87,6 +87,7 @@
list-style-type: none;
padding: 8px;
> li {
+ position: relative;
padding-top: 10px;
padding-bottom: 10px;
font-weight: bold;
@@ -103,6 +104,7 @@
padding: 3px 6px;
}
}
+
.shareOption {
white-space: nowrap;
display: inline-block;
@@ -159,6 +161,10 @@ a {
padding: 6px 4px;
}
+.resharerInfoView.subView {
+ position: relative;
+}
+
#defaultExpireMessage, .reshare {
/* fix shared by text going out of box */
white-space: normal;
@@ -185,6 +191,19 @@ a {
color: rgba($color-main-text, .4);
}
+.contactsmenu-popover {
+ left: -8px;
+ right: auto;
+ padding: 3px 6px;
+ li.hidden {
+ display: none !important;
+ }
+ &:after {
+ left: 8px;
+ right: auto;
+ }
+}
+
.popovermenu .datepicker {
margin-left: 35px;
}
diff --git a/core/js/core.json b/core/js/core.json
index aadd66a0558..15e406bf2d2 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -20,6 +20,7 @@
"libraries": [
"jquery-showpassword.js",
"jquery.avatar.js",
+ "jquery.contactsmenu.js",
"placeholder.js"
],
"modules": [
diff --git a/core/js/jquery.contactsmenu.js b/core/js/jquery.contactsmenu.js
new file mode 100644
index 00000000000..1ea9f732f79
--- /dev/null
+++ b/core/js/jquery.contactsmenu.js
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2017 Georg Ehrke <oc.list@georgehrke.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+(function ($) {
+ var ENTRY = ''
+ + '<li>'
+ + ' <a href="{{hyperlink}}">'
+ + ' {{#if icon}}<img src="{{icon}}">{{/if}}'
+ + ' <span>{{title}}</span>'
+ + ' </a>'
+ + '</li>';
+
+ var LIST = ''
+ + '<div class="menu popovermenu bubble hidden contactsmenu-popover">'
+ + ' <ul>'
+ + ' <li>'
+ + ' <a>'
+ + ' <span class="icon-loading-small"></span>'
+ + ' </a>'
+ + ' </li>'
+ + ' </ul>'
+ + '</div>';
+
+ $.fn.contactsMenu = function(shareWith, shareType, appendTo) {
+ // 0 - user, 4 - email, 6 - remote
+ var allowedTypes = [0, 4, 6];
+ if (allowedTypes.indexOf(shareType) === -1) {
+ return;
+ }
+
+ var $div = this;
+ appendTo.append(LIST);
+ var $list = appendTo.find('div.contactsmenu-popover');
+
+ $div.click(function() {
+ if (!$list.hasClass('hidden')) {
+ $list.addClass('hidden');
+ $list.hide();
+ return;
+ }
+
+ $list.removeClass('hidden');
+ $list.show();
+
+ if ($list.hasClass('loaded')) {
+ return;
+ }
+
+ $list.addClass('loaded');
+ $.ajax(OC.generateUrl('/contactsmenu/findOne'), {
+ method: 'POST',
+ data: {
+ shareType: shareType,
+ shareWith: shareWith
+ }
+ }).then(function(data) {
+ $list.find('ul').find('li').addClass('hidden');
+
+ var actions;
+ if (!data.topAction) {
+ actions = [{
+ hyperlink: '#',
+ title: t('core', 'No action available')
+ }];
+ } else {
+ actions = [data.topAction].concat(data.actions);
+ }
+
+ actions.forEach(function(action) {
+ var template = Handlebars.compile(ENTRY);
+ $list.find('ul').append(template(action));
+ });
+
+ if (actions.length === 0) {
+
+ }
+ }, function(jqXHR) {
+ $list.find('ul').find('li').addClass('hidden');
+
+ var title;
+ if (jqXHR.status === 404) {
+ title = t('core', 'No action available');
+ } else {
+ title = t('core', 'Error fetching contact actions');
+ }
+
+ var template = Handlebars.compile(ENTRY);
+ $list.find('ul').append(template({
+ hyperlink: '#',
+ title: title
+ }));
+ });
+ });
+
+ $(document).click(function(event) {
+ var clickedList = ($list.has(event.target).length > 0);
+ var clickedTarget = ($div.has(event.target).length > 0);
+
+ $div.each(function() {
+ if ($(this).is(event.target)) {
+ clickedTarget = true;
+ }
+ });
+
+ if (clickedList || clickedTarget) {
+ return;
+ }
+
+ $list.addClass('hidden');
+ $list.hide();
+ });
+ };
+}(jQuery));
diff --git a/core/js/merged-template-prepend.json b/core/js/merged-template-prepend.json
index 12b7ca8faa3..0dd6bed5329 100644
--- a/core/js/merged-template-prepend.json
+++ b/core/js/merged-template-prepend.json
@@ -13,5 +13,6 @@
"mimetypelist.js",
"oc-backbone.js",
"placeholder.js",
- "jquery.avatar.js"
+ "jquery.avatar.js",
+ "jquery.contactsmenu.js"
]
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index a82b495bdcc..201484c52a8 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -100,6 +100,11 @@
$this.avatar($this.data('username'), 32);
});
+ this.$el.find('.reshare').contactsMenu(
+ this.model.getReshareOwner(),
+ OC.Share.SHARE_TYPE_USER,
+ this.$el);
+
return this;
},
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 3a481e53dde..f513eb75848 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -26,7 +26,7 @@
'{{#each sharees}}' +
'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' +
'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" data-displayname="{{shareWithDisplayName}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
- '<span class="has-tooltip username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
+ '<span class="username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
'<span class="sharingOptionsGroup">' +
'{{#if editPermissionPossible}}' +
'<span class="shareOption">' +
@@ -361,6 +361,15 @@
this.$('.has-tooltip').tooltip({
placement: 'bottom'
});
+
+ this.$('ul.shareWithList > li').each(function() {
+ var $this = $(this);
+
+ var shareWith = $this.data('share-with');
+ var shareType = $this.data('share-type');
+
+ $this.find('div.avatar, span.username').contactsMenu(shareWith, shareType, $this);
+ })
} else {
var permissionChangeShareId = parseInt(this._renderPermissionChange, 10);
var shareWithIndex = this.model.findShareWithIndex(permissionChangeShareId);
@@ -399,7 +408,7 @@
var shareId = parseInt(this._menuOpen, 10);
if(!_.isNaN(shareId)) {
var liSelector = 'li[data-share-id=' + shareId + ']';
- OC.showMenu(null, this.$(liSelector + ' .popovermenu'));
+ OC.showMenu(null, this.$(liSelector + '.sharingOptionsGroup .popovermenu'));
}
}
@@ -476,7 +485,7 @@
event.stopPropagation();
var $element = $(event.target);
var $li = $element.closest('li[data-share-id]');
- var $menu = $li.find('.popovermenu');
+ var $menu = $li.find('.sharingOptionsGroup .popovermenu');
OC.showMenu(null, $menu);
this._menuOpen = $li.data('share-id');
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 41f9eb5e0aa..4118a8a0188 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -841,6 +841,20 @@
}
}
return time;
+ },
+
+ /**
+ * Returns a list of share types from the existing shares.
+ *
+ * @return {Array.<int>} array of share types
+ */
+ getShareTypes: function() {
+ var result;
+ result = _.pluck(this.getSharesWithCurrentItem(), 'share_type');
+ if (this.hasLinkShare()) {
+ result.push(OC.Share.SHARE_TYPE_LINK);
+ }
+ return _.uniq(result);
}
});
diff --git a/core/js/tests/specs/jquery.contactsmenuSpec.js b/core/js/tests/specs/jquery.contactsmenuSpec.js
new file mode 100644
index 00000000000..7287648f5a2
--- /dev/null
+++ b/core/js/tests/specs/jquery.contactsmenuSpec.js
@@ -0,0 +1,213 @@
+/**
+ * Copyright (c) 2017 Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('jquery.contactsMenu tests', function() {
+
+ var $selector1, $selector2, $appendTo;
+
+ beforeEach(function() {
+ $('#testArea').append($('<div id="selector1">'));
+ $('#testArea').append($('<div id="selector2">'));
+ $('#testArea').append($('<div id="appendTo">'));
+ $selector1 = $('#selector1');
+ $selector2 = $('#selector2');
+ $appendTo = $('#appendTo');
+ });
+
+ afterEach(function() {
+ $selector1.remove();
+ $selector2.remove();
+ $appendTo.remove();
+ });
+
+ describe('shareType', function() {
+ it('stops if type not supported', function() {
+ $selector1.contactsMenu('user', 1, $appendTo);
+ expect($appendTo.children().length).toEqual(0);
+
+ $selector1.contactsMenu('user', 2, $appendTo);
+ expect($appendTo.children().length).toEqual(0);
+
+ $selector1.contactsMenu('user', 3, $appendTo);
+ expect($appendTo.children().length).toEqual(0);
+
+ $selector1.contactsMenu('user', 5, $appendTo);
+ expect($appendTo.children().length).toEqual(0);
+ });
+
+ it('append list if shareType supported', function() {
+ $selector1.contactsMenu('user', 0, $appendTo);
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble hidden contactsmenu-popover"> <ul> <li> <a> <span class="icon-loading-small"></span> </a> </li> </ul></div>');
+ });
+ });
+
+ describe('open on click', function() {
+ it('with one selector', function() {
+ $selector1.contactsMenu('user', 0, $appendTo);
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(true);
+ $selector1.click();
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(false);
+ });
+
+ it('with multiple selectors - 1', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(true);
+ $selector1.click();
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(false);
+ });
+
+ it('with multiple selectors - 2', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(true);
+ $selector2.click();
+ expect($appendTo.find('div.contactsmenu-popover').hasClass('hidden')).toEqual(false);
+ });
+
+ it ('should close when clicking the selector again - 1', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ $selector1.click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(false);
+ $selector1.click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ });
+
+ it ('should close when clicking the selector again - 1', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+
+ expect($appendTo.children().length).toEqual(1);
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ $selector1.click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(false);
+ $selector2.click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ });
+ });
+
+ describe('send requests to the server and render', function() {
+ it('load a topaction only', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+ $selector1.click();
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ JSON.stringify({
+ "id": null,
+ "fullName": "Name 123",
+ "topAction": {
+ "title": "bar@baz.wtf",
+ "icon": "foo.svg",
+ "hyperlink": "mailto:bar%40baz.wtf"},
+ "actions": []
+ })
+ );
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
+
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li></ul></div>');
+ });
+
+ it('load topaction and more actions', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+ $selector1.click();
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ JSON.stringify({
+ "id": null,
+ "fullName": "Name 123",
+ "topAction": {
+ "title": "bar@baz.wtf",
+ "icon": "foo.svg",
+ "hyperlink": "mailto:bar%40baz.wtf"},
+ "actions": [{
+ "title": "Details",
+ "icon": "details.svg",
+ "hyperlink": "http:\/\/localhost\/index.php\/apps\/contacts"
+ }]
+ })
+ );
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
+
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li><li> <a href="http://localhost/index.php/apps/contacts"> <img src="details.svg"> <span>Details</span> </a></li></ul></div>');
+ });
+
+ it('load no actions', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+ $selector1.click();
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ JSON.stringify({
+ "id": null,
+ "fullName": "Name 123",
+ "topAction": null,
+ "actions": []
+ })
+ );
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
+
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>');
+ });
+
+ it('should throw an error', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+ $selector1.click();
+
+ fakeServer.requests[0].respond(
+ 400,
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ JSON.stringify([])
+ );
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
+
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>Error fetching contact actions</span> </a></li></ul></div>');
+ });
+
+ it('should handle 404', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+ $selector1.click();
+
+ fakeServer.requests[0].respond(
+ 404,
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ JSON.stringify([])
+ );
+ expect(fakeServer.requests[0].method).toEqual('POST');
+ expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
+
+ expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>');
+ });
+ });
+
+ it('click anywhere else to close the menu', function() {
+ $('#selector1, #selector2').contactsMenu('user', 0, $appendTo);
+
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ $selector1.click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(false);
+ $(document).click();
+ expect($appendTo.find('div').hasClass('hidden')).toEqual(true);
+ });
+});
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 771a9263709..3b17051508e 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -924,5 +924,66 @@ describe('OC.Share.ShareItemModel', function() {
expect(errorStub.lastCall.args[1]).toEqual('Some error message');
});
});
+
+ describe('getShareTypes', function() {
+
+ var dataProvider = [
+ [
+ ],
+ [
+ OC.Share.SHARE_TYPE_USER,
+ OC.Share.SHARE_TYPE_USER,
+ ],
+ [
+ OC.Share.SHARE_TYPE_USER,
+ OC.Share.SHARE_TYPE_GROUP,
+ OC.Share.SHARE_TYPE_LINK,
+ OC.Share.SHARE_TYPE_REMOTE
+ ],
+ [
+ OC.Share.SHARE_TYPE_USER,
+ OC.Share.SHARE_TYPE_GROUP,
+ OC.Share.SHARE_TYPE_GROUP,
+ OC.Share.SHARE_TYPE_LINK,
+ OC.Share.SHARE_TYPE_LINK,
+ OC.Share.SHARE_TYPE_REMOTE,
+ OC.Share.SHARE_TYPE_REMOTE,
+ OC.Share.SHARE_TYPE_REMOTE
+ ],
+ [
+ OC.Share.SHARE_TYPE_LINK,
+ OC.Share.SHARE_TYPE_LINK,
+ OC.Share.SHARE_TYPE_USER
+ ]
+ ];
+
+ _.each(dataProvider, function testCase(shareTypes, i) {
+ it('returns set of share types for case ' + i, function() {
+ /* jshint camelcase: false */
+ fetchReshareDeferred.resolve(makeOcsResponse([]));
+
+ var id = 100;
+ var shares = _.map(shareTypes, function(shareType) {
+ return {
+ id: id++,
+ item_source: 123,
+ permissions: 31,
+ share_type: shareType,
+ uid_owner: 'root'
+ };
+ });
+
+ var expectedResult = _.uniq(shareTypes).sort();
+
+ fetchSharesDeferred.resolve(makeOcsResponse(shares));
+
+ OC.currentUser = 'root';
+
+ model.fetch();
+
+ expect(model.getShareTypes().sort()).toEqual(expectedResult);
+ });
+ });
+ });
});
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 18e2faae626..a711c566fc9 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Keine Beschnittdaten zur Verfügung gestellt",
"No valid crop data provided" : "Keine gültigen Zuschnittdaten zur Verfügung gestellt",
"Crop is not square" : "Zuschnitt ist nicht quadratisch",
+ "State token does not match" : "Status-Token stimmen nicht überein",
+ "Auth flow can only be started unauthenticated." : "Der Authentifizierungs-Ablauf kann nur als \"nicht angemeldet\" gestartet werden.",
"Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
"Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Es konnte keine E-Mail verschickt werden um das Passwort zurückzusetzten, da keine E-Mail im Benutzerkonto hinterlegt ist. Bitte kontaktiere deinen Administrator.",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (inkompatibel)",
"Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s",
"Already up to date" : "Bereits aktuell",
+ "No contacts found" : "Keine Adressen gefunden",
+ "Show all contacts …" : "Zeige alle Adressen...",
+ "There was an error loading your contacts" : "Fehler beim Laden Deiner Adressen",
+ "Loading your contacts …" : "Lade Deine Adressen...",
+ "Looking for {term} …" : "Suche nach {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Fehler aufgetreten. Mehr Informationen…</a>",
+ "No action available" : "Keine Aktion verfügbar",
+ "Error fetching contact actions" : "Fehler beim Einlesen der Adress-Aktionen",
"Settings" : "Einstellungen",
"Connection to server lost" : "Verbindung zum Server verloren",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in %n Sekunden nochmals geladen"],
@@ -265,6 +274,10 @@ OC.L10N.register(
"Log in" : "Anmelden",
"Stay logged in" : "Angemeldet bleiben",
"Alternative Logins" : "Alternative Logins",
+ "You are about to grant \"%s\" access to your %s account." : "Du bist dabei \"%s\" Zugriff auf Dein %s-Konto zu gewähren.",
+ "App token" : "App-Token",
+ "Alternative login using app token" : "Alternative Anmeldung via App-Token",
+ "Redirecting …" : "Weiterleiten...",
"New password" : "Neues Passwort",
"New Password" : "Neues Passwort",
"Reset password" : "Passwort zurücksetzen",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 58154223dcc..91aa452426f 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Keine Beschnittdaten zur Verfügung gestellt",
"No valid crop data provided" : "Keine gültigen Zuschnittdaten zur Verfügung gestellt",
"Crop is not square" : "Zuschnitt ist nicht quadratisch",
+ "State token does not match" : "Status-Token stimmen nicht überein",
+ "Auth flow can only be started unauthenticated." : "Der Authentifizierungs-Ablauf kann nur als \"nicht angemeldet\" gestartet werden.",
"Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
"Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Es konnte keine E-Mail verschickt werden um das Passwort zurückzusetzten, da keine E-Mail im Benutzerkonto hinterlegt ist. Bitte kontaktiere deinen Administrator.",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (inkompatibel)",
"Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s",
"Already up to date" : "Bereits aktuell",
+ "No contacts found" : "Keine Adressen gefunden",
+ "Show all contacts …" : "Zeige alle Adressen...",
+ "There was an error loading your contacts" : "Fehler beim Laden Deiner Adressen",
+ "Loading your contacts …" : "Lade Deine Adressen...",
+ "Looking for {term} …" : "Suche nach {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Fehler aufgetreten. Mehr Informationen…</a>",
+ "No action available" : "Keine Aktion verfügbar",
+ "Error fetching contact actions" : "Fehler beim Einlesen der Adress-Aktionen",
"Settings" : "Einstellungen",
"Connection to server lost" : "Verbindung zum Server verloren",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in %n Sekunden nochmals geladen"],
@@ -263,6 +272,10 @@
"Log in" : "Anmelden",
"Stay logged in" : "Angemeldet bleiben",
"Alternative Logins" : "Alternative Logins",
+ "You are about to grant \"%s\" access to your %s account." : "Du bist dabei \"%s\" Zugriff auf Dein %s-Konto zu gewähren.",
+ "App token" : "App-Token",
+ "Alternative login using app token" : "Alternative Anmeldung via App-Token",
+ "Redirecting …" : "Weiterleiten...",
"New password" : "Neues Passwort",
"New Password" : "Neues Passwort",
"Reset password" : "Passwort zurücksetzen",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index c2611c74707..bfc11aa718e 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Keine Beschnittdaten zur Verfügung gestellt",
"No valid crop data provided" : "Keine gültigen Zuschnittdaten zur Verfügung gestellt",
"Crop is not square" : "Zuschnitt ist nicht quadratisch",
+ "State token does not match" : "Status-Token stimmen nicht überein",
+ "Auth flow can only be started unauthenticated." : "Der Authentifizierungs-Ablauf kann nur als \"nicht angemeldet\" gestartet werden.",
"Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
"Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Es konnte keine E-Mail verschickt werden um das Passwort zurückzusetzten, da keine E-Mail im Benutzerkonto hinterlegt ist. Bitte kontaktieren Sie den Administrator.",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (inkompatibel)",
"Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s",
"Already up to date" : "Bereits aktuell",
+ "No contacts found" : "Keine Adressen gefunden",
+ "Show all contacts …" : "Zeige alle Adressen...",
+ "There was an error loading your contacts" : "Fehler beim Laden Ihrer Adressen",
+ "Loading your contacts …" : "Lade Ihre Adressen ...",
+ "Looking for {term} …" : "Suche nach {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>",
+ "No action available" : "Keine AKtion verfügbar",
+ "Error fetching contact actions" : "Fehler beim Einlesen der Adress-Aktionen",
"Settings" : "Einstellungen",
"Connection to server lost" : "Verbindung zum Server verloren",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite. Seite wird in %n Sekunden erneut geladen"],
@@ -265,6 +274,10 @@ OC.L10N.register(
"Log in" : "Einloggen",
"Stay logged in" : "Angemeldet bleiben",
"Alternative Logins" : "Alternative Logins",
+ "You are about to grant \"%s\" access to your %s account." : "Sie sind dabei \"%s\" Zugriff auf Ihr %s-Konto zu gewähren.",
+ "App token" : "App-Token",
+ "Alternative login using app token" : "Alternative Anmeldung via App-Token",
+ "Redirecting …" : "Weiterleiten ...",
"New password" : "Neues Passwort",
"New Password" : "Neues Passwort",
"Reset password" : "Passwort zurücksetzen",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index f165b0ccbbe..76fd09148ee 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Keine Beschnittdaten zur Verfügung gestellt",
"No valid crop data provided" : "Keine gültigen Zuschnittdaten zur Verfügung gestellt",
"Crop is not square" : "Zuschnitt ist nicht quadratisch",
+ "State token does not match" : "Status-Token stimmen nicht überein",
+ "Auth flow can only be started unauthenticated." : "Der Authentifizierungs-Ablauf kann nur als \"nicht angemeldet\" gestartet werden.",
"Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
"Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Es konnte keine E-Mail verschickt werden um das Passwort zurückzusetzten, da keine E-Mail im Benutzerkonto hinterlegt ist. Bitte kontaktieren Sie den Administrator.",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (inkompatibel)",
"Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s",
"Already up to date" : "Bereits aktuell",
+ "No contacts found" : "Keine Adressen gefunden",
+ "Show all contacts …" : "Zeige alle Adressen...",
+ "There was an error loading your contacts" : "Fehler beim Laden Ihrer Adressen",
+ "Loading your contacts …" : "Lade Ihre Adressen ...",
+ "Looking for {term} …" : "Suche nach {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>",
+ "No action available" : "Keine AKtion verfügbar",
+ "Error fetching contact actions" : "Fehler beim Einlesen der Adress-Aktionen",
"Settings" : "Einstellungen",
"Connection to server lost" : "Verbindung zum Server verloren",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite. Seite wird in %n Sekunden erneut geladen"],
@@ -263,6 +272,10 @@
"Log in" : "Einloggen",
"Stay logged in" : "Angemeldet bleiben",
"Alternative Logins" : "Alternative Logins",
+ "You are about to grant \"%s\" access to your %s account." : "Sie sind dabei \"%s\" Zugriff auf Ihr %s-Konto zu gewähren.",
+ "App token" : "App-Token",
+ "Alternative login using app token" : "Alternative Anmeldung via App-Token",
+ "Redirecting …" : "Weiterleiten ...",
"New password" : "Neues Passwort",
"New Password" : "Neues Passwort",
"Reset password" : "Passwort zurücksetzen",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 89a263e3972..bf2e584c82d 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "No se han proporcionado datos del recorte",
"No valid crop data provided" : "No se han proporcionado datos válidos del recorte",
"Crop is not square" : "El recorte no está cuadrado",
+ "State token does not match" : "La ficha de estado no corresponde",
+ "Auth flow can only be started unauthenticated." : "El flujo de autenticación solo se puede iniciar sin encontrarse autenticado. ",
"Couldn't reset password because the token is invalid" : "No ha sido posible restablecer la contraseña porque la ficha es inválida",
"Couldn't reset password because the token is expired" : "No ha sido posible restablecer la contraseña porque la ficha ha expirado",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "No fue posible enviar el correo electrónico para restablecer porque no hay una dirección de correo electrónico para este usuario. Favor de contactar a su adminsitrador. ",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Las siguientes aplicaciones han sido deshabilitadas: %s",
"Already up to date" : "Ya está actualizado",
+ "No contacts found" : "No se encontraron contactos",
+ "Show all contacts …" : "Mostrar todos los contactos ...",
+ "There was an error loading your contacts" : "Se presentó un error al cargar sus contactos",
+ "Loading your contacts …" : "Cargando sus contactos ... ",
+ "Looking for {term} …" : "Buscando {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Se presentaron problemas con la verificación de integridad del código. Mayor información ...</a>",
+ "No action available" : "No hay acciones disponibles",
+ "Error fetching contact actions" : "Se presentó un error al traer las acciónes de contatos",
"Settings" : "Ajustes",
"Connection to server lost" : "Se ha perdido la conexión con el servidor",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Se presentó un erorr al cargar la página, recargando en %n segundo","Se presentó un erorr al cargar la página, recargando en %n segundo"],
@@ -162,7 +171,12 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (correo electrónico)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Compartir",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Comparta con otras personas ingresando un usuario, un grupo, un ID de nube federado o una dirección de correo electrónico.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Comparta con otras personas ingresando un usuario, un grupo o un ID de nube federado.",
+ "Share with other people by entering a user or group or an email address." : "Comparta con otras personas ingresando un usuario, un grupo o una dirección de correo electrónico.",
"Name or email address..." : "Nombre o dirección de correo electrónico",
+ "Name or federated cloud ID..." : "Nombre o ID de nube federada...",
+ "Name, federated cloud ID or email address..." : "Nombre, ID de nube federada o dirección de correo electrónico...",
"Name..." : "Nombre...",
"Error removing share" : "Se presentó un error al dejar de compartir",
"Non-existing tag #{tag}" : "Etiqueta #{tag} no-existente",
@@ -260,6 +274,10 @@ OC.L10N.register(
"Log in" : "Ingresar",
"Stay logged in" : "Mantener la sesión abierta",
"Alternative Logins" : "Accesos Alternativos",
+ "You are about to grant \"%s\" access to your %s account." : "Está apunto de concederle a \"%s\" acceso a su cuenta %s.",
+ "App token" : "Ficha de la aplicación",
+ "Alternative login using app token" : "Inicio de sesión alternativo usando la ficha de la aplicación",
+ "Redirecting …" : "Redireccionando ... ",
"New password" : "Nueva contraseña",
"New Password" : "Nueva Contraseña",
"Reset password" : "Restablecer contraseña",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index eacce9aac86..46c1a003bfc 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -12,6 +12,8 @@
"No crop data provided" : "No se han proporcionado datos del recorte",
"No valid crop data provided" : "No se han proporcionado datos válidos del recorte",
"Crop is not square" : "El recorte no está cuadrado",
+ "State token does not match" : "La ficha de estado no corresponde",
+ "Auth flow can only be started unauthenticated." : "El flujo de autenticación solo se puede iniciar sin encontrarse autenticado. ",
"Couldn't reset password because the token is invalid" : "No ha sido posible restablecer la contraseña porque la ficha es inválida",
"Couldn't reset password because the token is expired" : "No ha sido posible restablecer la contraseña porque la ficha ha expirado",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "No fue posible enviar el correo electrónico para restablecer porque no hay una dirección de correo electrónico para este usuario. Favor de contactar a su adminsitrador. ",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Las siguientes aplicaciones han sido deshabilitadas: %s",
"Already up to date" : "Ya está actualizado",
+ "No contacts found" : "No se encontraron contactos",
+ "Show all contacts …" : "Mostrar todos los contactos ...",
+ "There was an error loading your contacts" : "Se presentó un error al cargar sus contactos",
+ "Loading your contacts …" : "Cargando sus contactos ... ",
+ "Looking for {term} …" : "Buscando {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Se presentaron problemas con la verificación de integridad del código. Mayor información ...</a>",
+ "No action available" : "No hay acciones disponibles",
+ "Error fetching contact actions" : "Se presentó un error al traer las acciónes de contatos",
"Settings" : "Ajustes",
"Connection to server lost" : "Se ha perdido la conexión con el servidor",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Se presentó un erorr al cargar la página, recargando en %n segundo","Se presentó un erorr al cargar la página, recargando en %n segundo"],
@@ -160,7 +169,12 @@
"{sharee} (email)" : "{sharee} (correo electrónico)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Compartir",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Comparta con otras personas ingresando un usuario, un grupo, un ID de nube federado o una dirección de correo electrónico.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Comparta con otras personas ingresando un usuario, un grupo o un ID de nube federado.",
+ "Share with other people by entering a user or group or an email address." : "Comparta con otras personas ingresando un usuario, un grupo o una dirección de correo electrónico.",
"Name or email address..." : "Nombre o dirección de correo electrónico",
+ "Name or federated cloud ID..." : "Nombre o ID de nube federada...",
+ "Name, federated cloud ID or email address..." : "Nombre, ID de nube federada o dirección de correo electrónico...",
"Name..." : "Nombre...",
"Error removing share" : "Se presentó un error al dejar de compartir",
"Non-existing tag #{tag}" : "Etiqueta #{tag} no-existente",
@@ -258,6 +272,10 @@
"Log in" : "Ingresar",
"Stay logged in" : "Mantener la sesión abierta",
"Alternative Logins" : "Accesos Alternativos",
+ "You are about to grant \"%s\" access to your %s account." : "Está apunto de concederle a \"%s\" acceso a su cuenta %s.",
+ "App token" : "Ficha de la aplicación",
+ "Alternative login using app token" : "Inicio de sesión alternativo usando la ficha de la aplicación",
+ "Redirecting …" : "Redireccionando ... ",
"New password" : "Nueva contraseña",
"New Password" : "Nueva Contraseña",
"Reset password" : "Restablecer contraseña",
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
index 2feec654d1e..12a26dbc354 100644
--- a/core/l10n/fi.js
+++ b/core/l10n/fi.js
@@ -49,6 +49,10 @@ OC.L10N.register(
"%s (incompatible)" : "%s (ei yhteensopiva)",
"Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
"Already up to date" : "Kaikki on jo ajan tasalla",
+ "No contacts found" : "Yhteystietoja ei löytynyt",
+ "Show all contacts …" : "Näytä kaikki yhteystiedot…",
+ "There was an error loading your contacts" : "Virhe yhteystietojasi ladatessa",
+ "Loading your contacts …" : "Ladataan yhteystietojasi…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Eheystarkistus tuotti ongelmia. Lisätietoja…</a>",
"Settings" : "Asetukset",
"Connection to server lost" : "Yhteys palvelimelle menetetty",
@@ -263,6 +267,7 @@ OC.L10N.register(
"Log in" : "Kirjaudu sisään",
"Stay logged in" : "Pysy sisäänkirjautuneena",
"Alternative Logins" : "Vaihtoehtoiset kirjautumistavat",
+ "Redirecting …" : "Ohjataan uudelleen…",
"New password" : "Uusi salasana",
"New Password" : "Uusi salasana",
"Reset password" : "Palauta salasana",
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
index 9fa22392e6a..f05e0c5b07c 100644
--- a/core/l10n/fi.json
+++ b/core/l10n/fi.json
@@ -47,6 +47,10 @@
"%s (incompatible)" : "%s (ei yhteensopiva)",
"Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
"Already up to date" : "Kaikki on jo ajan tasalla",
+ "No contacts found" : "Yhteystietoja ei löytynyt",
+ "Show all contacts …" : "Näytä kaikki yhteystiedot…",
+ "There was an error loading your contacts" : "Virhe yhteystietojasi ladatessa",
+ "Loading your contacts …" : "Ladataan yhteystietojasi…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Eheystarkistus tuotti ongelmia. Lisätietoja…</a>",
"Settings" : "Asetukset",
"Connection to server lost" : "Yhteys palvelimelle menetetty",
@@ -261,6 +265,7 @@
"Log in" : "Kirjaudu sisään",
"Stay logged in" : "Pysy sisäänkirjautuneena",
"Alternative Logins" : "Vaihtoehtoiset kirjautumistavat",
+ "Redirecting …" : "Ohjataan uudelleen…",
"New password" : "Uusi salasana",
"New Password" : "Uusi salasana",
"Reset password" : "Palauta salasana",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index ff14ca326c6..0af1365fa35 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -49,7 +49,12 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
"Already up to date" : "Déjà à jour",
+ "No contacts found" : "Aucun contact trouvé",
+ "Show all contacts …" : "Montrer tous les contacts...",
+ "There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts",
+ "Loading your contacts …" : "Chargement de vos contacts...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>",
+ "No action available" : "Aucune action disponible",
"Settings" : "Paramètres",
"Connection to server lost" : "Connexion au serveur perdu",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problème de chargement de la page, actualisation dans %n seconde","Problème de chargement de la page, actualisation dans %n secondes"],
@@ -162,6 +167,7 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Partager",
+ "Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.",
"Name or email address..." : "Nom ou adresse mail...",
"Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...",
"Name, federated cloud ID or email address..." : "Nom, ID du cloud fédéré ou adresse mail...",
@@ -262,6 +268,8 @@ OC.L10N.register(
"Log in" : "Se connecter",
"Stay logged in" : "Rester connecté",
"Alternative Logins" : "Identifiants alternatifs",
+ "You are about to grant \"%s\" access to your %s account." : "Vous êtes sur le point d'accorder à \"%s\" l'accès à votre compte \"%s\".",
+ "Redirecting …" : "Redirection en cours...",
"New password" : "Nouveau mot de passe",
"New Password" : "Nouveau mot de passe",
"Reset password" : "Réinitialiser le mot de passe",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 8892cac7b46..6ec370f579d 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -47,7 +47,12 @@
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
"Already up to date" : "Déjà à jour",
+ "No contacts found" : "Aucun contact trouvé",
+ "Show all contacts …" : "Montrer tous les contacts...",
+ "There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts",
+ "Loading your contacts …" : "Chargement de vos contacts...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>",
+ "No action available" : "Aucune action disponible",
"Settings" : "Paramètres",
"Connection to server lost" : "Connexion au serveur perdu",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problème de chargement de la page, actualisation dans %n seconde","Problème de chargement de la page, actualisation dans %n secondes"],
@@ -160,6 +165,7 @@
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Partager",
+ "Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.",
"Name or email address..." : "Nom ou adresse mail...",
"Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...",
"Name, federated cloud ID or email address..." : "Nom, ID du cloud fédéré ou adresse mail...",
@@ -260,6 +266,8 @@
"Log in" : "Se connecter",
"Stay logged in" : "Rester connecté",
"Alternative Logins" : "Identifiants alternatifs",
+ "You are about to grant \"%s\" access to your %s account." : "Vous êtes sur le point d'accorder à \"%s\" l'accès à votre compte \"%s\".",
+ "Redirecting …" : "Redirection en cours...",
"New password" : "Nouveau mot de passe",
"New Password" : "Nouveau mot de passe",
"Reset password" : "Réinitialiser le mot de passe",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index e27ac0a89b2..1f5f4676fec 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -14,9 +14,12 @@ OC.L10N.register(
"No crop data provided" : "Enginn gögn um utanskurð gefin",
"No valid crop data provided" : "Enginn gild gögn um utanskurð gefin",
"Crop is not square" : "Utanskurður er ekki ferningslaga",
+ "State token does not match" : "Stöðuteikn samsvarar ekki",
"Couldn't reset password because the token is invalid" : "Gat ekki endurstillt lykilorðið vegna þess að teiknið er ógilt",
"Couldn't reset password because the token is expired" : "Gat ekki endurstillt lykilorðið vegna þess að teiknið er útrunnið",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupósti því það er ekkert gilt tölvupóstfang fyrir þennan notanda. Hafðu samband við kerfisstjóra.",
+ "Password reset" : "Endurstilling lykilorðs",
+ "Reset your password" : "Endurstilltu lykilorðið þitt",
"%s password reset" : "%s lykilorð endurstillt",
"Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupósti. Hafðu samband við kerfisstjóra.",
"Couldn't send reset email. Please make sure your username is correct." : "Gat ekki sent endurstillingu í tölvupósti. Gakktu úr skugga um að notandanafn þitt sé rétt.",
@@ -45,7 +48,13 @@ OC.L10N.register(
"%s (incompatible)" : "%s (ósamhæft)",
"Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
"Already up to date" : "Allt uppfært nú þegar",
+ "No contacts found" : "Engir tengiliðir fundust",
+ "Show all contacts …" : "Birta alla tengiliði ...",
+ "There was an error loading your contacts" : "Það kom upp villa við að hlaða inn tengiliðunum þínum",
+ "Loading your contacts …" : "Hleð inn tengiliðalistum ...",
+ "Looking for {term} …" : "Leita að {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Það komu upp vandamál með athugun á áreiðanleika kóða. Nánari upplýsingar…</a>",
+ "No action available" : "Engin aðgerð tiltæk",
"Settings" : "Stillingar",
"Connection to server lost" : "Tenging við miðlara rofnaði",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Vandamál við að hlaða inn síðu, endurhleð eftir %n sekúndu","Vandamál við að hlaða inn síðu, endurhleð eftir %n sekúndur"],
@@ -68,6 +77,7 @@ OC.L10N.register(
"No files in here" : "Engar skrár hér",
"Choose" : "Veldu",
"Error loading file picker template: {error}" : "Villa við að hlaða inn sniðmáti fyrir skráaveljara: {error}",
+ "OK" : "Í lagi",
"Error loading message template: {error}" : "Villa við að hlaða inn sniðmáti fyrir skilaboð: {error}",
"read-only" : "skrifvarið",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} árekstur skráa","{count} árekstrar skráa"],
@@ -98,6 +108,7 @@ OC.L10N.register(
"The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache er ekki rétt uppsett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Fyrir betri afköst mælum við með ↗</a> því að nota eftirfarandi stillingar í <code>php.ini</code>:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-fallið \"set_time_limit\" er ekki tiltækt. Þetta gæti valdið því að skriftur stöðvist í miðri keyrslu og skemmi uppsetninguna þína. Við mælumst til þess að þetta fall sé gert virkt.",
"Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetningu þjóns",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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." : "Gagnamappan og skrárnar þínar eru líklega aðgengilegar öllum af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjóninn þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir skjalarót vefþjóns.",
"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-haus er ekki stilltur til jafns við \"{expected}\". Þetta er möguleg áhætta varðandi öryggi og gagnaleynd, við mælum með því að laga þessa stillingu.",
"The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\" rel=\"noreferrer\">öryggisleiðbeiningum</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>." : " Þú ert að tengjast þessu vefsvæði með HTTP. Við mælum eindregið með að þú stillir þjóninn á að krefjast HTTPS í staðinn eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningunum</a> okkar.",
@@ -112,6 +123,7 @@ OC.L10N.register(
"Expiration" : "Rennur út",
"Expiration date" : "Gildir til",
"Choose a password for the public link" : "Veldu þér lykilorð fyrir almenningstengil",
+ "Choose a password for the public link or press \"Enter ↵\"" : "Veldu þér lykilorð fyrir opinberan tengil eða ýttu á \"Enter ↵\"",
"Copied!" : "Afritað!",
"Copy" : "Afrita",
"Not supported!" : "Óstutt!",
@@ -129,11 +141,20 @@ OC.L10N.register(
"Send" : "Senda",
"Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
"Shared with you by {owner}" : "Deilt með þér af {owner}",
+ "Choose a password for the mail share" : "Veldu lykilorð fyrir póstsameign",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} deildi með tengli",
"group" : "hópur",
"remote" : "fjartengt",
"email" : "tölvupóstur",
+ "shared by {sharer}" : "deilt af {sharer}",
"Unshare" : "Hætta deilingu",
+ "Can reshare" : "Getur endurdeilt",
+ "Can edit" : "Getur breytt",
+ "Can create" : "Getur búið til",
+ "Can change" : "Getur skipt um",
+ "Can delete" : "Getur eytt",
+ "Secure drop (upload only)" : "Örugg slepping skráa (einungis innsending)",
+ "Access control" : "Aðgangsstýring",
"Could not unshare" : "Gat ekki hætt deilingu",
"Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.",
"_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Það þarf a.m.k. {count} staf til að sjálfvirk útfylling virki","Það þarf a.m.k. {count} stafi til að sjálfvirk útfylling virki"],
@@ -146,6 +167,10 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (tölvupóstur)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Deila",
+ "Name or email address..." : "Nafn eða tölvupóstfang...",
+ "Name or federated cloud ID..." : "Nafn eða skýjasambandsauðkenni (Federated Cloud ID)...",
+ "Name, federated cloud ID or email address..." : "Nafn, skýjasambandsauðkenni eða tölvupóstfang...",
+ "Name..." : "Nafn...",
"Error removing share" : "Villa við að fjarlægja sameign",
"Non-existing tag #{tag}" : "Merki sem er ekki til #{tag}",
"restricted" : "takmarkaður aðgangur",
@@ -242,6 +267,10 @@ OC.L10N.register(
"Log in" : "Skrá inn",
"Stay logged in" : "Haldast skráður inn",
"Alternative Logins" : "Aðrar innskráningar",
+ "You are about to grant \"%s\" access to your %s account." : "Þú ert að fara að leyfa \"%s\" aðgang að %s notandaaðgangnum þínum.",
+ "App token" : "Teikn forrits",
+ "Alternative login using app token" : "Önnur innskráning með forritsteikni",
+ "Redirecting …" : "Endurbeini ...",
"New password" : "Nýtt lykilorð",
"New Password" : "Nýtt lykilorð",
"Reset password" : "Endursetja lykilorð",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 701427fad95..9bd7e96bc46 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -12,9 +12,12 @@
"No crop data provided" : "Enginn gögn um utanskurð gefin",
"No valid crop data provided" : "Enginn gild gögn um utanskurð gefin",
"Crop is not square" : "Utanskurður er ekki ferningslaga",
+ "State token does not match" : "Stöðuteikn samsvarar ekki",
"Couldn't reset password because the token is invalid" : "Gat ekki endurstillt lykilorðið vegna þess að teiknið er ógilt",
"Couldn't reset password because the token is expired" : "Gat ekki endurstillt lykilorðið vegna þess að teiknið er útrunnið",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupósti því það er ekkert gilt tölvupóstfang fyrir þennan notanda. Hafðu samband við kerfisstjóra.",
+ "Password reset" : "Endurstilling lykilorðs",
+ "Reset your password" : "Endurstilltu lykilorðið þitt",
"%s password reset" : "%s lykilorð endurstillt",
"Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupósti. Hafðu samband við kerfisstjóra.",
"Couldn't send reset email. Please make sure your username is correct." : "Gat ekki sent endurstillingu í tölvupósti. Gakktu úr skugga um að notandanafn þitt sé rétt.",
@@ -43,7 +46,13 @@
"%s (incompatible)" : "%s (ósamhæft)",
"Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
"Already up to date" : "Allt uppfært nú þegar",
+ "No contacts found" : "Engir tengiliðir fundust",
+ "Show all contacts …" : "Birta alla tengiliði ...",
+ "There was an error loading your contacts" : "Það kom upp villa við að hlaða inn tengiliðunum þínum",
+ "Loading your contacts …" : "Hleð inn tengiliðalistum ...",
+ "Looking for {term} …" : "Leita að {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Það komu upp vandamál með athugun á áreiðanleika kóða. Nánari upplýsingar…</a>",
+ "No action available" : "Engin aðgerð tiltæk",
"Settings" : "Stillingar",
"Connection to server lost" : "Tenging við miðlara rofnaði",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Vandamál við að hlaða inn síðu, endurhleð eftir %n sekúndu","Vandamál við að hlaða inn síðu, endurhleð eftir %n sekúndur"],
@@ -66,6 +75,7 @@
"No files in here" : "Engar skrár hér",
"Choose" : "Veldu",
"Error loading file picker template: {error}" : "Villa við að hlaða inn sniðmáti fyrir skráaveljara: {error}",
+ "OK" : "Í lagi",
"Error loading message template: {error}" : "Villa við að hlaða inn sniðmáti fyrir skilaboð: {error}",
"read-only" : "skrifvarið",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} árekstur skráa","{count} árekstrar skráa"],
@@ -96,6 +106,7 @@
"The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache er ekki rétt uppsett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Fyrir betri afköst mælum við með ↗</a> því að nota eftirfarandi stillingar í <code>php.ini</code>:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-fallið \"set_time_limit\" er ekki tiltækt. Þetta gæti valdið því að skriftur stöðvist í miðri keyrslu og skemmi uppsetninguna þína. Við mælumst til þess að þetta fall sé gert virkt.",
"Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetningu þjóns",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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." : "Gagnamappan og skrárnar þínar eru líklega aðgengilegar öllum af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjóninn þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir skjalarót vefþjóns.",
"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-haus er ekki stilltur til jafns við \"{expected}\". Þetta er möguleg áhætta varðandi öryggi og gagnaleynd, við mælum með því að laga þessa stillingu.",
"The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\" rel=\"noreferrer\">öryggisleiðbeiningum</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>." : " Þú ert að tengjast þessu vefsvæði með HTTP. Við mælum eindregið með að þú stillir þjóninn á að krefjast HTTPS í staðinn eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningunum</a> okkar.",
@@ -110,6 +121,7 @@
"Expiration" : "Rennur út",
"Expiration date" : "Gildir til",
"Choose a password for the public link" : "Veldu þér lykilorð fyrir almenningstengil",
+ "Choose a password for the public link or press \"Enter ↵\"" : "Veldu þér lykilorð fyrir opinberan tengil eða ýttu á \"Enter ↵\"",
"Copied!" : "Afritað!",
"Copy" : "Afrita",
"Not supported!" : "Óstutt!",
@@ -127,11 +139,20 @@
"Send" : "Senda",
"Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
"Shared with you by {owner}" : "Deilt með þér af {owner}",
+ "Choose a password for the mail share" : "Veldu lykilorð fyrir póstsameign",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} deildi með tengli",
"group" : "hópur",
"remote" : "fjartengt",
"email" : "tölvupóstur",
+ "shared by {sharer}" : "deilt af {sharer}",
"Unshare" : "Hætta deilingu",
+ "Can reshare" : "Getur endurdeilt",
+ "Can edit" : "Getur breytt",
+ "Can create" : "Getur búið til",
+ "Can change" : "Getur skipt um",
+ "Can delete" : "Getur eytt",
+ "Secure drop (upload only)" : "Örugg slepping skráa (einungis innsending)",
+ "Access control" : "Aðgangsstýring",
"Could not unshare" : "Gat ekki hætt deilingu",
"Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.",
"_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Það þarf a.m.k. {count} staf til að sjálfvirk útfylling virki","Það þarf a.m.k. {count} stafi til að sjálfvirk útfylling virki"],
@@ -144,6 +165,10 @@
"{sharee} (email)" : "{sharee} (tölvupóstur)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Deila",
+ "Name or email address..." : "Nafn eða tölvupóstfang...",
+ "Name or federated cloud ID..." : "Nafn eða skýjasambandsauðkenni (Federated Cloud ID)...",
+ "Name, federated cloud ID or email address..." : "Nafn, skýjasambandsauðkenni eða tölvupóstfang...",
+ "Name..." : "Nafn...",
"Error removing share" : "Villa við að fjarlægja sameign",
"Non-existing tag #{tag}" : "Merki sem er ekki til #{tag}",
"restricted" : "takmarkaður aðgangur",
@@ -240,6 +265,10 @@
"Log in" : "Skrá inn",
"Stay logged in" : "Haldast skráður inn",
"Alternative Logins" : "Aðrar innskráningar",
+ "You are about to grant \"%s\" access to your %s account." : "Þú ert að fara að leyfa \"%s\" aðgang að %s notandaaðgangnum þínum.",
+ "App token" : "Teikn forrits",
+ "Alternative login using app token" : "Önnur innskráning með forritsteikni",
+ "Redirecting …" : "Endurbeini ...",
"New password" : "Nýtt lykilorð",
"New Password" : "Nýtt lykilorð",
"Reset password" : "Endursetja lykilorð",
diff --git a/core/l10n/nb.js b/core/l10n/nb.js
index e20783b3f4f..16ac5e151db 100644
--- a/core/l10n/nb.js
+++ b/core/l10n/nb.js
@@ -14,10 +14,14 @@ OC.L10N.register(
"No crop data provided" : "Ingen beskjæringsinformasjon angitt",
"No valid crop data provided" : "Ingen gyldige beskjæringsdata oppgitt",
"Crop is not square" : "Beskjæringen er ikke kvadratisk",
+ "State token does not match" : "Tilstands-symbolet samsvarer ikke",
+ "Auth flow can only be started unauthenticated." : "Autentiseringsflyt kan bare startes ikke-autentisert.",
"Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi symbolet er ugyldig.",
"Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi symbolet er utløpt.",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
"Password reset" : "Tilbakestilling av passord",
+ "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Klikk følgende knapp for å tilbakestille passordet ditt. Ignorer denne e-posten hvis du ikke har forespurt dette.",
+ "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Klikk følgende lenke for å tilbakestille passordet ditt. Ignorer denne e-posten hvis du ikke har forespurt dette.",
"Reset your password" : "Tilbakestill passordet ditt",
"%s password reset" : "%s tilbakestilling av passord",
"Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
@@ -47,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (ikke kompatibel)",
"Following apps have been disabled: %s" : "Følgende programmer har blitt avskrudd: %s",
"Already up to date" : "Allerede oppdatert",
+ "No contacts found" : "Fant ingen kontakter",
+ "Show all contacts …" : "Vis alle kontakter…",
+ "There was an error loading your contacts" : "Feil ved innlasting av kontaktene dine",
+ "Loading your contacts …" : "Laster inn kontaktene dine…",
+ "Looking for {term} …" : "Ser etter {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>",
+ "No action available" : "Ingen handling tilgjengelig",
+ "Error fetching contact actions" : "Feil ved innhenting av kontakt-handlinger",
"Settings" : "Innstillinger",
"Connection to server lost" : "Mistet tilkobling til tjener",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem ved lasting av side, laster på nytt om %n sekund","Problem ved lasting av side, laster på nytt om %n sekunder"],
@@ -91,14 +102,19 @@ OC.L10N.register(
"Strong password" : "Sterkt passord",
"Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Vev-tjeneren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.",
"Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din vevtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
- "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
+ "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
"No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
"You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du bruker PHP versjonen {version}. Vi anbefaler deg å oppgradere PHP versjonen for å utnytte <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> ytelse og sikkerhetsoppdateringer som tilbys av PHP Group</a>, så fort din distribusjon støtter det.",
+ "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De omvendte mellomtjener-hodene er ikke satt opp rett, eller du kobler til Nextcloud fra en betrodd mellomtjener. Hvis du ikke kobler til Nextcloud fra en betrodd mellomtjener, er dette et sikkerhetsproblem, og kan tillate en angriper å forfalske deres IP-adresse slik den er synlig for Nextcloud. Ytterligere informasjon er å finne i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjonen</a>.",
+ "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er satt opp som distribuert mellomlager, men feil PHP-modul \"memcache\" er installert. \\OC\\Memcache\\Memcached støtter bare \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached-wikien</a> for informasjon om begge modulene.",
"Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Noen filer besto ikke gyldighetssjekken. Ytterligere informasjon om hvordan dette problemet kan løses finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste over ugyldige filer…</a> / <a href=\"{rescanEndpoint}\">Skann på ny…</a>)",
+ "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP OPcache er ikke satt opp rett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For bedre ytelse anbefales det ↗</a> å bruke følgende innstillinger i <code>php.ini</code>:",
+ "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-funksjonen \"set_time_limit\" er ikke tilgjengelig. Dette kan resultere i at skript blir stoppet midt i kjøring, noe som knekker installasjonen din. Det anbefales sterkt å skru på denne funksjonen.",
"Error occurred while checking server setup" : "Feil oppstod ved sjekking av tjener-oppsett",
"Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av vev-tjenerens 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 satt opp 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}\" rel=\"noreferrer\">security tips</a>." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For forbedret sikkerhet anbefales det å skru på HSTS som beskrevet i våre <a href=\"{docUrl}\" rel=\"noreferrer\">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 tjeneren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
"Shared" : "Delt",
"Shared with {recipients}" : "Delt med {recipients}",
@@ -129,6 +145,7 @@ OC.L10N.register(
"Send" : "Send",
"Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
"Shared with you by {owner}" : "Delt med deg av {owner}",
+ "Choose a password for the mail share" : "Velg et passord for e-postlageret",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delt via lenke",
"group" : "gruppe",
"remote" : "ekstern",
@@ -140,6 +157,7 @@ OC.L10N.register(
"Can create" : "Kan opprette",
"Can change" : "Kan endre",
"Can delete" : "Kan slette",
+ "Secure drop (upload only)" : "Sikret filkasse (bare opplasting)",
"Access control" : "Tilgangskontroll",
"Could not unshare" : "Kunne ikke avslutte deling",
"Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
@@ -153,7 +171,12 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Del",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Del med andre ved å skrive inn en bruker, en gruppe, en federert sky-ID eller en e-postadresse.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Del med andre ved å skrive inn en bruker, en gruppe eller en federert sky-ID",
+ "Share with other people by entering a user or group or an email address." : "Del med andre ved å skrive inn en bruker, en gruppe, eller en e-postadresse.",
"Name or email address..." : "Navn eller e-postadresse…",
+ "Name or federated cloud ID..." : "Navn eller federert sky-ID…",
+ "Name, federated cloud ID or email address..." : "Navn, federert sky-ID eller e-postadresse…",
"Name..." : "Navn…",
"Error removing share" : "Feil ved fjerning av deling",
"Non-existing tag #{tag}" : "Ikke-eksisterende merkelapp #{tag}",
@@ -183,7 +206,7 @@ OC.L10N.register(
"An error occurred." : "En feil oppstod.",
"Please reload the page." : "Last inn siden på nytt.",
"The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.",
- "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Vennligst rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud miljøet</a>.",
+ "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud-gemenskapen</a>.",
"Continue to Nextcloud" : "Fortsett til Nextcloud",
"_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekunder."],
"Searching other places" : "Søker andre steder",
@@ -210,6 +233,7 @@ OC.L10N.register(
"Message: %s" : "Melding: %s",
"File: %s" : "Fil: %s",
"Line: %s" : "Linje: %s",
+ "Trace" : "Sporing",
"Security warning" : "Sikkerhetsadvarsel",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "For informasjon om hvordan du skal konfigurere tjeneren skikkelig, vennligst se i <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentasjonen</a>.",
@@ -250,6 +274,10 @@ OC.L10N.register(
"Log in" : "Logg inn",
"Stay logged in" : "Forbli innlogget",
"Alternative Logins" : "Alternative innlogginger",
+ "You are about to grant \"%s\" access to your %s account." : "Du er i ferd med å gi \"%s\" tilgang til din %s-konto.",
+ "App token" : "Program-symbol",
+ "Alternative login using app token" : "Alternativ innlogging ved bruk av program-symbol",
+ "Redirecting …" : "Videresender…",
"New password" : "Nytt passord",
"New Password" : "Nytt passord",
"Reset password" : "Tilbakestill passord",
diff --git a/core/l10n/nb.json b/core/l10n/nb.json
index e30cb8ac120..f9e5b6616d1 100644
--- a/core/l10n/nb.json
+++ b/core/l10n/nb.json
@@ -12,10 +12,14 @@
"No crop data provided" : "Ingen beskjæringsinformasjon angitt",
"No valid crop data provided" : "Ingen gyldige beskjæringsdata oppgitt",
"Crop is not square" : "Beskjæringen er ikke kvadratisk",
+ "State token does not match" : "Tilstands-symbolet samsvarer ikke",
+ "Auth flow can only be started unauthenticated." : "Autentiseringsflyt kan bare startes ikke-autentisert.",
"Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi symbolet er ugyldig.",
"Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi symbolet er utløpt.",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
"Password reset" : "Tilbakestilling av passord",
+ "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Klikk følgende knapp for å tilbakestille passordet ditt. Ignorer denne e-posten hvis du ikke har forespurt dette.",
+ "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Klikk følgende lenke for å tilbakestille passordet ditt. Ignorer denne e-posten hvis du ikke har forespurt dette.",
"Reset your password" : "Tilbakestill passordet ditt",
"%s password reset" : "%s tilbakestilling av passord",
"Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
@@ -45,7 +49,14 @@
"%s (incompatible)" : "%s (ikke kompatibel)",
"Following apps have been disabled: %s" : "Følgende programmer har blitt avskrudd: %s",
"Already up to date" : "Allerede oppdatert",
+ "No contacts found" : "Fant ingen kontakter",
+ "Show all contacts …" : "Vis alle kontakter…",
+ "There was an error loading your contacts" : "Feil ved innlasting av kontaktene dine",
+ "Loading your contacts …" : "Laster inn kontaktene dine…",
+ "Looking for {term} …" : "Ser etter {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>",
+ "No action available" : "Ingen handling tilgjengelig",
+ "Error fetching contact actions" : "Feil ved innhenting av kontakt-handlinger",
"Settings" : "Innstillinger",
"Connection to server lost" : "Mistet tilkobling til tjener",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem ved lasting av side, laster på nytt om %n sekund","Problem ved lasting av side, laster på nytt om %n sekunder"],
@@ -89,14 +100,19 @@
"Strong password" : "Sterkt passord",
"Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Vev-tjeneren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.",
"Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din vevtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
- "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
+ "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
"No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
"You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du bruker PHP versjonen {version}. Vi anbefaler deg å oppgradere PHP versjonen for å utnytte <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> ytelse og sikkerhetsoppdateringer som tilbys av PHP Group</a>, så fort din distribusjon støtter det.",
+ "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De omvendte mellomtjener-hodene er ikke satt opp rett, eller du kobler til Nextcloud fra en betrodd mellomtjener. Hvis du ikke kobler til Nextcloud fra en betrodd mellomtjener, er dette et sikkerhetsproblem, og kan tillate en angriper å forfalske deres IP-adresse slik den er synlig for Nextcloud. Ytterligere informasjon er å finne i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjonen</a>.",
+ "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er satt opp som distribuert mellomlager, men feil PHP-modul \"memcache\" er installert. \\OC\\Memcache\\Memcached støtter bare \"memcached\" og ikke \"memcache\". Se <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached-wikien</a> for informasjon om begge modulene.",
"Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Noen filer besto ikke gyldighetssjekken. Ytterligere informasjon om hvordan dette problemet kan løses finnes i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste over ugyldige filer…</a> / <a href=\"{rescanEndpoint}\">Skann på ny…</a>)",
+ "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP OPcache er ikke satt opp rett. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For bedre ytelse anbefales det ↗</a> å bruke følgende innstillinger i <code>php.ini</code>:",
+ "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-funksjonen \"set_time_limit\" er ikke tilgjengelig. Dette kan resultere i at skript blir stoppet midt i kjøring, noe som knekker installasjonen din. Det anbefales sterkt å skru på denne funksjonen.",
"Error occurred while checking server setup" : "Feil oppstod ved sjekking av tjener-oppsett",
"Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av vev-tjenerens 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 satt opp 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}\" rel=\"noreferrer\">security tips</a>." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For forbedret sikkerhet anbefales det å skru på HSTS som beskrevet i våre <a href=\"{docUrl}\" rel=\"noreferrer\">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 tjeneren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
"Shared" : "Delt",
"Shared with {recipients}" : "Delt med {recipients}",
@@ -127,6 +143,7 @@
"Send" : "Send",
"Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
"Shared with you by {owner}" : "Delt med deg av {owner}",
+ "Choose a password for the mail share" : "Velg et passord for e-postlageret",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delt via lenke",
"group" : "gruppe",
"remote" : "ekstern",
@@ -138,6 +155,7 @@
"Can create" : "Kan opprette",
"Can change" : "Kan endre",
"Can delete" : "Kan slette",
+ "Secure drop (upload only)" : "Sikret filkasse (bare opplasting)",
"Access control" : "Tilgangskontroll",
"Could not unshare" : "Kunne ikke avslutte deling",
"Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
@@ -151,7 +169,12 @@
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Del",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Del med andre ved å skrive inn en bruker, en gruppe, en federert sky-ID eller en e-postadresse.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Del med andre ved å skrive inn en bruker, en gruppe eller en federert sky-ID",
+ "Share with other people by entering a user or group or an email address." : "Del med andre ved å skrive inn en bruker, en gruppe, eller en e-postadresse.",
"Name or email address..." : "Navn eller e-postadresse…",
+ "Name or federated cloud ID..." : "Navn eller federert sky-ID…",
+ "Name, federated cloud ID or email address..." : "Navn, federert sky-ID eller e-postadresse…",
"Name..." : "Navn…",
"Error removing share" : "Feil ved fjerning av deling",
"Non-existing tag #{tag}" : "Ikke-eksisterende merkelapp #{tag}",
@@ -181,7 +204,7 @@
"An error occurred." : "En feil oppstod.",
"Please reload the page." : "Last inn siden på nytt.",
"The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.",
- "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Vennligst rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud miljøet</a>.",
+ "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Oppdateringen feilet. Rapporter dette problemet til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud-gemenskapen</a>.",
"Continue to Nextcloud" : "Fortsett til Nextcloud",
"_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %s sekunder."],
"Searching other places" : "Søker andre steder",
@@ -208,6 +231,7 @@
"Message: %s" : "Melding: %s",
"File: %s" : "Fil: %s",
"Line: %s" : "Linje: %s",
+ "Trace" : "Sporing",
"Security warning" : "Sikkerhetsadvarsel",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "For informasjon om hvordan du skal konfigurere tjeneren skikkelig, vennligst se i <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentasjonen</a>.",
@@ -248,6 +272,10 @@
"Log in" : "Logg inn",
"Stay logged in" : "Forbli innlogget",
"Alternative Logins" : "Alternative innlogginger",
+ "You are about to grant \"%s\" access to your %s account." : "Du er i ferd med å gi \"%s\" tilgang til din %s-konto.",
+ "App token" : "Program-symbol",
+ "Alternative login using app token" : "Alternativ innlogging ved bruk av program-symbol",
+ "Redirecting …" : "Videresender…",
"New password" : "Nytt passord",
"New Password" : "Nytt passord",
"Reset password" : "Tilbakestill passord",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 3838ff4c7d5..f373eee36dd 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
"No valid crop data provided" : "Geen geldige bijsnijdingsgegevens opgegeven",
"Crop is not square" : "Bijsnijden is niet vierkant",
+ "State token does not match" : "Token staat komt niet overeen",
+ "Auth flow can only be started unauthenticated." : "Auth flow kan alleen niet geautoriseerd gestart worden.",
"Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
"Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met je beheerder.",
@@ -49,6 +51,11 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatibel)",
"Following apps have been disabled: %s" : "De volgende apps zijn uitgeschakeld: %s",
"Already up to date" : "Al bijgewerkt",
+ "No contacts found" : "Geen contacten gevonden",
+ "Show all contacts …" : "Alle contacten weergeven",
+ "There was an error loading your contacts" : "Er was een probleem bij het laden van je contacten",
+ "Loading your contacts …" : "Je contacten wordt geladen ...",
+ "Looking for {term} …" : "Kijken voor {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>",
"Settings" : "Instellingen",
"Connection to server lost" : "Verbinding met server verbroken",
@@ -162,6 +169,13 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (e-mail)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Delen",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Deel met anderen door het invullen van een gebruiker, groep, gefedereerd cloud ID of een e-mail adres.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Deel met anderen door middel van gebruikers, groep of een gefedereerd cloud ID.",
+ "Share with other people by entering a user or group or an email address." : "Deel met anderen door het invullen van een gebruiker, groep of een e-mailadres.",
+ "Name or email address..." : "Naam of e-mailadres",
+ "Name or federated cloud ID..." : "Naam of gefedereerd Cloud ID:",
+ "Name, federated cloud ID or email address..." : "Naam, gefedereed cloud ID of een e-mailadres",
+ "Name..." : "Naam...",
"Error removing share" : "Fout bij verwijderen gedeelde",
"Non-existing tag #{tag}" : "Niet bestaande markering #{tag}",
"restricted" : "beperkt",
@@ -258,6 +272,10 @@ OC.L10N.register(
"Log in" : "Meld u aan",
"Stay logged in" : "Ingelogd blijven",
"Alternative Logins" : "Alternatieve inlogs",
+ "You are about to grant \"%s\" access to your %s account." : "Je staat op het punt om \"%s\" toegang te verlenen to je %s account.",
+ "App token" : "App token",
+ "Alternative login using app token" : "Alternatieve login doormiddel van app token",
+ "Redirecting …" : "Omleiding ...",
"New password" : "Nieuw wachtwoord",
"New Password" : "Nieuw wachtwoord",
"Reset password" : "Reset wachtwoord",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 9f7efe029fd..4dee1bc0731 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
"No valid crop data provided" : "Geen geldige bijsnijdingsgegevens opgegeven",
"Crop is not square" : "Bijsnijden is niet vierkant",
+ "State token does not match" : "Token staat komt niet overeen",
+ "Auth flow can only be started unauthenticated." : "Auth flow kan alleen niet geautoriseerd gestart worden.",
"Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
"Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met je beheerder.",
@@ -47,6 +49,11 @@
"%s (incompatible)" : "%s (incompatibel)",
"Following apps have been disabled: %s" : "De volgende apps zijn uitgeschakeld: %s",
"Already up to date" : "Al bijgewerkt",
+ "No contacts found" : "Geen contacten gevonden",
+ "Show all contacts …" : "Alle contacten weergeven",
+ "There was an error loading your contacts" : "Er was een probleem bij het laden van je contacten",
+ "Loading your contacts …" : "Je contacten wordt geladen ...",
+ "Looking for {term} …" : "Kijken voor {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>",
"Settings" : "Instellingen",
"Connection to server lost" : "Verbinding met server verbroken",
@@ -160,6 +167,13 @@
"{sharee} (email)" : "{sharee} (e-mail)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Delen",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Deel met anderen door het invullen van een gebruiker, groep, gefedereerd cloud ID of een e-mail adres.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Deel met anderen door middel van gebruikers, groep of een gefedereerd cloud ID.",
+ "Share with other people by entering a user or group or an email address." : "Deel met anderen door het invullen van een gebruiker, groep of een e-mailadres.",
+ "Name or email address..." : "Naam of e-mailadres",
+ "Name or federated cloud ID..." : "Naam of gefedereerd Cloud ID:",
+ "Name, federated cloud ID or email address..." : "Naam, gefedereed cloud ID of een e-mailadres",
+ "Name..." : "Naam...",
"Error removing share" : "Fout bij verwijderen gedeelde",
"Non-existing tag #{tag}" : "Niet bestaande markering #{tag}",
"restricted" : "beperkt",
@@ -256,6 +270,10 @@
"Log in" : "Meld u aan",
"Stay logged in" : "Ingelogd blijven",
"Alternative Logins" : "Alternatieve inlogs",
+ "You are about to grant \"%s\" access to your %s account." : "Je staat op het punt om \"%s\" toegang te verlenen to je %s account.",
+ "App token" : "App token",
+ "Alternative login using app token" : "Alternatieve login doormiddel van app token",
+ "Redirecting …" : "Omleiding ...",
"New password" : "Nieuw wachtwoord",
"New Password" : "Nieuw wachtwoord",
"Reset password" : "Reset wachtwoord",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index ff414663d13..14e1af9a33b 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Brak danych do przycięcia",
"No valid crop data provided" : "Brak danych do przycięcia",
"Crop is not square" : "Przycięcie nie jest prostokątem",
+ "State token does not match" : "Token stanu nie pasuje",
+ "Auth flow can only be started unauthenticated." : "Autoryzacja przepływu może być rozpoczęta tylko niezautoryzowana",
"Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
"Couldn't reset password because the token is expired" : "Nie można zresetować hasła, ponieważ token wygasł",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nie udało się wysłać ponownego e-maila, ponieważ nie ma adresu e-mail do tego użytkownika. Proszę skontaktować się z administratorem.",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (niekompatybilne)",
"Following apps have been disabled: %s" : "Poniższe aplikacje zostały wyłączone: %s",
"Already up to date" : "Już zaktualizowano",
+ "No contacts found" : "Nie znaleziono żadnych kontaktów",
+ "Show all contacts …" : "Pokazuję wszystkie kontakty...",
+ "There was an error loading your contacts" : "Wystąpił błąd podczas ładowania twoich kontaktów",
+ "Loading your contacts …" : "Ładuję twoje kontakty...",
+ "Looking for {term} …" : "Szukam {term}...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Wystąpiły problemy przy sprawdzaniu integralności kodu Więcej informacji…</a>",
+ "No action available" : "Żadna akcja nie jest dostępna",
+ "Error fetching contact actions" : "Błąd podczas pobierania akcji dla kontaktu",
"Settings" : "Ustawienia",
"Connection to server lost" : "Utracone połączenie z serwerem",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem z załadowaniem strony, przeładowanie za %n sekundę","Problem z załadowaniem strony, przeładowanie za %n sekund","Problem z załadowaniem strony, przeładowanie za %n sekund"],
@@ -103,6 +112,7 @@ OC.L10N.register(
"The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache nie jest prawidłowo skonfigurowany <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dla lepszej wydajności zalecamy ↗</a> użycie następujących ustawień w <code>php.ini</code>:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "Funkcja PHP \"set_time_limit\" nie jest dostępna. Może to powodować zatrzymanie skryptów w podczas działania i w efekcie przerwanie instalacji. Silnie rekomendujemy włączenie tej funkcji.",
"Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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." : "Twój katalog z danymi i twoje pliki prawdopodobnie są dostępne przez Internet. Plik .htaccess nie działa. Usilnie zalecamy, żebyś tak skonfigurował swój serwer, żeby katalog z danymi nie był dalej dostępny lub przenieś swój katalog z danymi poza katalog root serwera webowego.",
"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." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.",
"The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Nagłówek HTTP \"Strict-Transport-Security\" nie jest ustawiony na przynajmniej \"{seconds}\" sekund. Dla zwiększenia bezpieczeństwa zalecamy ustawienie HSTS tak jak opisaliśmy to w naszych <a href=\"{docUrl}\" rel=\"noreferrer\">wskazówkach dot. bezpieczeństwa</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>." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych <a href=\"{docUrl}\">wskazówkach bezpieczeństwa</a>.",
@@ -161,6 +171,13 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (e-mail)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Udostępnij",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy, ID chmury stowarzyszonej lub adres e-mail.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy lub ID chmury stowarzyszonej.",
+ "Share with other people by entering a user or group or an email address." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy lub adresu e-mail.",
+ "Name or email address..." : "Nazwa lub adres e-mail...",
+ "Name or federated cloud ID..." : "Nazwa lub ID chmury stowarzyszonej...",
+ "Name, federated cloud ID or email address..." : "Nazwa, ID chmury stowarzyszonej lub adres e-mail...",
+ "Name..." : "Nazwa...",
"Error removing share" : "Błąd podczas usuwania współdzielenia",
"Non-existing tag #{tag}" : "Znacznik #{tag} nie istnieje",
"restricted" : "ograniczone",
@@ -257,6 +274,10 @@ OC.L10N.register(
"Log in" : "Zaloguj",
"Stay logged in" : "Pozostań zalogowany",
"Alternative Logins" : "Alternatywne loginy",
+ "You are about to grant \"%s\" access to your %s account." : "Masz zamiar przyznać \"%s\" dostep do twojego %s konta.",
+ "App token" : "Token aplikacji",
+ "Alternative login using app token" : "Zaloguj alternatywnie używając tokenu aplikacji",
+ "Redirecting …" : "Przekierowuję...",
"New password" : "Nowe hasło",
"New Password" : "Nowe hasło",
"Reset password" : "Zresetuj hasło",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 997d6b024a8..95589c8997b 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Brak danych do przycięcia",
"No valid crop data provided" : "Brak danych do przycięcia",
"Crop is not square" : "Przycięcie nie jest prostokątem",
+ "State token does not match" : "Token stanu nie pasuje",
+ "Auth flow can only be started unauthenticated." : "Autoryzacja przepływu może być rozpoczęta tylko niezautoryzowana",
"Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
"Couldn't reset password because the token is expired" : "Nie można zresetować hasła, ponieważ token wygasł",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nie udało się wysłać ponownego e-maila, ponieważ nie ma adresu e-mail do tego użytkownika. Proszę skontaktować się z administratorem.",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (niekompatybilne)",
"Following apps have been disabled: %s" : "Poniższe aplikacje zostały wyłączone: %s",
"Already up to date" : "Już zaktualizowano",
+ "No contacts found" : "Nie znaleziono żadnych kontaktów",
+ "Show all contacts …" : "Pokazuję wszystkie kontakty...",
+ "There was an error loading your contacts" : "Wystąpił błąd podczas ładowania twoich kontaktów",
+ "Loading your contacts …" : "Ładuję twoje kontakty...",
+ "Looking for {term} …" : "Szukam {term}...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Wystąpiły problemy przy sprawdzaniu integralności kodu Więcej informacji…</a>",
+ "No action available" : "Żadna akcja nie jest dostępna",
+ "Error fetching contact actions" : "Błąd podczas pobierania akcji dla kontaktu",
"Settings" : "Ustawienia",
"Connection to server lost" : "Utracone połączenie z serwerem",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem z załadowaniem strony, przeładowanie za %n sekundę","Problem z załadowaniem strony, przeładowanie za %n sekund","Problem z załadowaniem strony, przeładowanie za %n sekund"],
@@ -101,6 +110,7 @@
"The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache nie jest prawidłowo skonfigurowany <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dla lepszej wydajności zalecamy ↗</a> użycie następujących ustawień w <code>php.ini</code>:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "Funkcja PHP \"set_time_limit\" nie jest dostępna. Może to powodować zatrzymanie skryptów w podczas działania i w efekcie przerwanie instalacji. Silnie rekomendujemy włączenie tej funkcji.",
"Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended 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." : "Twój katalog z danymi i twoje pliki prawdopodobnie są dostępne przez Internet. Plik .htaccess nie działa. Usilnie zalecamy, żebyś tak skonfigurował swój serwer, żeby katalog z danymi nie był dalej dostępny lub przenieś swój katalog z danymi poza katalog root serwera webowego.",
"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." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.",
"The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Nagłówek HTTP \"Strict-Transport-Security\" nie jest ustawiony na przynajmniej \"{seconds}\" sekund. Dla zwiększenia bezpieczeństwa zalecamy ustawienie HSTS tak jak opisaliśmy to w naszych <a href=\"{docUrl}\" rel=\"noreferrer\">wskazówkach dot. bezpieczeństwa</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>." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych <a href=\"{docUrl}\">wskazówkach bezpieczeństwa</a>.",
@@ -159,6 +169,13 @@
"{sharee} (email)" : "{sharee} (e-mail)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Udostępnij",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy, ID chmury stowarzyszonej lub adres e-mail.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy lub ID chmury stowarzyszonej.",
+ "Share with other people by entering a user or group or an email address." : "Współdziel z innymi osobami przez wpisanie użytkownika lub grupy lub adresu e-mail.",
+ "Name or email address..." : "Nazwa lub adres e-mail...",
+ "Name or federated cloud ID..." : "Nazwa lub ID chmury stowarzyszonej...",
+ "Name, federated cloud ID or email address..." : "Nazwa, ID chmury stowarzyszonej lub adres e-mail...",
+ "Name..." : "Nazwa...",
"Error removing share" : "Błąd podczas usuwania współdzielenia",
"Non-existing tag #{tag}" : "Znacznik #{tag} nie istnieje",
"restricted" : "ograniczone",
@@ -255,6 +272,10 @@
"Log in" : "Zaloguj",
"Stay logged in" : "Pozostań zalogowany",
"Alternative Logins" : "Alternatywne loginy",
+ "You are about to grant \"%s\" access to your %s account." : "Masz zamiar przyznać \"%s\" dostep do twojego %s konta.",
+ "App token" : "Token aplikacji",
+ "Alternative login using app token" : "Zaloguj alternatywnie używając tokenu aplikacji",
+ "Redirecting …" : "Przekierowuję...",
"New password" : "Nowe hasło",
"New Password" : "Nowe hasło",
"Reset password" : "Zresetuj hasło",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 35060344623..234af4c3ad2 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Nenhum dado recortado fornecido",
"No valid crop data provided" : "Nenhum dado recortado válido",
"Crop is not square" : "Recorte não é quadrado",
+ "State token does not match" : "O estado do token não coincide",
+ "Auth flow can only be started unauthenticated." : "O fluxo de autenticação só pode ser iniciado como não autenticado.",
"Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
"Couldn't reset password because the token is expired" : "Não foi possível redefinir a senha porque o token expirou",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar email de redefinição porque não há nenhum endereço de email para este nome de usuário. Entre em contato com o administrador.",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatível)",
"Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
"Already up to date" : "Já está atualizado",
+ "No contacts found" : "Nenhum contato encontrado",
+ "Show all contacts …" : "Mostrar todos os contatos...",
+ "There was an error loading your contacts" : "Houve um erro carregando seus contatos",
+ "Loading your contacts …" : "Carregando seus contatos...",
+ "Looking for {term} …" : "Procurando por {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Houve problemas com a verificação de integridade do código. Mais informações…</a>",
+ "No action available" : "Nenhuma ação disponível",
+ "Error fetching contact actions" : "Erro ao obter as ações de contato",
"Settings" : "Configurações",
"Connection to server lost" : "Conexão perdida com o servidor",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problema no carregamento da página, recarregando em %n segundo","Problema no carregamento da página, recarregando em %n segundos"],
@@ -265,6 +274,10 @@ OC.L10N.register(
"Log in" : "Entrar",
"Stay logged in" : "Permaneça logado",
"Alternative Logins" : "Logins alternativos",
+ "You are about to grant \"%s\" access to your %s account." : "Você está prestes a conceder acesso a \"%s\" para sua conta %s.",
+ "App token" : "Token do aplicativo",
+ "Alternative login using app token" : "Login alternativo usando o token do aplicativo",
+ "Redirecting …" : "Redirecionando...",
"New password" : "Nova senha",
"New Password" : "Nova senha",
"Reset password" : "Redefinir senha",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 65ae989441f..64f7131b61c 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Nenhum dado recortado fornecido",
"No valid crop data provided" : "Nenhum dado recortado válido",
"Crop is not square" : "Recorte não é quadrado",
+ "State token does not match" : "O estado do token não coincide",
+ "Auth flow can only be started unauthenticated." : "O fluxo de autenticação só pode ser iniciado como não autenticado.",
"Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
"Couldn't reset password because the token is expired" : "Não foi possível redefinir a senha porque o token expirou",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar email de redefinição porque não há nenhum endereço de email para este nome de usuário. Entre em contato com o administrador.",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (incompatível)",
"Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
"Already up to date" : "Já está atualizado",
+ "No contacts found" : "Nenhum contato encontrado",
+ "Show all contacts …" : "Mostrar todos os contatos...",
+ "There was an error loading your contacts" : "Houve um erro carregando seus contatos",
+ "Loading your contacts …" : "Carregando seus contatos...",
+ "Looking for {term} …" : "Procurando por {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Houve problemas com a verificação de integridade do código. Mais informações…</a>",
+ "No action available" : "Nenhuma ação disponível",
+ "Error fetching contact actions" : "Erro ao obter as ações de contato",
"Settings" : "Configurações",
"Connection to server lost" : "Conexão perdida com o servidor",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problema no carregamento da página, recarregando em %n segundo","Problema no carregamento da página, recarregando em %n segundos"],
@@ -263,6 +272,10 @@
"Log in" : "Entrar",
"Stay logged in" : "Permaneça logado",
"Alternative Logins" : "Logins alternativos",
+ "You are about to grant \"%s\" access to your %s account." : "Você está prestes a conceder acesso a \"%s\" para sua conta %s.",
+ "App token" : "Token do aplicativo",
+ "Alternative login using app token" : "Login alternativo usando o token do aplicativo",
+ "Redirecting …" : "Redirecionando...",
"New password" : "Nova senha",
"New Password" : "Nova senha",
"Reset password" : "Redefinir senha",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 0e93185dcb3..eb26ec997ec 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -14,8 +14,10 @@ OC.L10N.register(
"No crop data provided" : "Не указана информация о кадрировании",
"No valid crop data provided" : "Не указаны корректные данные о кадрировании",
"Crop is not square" : "Кадр не является квадратом",
- "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль из-за неверного токена",
- "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, так как срок действия токена истек.",
+ "State token does not match" : "Токен состояния не соответствует",
+ "Auth flow can only be started unauthenticated." : "Процесс аутентификации может быть запущен только неаутентифицированным.",
+ "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль, неверный токен",
+ "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, срок действия токена истёк",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса так как у данного пользователя не задан адрес электронной почты. Пожалуйста, обратитесь к администратору.",
"Password reset" : "Сброс пароля",
"Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Для сброса пароля нажмите на кнопку. Если вы не запрашивали сброс пароля, просто проигнорируйе это письмо.",
@@ -49,6 +51,11 @@ OC.L10N.register(
"%s (incompatible)" : "%s (несовместимое)",
"Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
"Already up to date" : "Не нуждается в обновлении",
+ "No contacts found" : "Контактов не найдено",
+ "Show all contacts …" : "Показать все контакты…",
+ "There was an error loading your contacts" : "При загрузке контактов произошла ошибка",
+ "Loading your contacts …" : "Загрузка контактов…",
+ "Looking for {term} …" : "Поиск {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...",
"Settings" : "Настройки",
"Connection to server lost" : "Подключение к серверу потеряно",
@@ -265,6 +272,10 @@ OC.L10N.register(
"Log in" : "Войти",
"Stay logged in" : "Оставаться в системе",
"Alternative Logins" : "Альтернативные имена пользователя",
+ "You are about to grant \"%s\" access to your %s account." : "Вы собираетесь предоставить «%s» доступ к вашему аккаунту «%s».",
+ "App token" : "Токен приложения",
+ "Alternative login using app token" : "Альтернативный вход с токеном приложения",
+ "Redirecting …" : "Перенаправление…",
"New password" : "Новый пароль",
"New Password" : "Новый пароль",
"Reset password" : "Сбросить пароль",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 5ab0037a7f0..774f4477ab3 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -12,8 +12,10 @@
"No crop data provided" : "Не указана информация о кадрировании",
"No valid crop data provided" : "Не указаны корректные данные о кадрировании",
"Crop is not square" : "Кадр не является квадратом",
- "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль из-за неверного токена",
- "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, так как срок действия токена истек.",
+ "State token does not match" : "Токен состояния не соответствует",
+ "Auth flow can only be started unauthenticated." : "Процесс аутентификации может быть запущен только неаутентифицированным.",
+ "Couldn't reset password because the token is invalid" : "Не удалось сбросить пароль, неверный токен",
+ "Couldn't reset password because the token is expired" : "Не удалось сбросить пароль, срок действия токена истёк",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Не удалось отправить письмо сброса так как у данного пользователя не задан адрес электронной почты. Пожалуйста, обратитесь к администратору.",
"Password reset" : "Сброс пароля",
"Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Для сброса пароля нажмите на кнопку. Если вы не запрашивали сброс пароля, просто проигнорируйе это письмо.",
@@ -47,6 +49,11 @@
"%s (incompatible)" : "%s (несовместимое)",
"Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
"Already up to date" : "Не нуждается в обновлении",
+ "No contacts found" : "Контактов не найдено",
+ "Show all contacts …" : "Показать все контакты…",
+ "There was an error loading your contacts" : "При загрузке контактов произошла ошибка",
+ "Loading your contacts …" : "Загрузка контактов…",
+ "Looking for {term} …" : "Поиск {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...",
"Settings" : "Настройки",
"Connection to server lost" : "Подключение к серверу потеряно",
@@ -263,6 +270,10 @@
"Log in" : "Войти",
"Stay logged in" : "Оставаться в системе",
"Alternative Logins" : "Альтернативные имена пользователя",
+ "You are about to grant \"%s\" access to your %s account." : "Вы собираетесь предоставить «%s» доступ к вашему аккаунту «%s».",
+ "App token" : "Токен приложения",
+ "Alternative login using app token" : "Альтернативный вход с токеном приложения",
+ "Redirecting …" : "Перенаправление…",
"New password" : "Новый пароль",
"New Password" : "Новый пароль",
"Reset password" : "Сбросить пароль",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index e0edb374618..0fa3793cb77 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -14,6 +14,8 @@ OC.L10N.register(
"No crop data provided" : "Kırpma verileri belirtilmemiş",
"No valid crop data provided" : "Geçerli bir kırpma verisi belirtilmemiş",
"Crop is not square" : "Kırpma kare şeklinde değil",
+ "State token does not match" : "Durum kodu eşleşmiyor",
+ "Auth flow can only be started unauthenticated." : "Kimlik doğrulama işlemi yalnız kimlik doğrulanmamışken başlatılabilir.",
"Couldn't reset password because the token is invalid" : "Kod geçersiz olduğundan parola sıfırlanamadı",
"Couldn't reset password because the token is expired" : "Kodun süresi geçtiğinden parola sıfırlanamadı",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Bu kullanıcı için bir e-posta adresi olmadığından sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile görüşün.",
@@ -49,7 +51,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (uyumsuz)",
"Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
"Already up to date" : "Zaten güncel",
+ "No contacts found" : "Herhangi bir kişi bulunamadı",
+ "Show all contacts …" : "Tüm kişileri görüntüle...",
+ "There was an error loading your contacts" : "Kişileriniz yüklenirken bir sorun çıktı",
+ "Loading your contacts …" : "Kişileriniz yükleniyor...",
+ "Looking for {term} …" : "{term} ifadesi aranıyor...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Kod bütünlük sınamasında sorunlar çıktı. Ayrıntılı bilgi…</a>",
+ "No action available" : "Yapılabilecek bir işlem yok",
+ "Error fetching contact actions" : "Kişi işlemleri alınırken sorun çıktı",
"Settings" : "Ayarlar",
"Connection to server lost" : "Sunucu bağlantısı kesildi",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Sayfa yüklenirken bir sorun çıktı. %n saniye sonra yeniden yüklenecek","Sayfa yüklenirken bir sorun çıktı. %n saniye sonra yeniden yüklenecek"],
@@ -265,6 +274,10 @@ OC.L10N.register(
"Log in" : "Oturum Aç",
"Stay logged in" : "Bağlı kal",
"Alternative Logins" : "Alternatif Oturum Açmalar",
+ "You are about to grant \"%s\" access to your %s account." : "\"%s\" erişim iznini %s hesabınıza vermek üzeresiniz.",
+ "App token" : "Uygulama Kodu",
+ "Alternative login using app token" : "Uygulama kodu ile alternatif oturum açma",
+ "Redirecting …" : "Yönlendiriliyor...",
"New password" : "Yeni parola",
"New Password" : "Yeni Parola",
"Reset password" : "Parolayı sıfırla",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 922a9957310..e21e3c25728 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -12,6 +12,8 @@
"No crop data provided" : "Kırpma verileri belirtilmemiş",
"No valid crop data provided" : "Geçerli bir kırpma verisi belirtilmemiş",
"Crop is not square" : "Kırpma kare şeklinde değil",
+ "State token does not match" : "Durum kodu eşleşmiyor",
+ "Auth flow can only be started unauthenticated." : "Kimlik doğrulama işlemi yalnız kimlik doğrulanmamışken başlatılabilir.",
"Couldn't reset password because the token is invalid" : "Kod geçersiz olduğundan parola sıfırlanamadı",
"Couldn't reset password because the token is expired" : "Kodun süresi geçtiğinden parola sıfırlanamadı",
"Could not send reset email because there is no email address for this username. Please contact your administrator." : "Bu kullanıcı için bir e-posta adresi olmadığından sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile görüşün.",
@@ -47,7 +49,14 @@
"%s (incompatible)" : "%s (uyumsuz)",
"Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
"Already up to date" : "Zaten güncel",
+ "No contacts found" : "Herhangi bir kişi bulunamadı",
+ "Show all contacts …" : "Tüm kişileri görüntüle...",
+ "There was an error loading your contacts" : "Kişileriniz yüklenirken bir sorun çıktı",
+ "Loading your contacts …" : "Kişileriniz yükleniyor...",
+ "Looking for {term} …" : "{term} ifadesi aranıyor...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Kod bütünlük sınamasında sorunlar çıktı. Ayrıntılı bilgi…</a>",
+ "No action available" : "Yapılabilecek bir işlem yok",
+ "Error fetching contact actions" : "Kişi işlemleri alınırken sorun çıktı",
"Settings" : "Ayarlar",
"Connection to server lost" : "Sunucu bağlantısı kesildi",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Sayfa yüklenirken bir sorun çıktı. %n saniye sonra yeniden yüklenecek","Sayfa yüklenirken bir sorun çıktı. %n saniye sonra yeniden yüklenecek"],
@@ -263,6 +272,10 @@
"Log in" : "Oturum Aç",
"Stay logged in" : "Bağlı kal",
"Alternative Logins" : "Alternatif Oturum Açmalar",
+ "You are about to grant \"%s\" access to your %s account." : "\"%s\" erişim iznini %s hesabınıza vermek üzeresiniz.",
+ "App token" : "Uygulama Kodu",
+ "Alternative login using app token" : "Uygulama kodu ile alternatif oturum açma",
+ "Redirecting …" : "Yönlendiriliyor...",
"New password" : "Yeni parola",
"New Password" : "Yeni Parola",
"Reset password" : "Parolayı sıfırla",
diff --git a/core/routes.php b/core/routes.php
index 37db2642c1b..c167dad2f9f 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -61,6 +61,7 @@ $application->registerRoutes($this, [
['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
+ ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
],
'ocs' => [
['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],