diff options
Diffstat (limited to 'core')
41 files changed, 350 insertions, 104 deletions
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index d0ed432f03f..eacd5847c6c 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -37,6 +37,7 @@ use OCP\AppFramework\Http\JSONResponse; use \OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Defaults; +use OCP\Encryption\IEncryptionModule; use OCP\Encryption\IManager; use \OCP\IURLGenerator; use \OCP\IRequest; @@ -260,7 +261,15 @@ class LostController extends Controller { } if ($this->encryptionManager->isEnabled() && !$proceed) { - return $this->error('', array('encryption' => true)); + $encryptionModules = $this->encryptionManager->getEncryptionModules(); + foreach ($encryptionModules as $module) { + /** @var IEncryptionModule $instance */ + $instance = call_user_func($module['callback']); + // this way we can find out whether per-user keys are used or a system wide encryption key + if ($instance->needDetailedAccessList()) { + return $this->error('', array('encryption' => true)); + } + } } try { diff --git a/core/css/apps.scss b/core/css/apps.scss index 029301c326f..1120459230a 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -639,7 +639,7 @@ kbd { min-width: $sidebar-min-width; max-width: $sidebar-max-width; display: block; - position: sticky; + @include position('sticky'); top: $header-height; right:0; overflow-y: auto; @@ -829,6 +829,7 @@ $popovericon-size: 16px; background-color: var(--color-main-background); color: var(--color-main-text); border-radius: var(--border-radius); + border: 1px solid transparent; z-index: 110; margin: 5px; margin-top: -5px; @@ -838,9 +839,11 @@ $popovericon-size: 16px; &:after { bottom: 100%; - /* Min-width of popover is 36px and arrow width is 20px - wich leaves us 8px right and 8px left */ - right: 8px; + // Required right-distance is half menu icon size + right padding + // = 16px/2 + 14px = 22px + // popover right margin is 5px, arrow width is 9px to center and border is 1px + // 22px - 9px - 5px - 1px = 7px + right: 7px; /* change this to adjust the arrow position */ border: solid transparent; content: ' '; @@ -849,7 +852,7 @@ $popovericon-size: 16px; position: absolute; pointer-events: none; border-bottom-color: var(--color-main-background); - border-width: 10px; + border-width: 9px; } /* Center the popover */ &.menu-center { @@ -876,6 +879,10 @@ $popovericon-size: 16px; display: block; } + &.contactsmenu-popover { + margin: 0; + } + ul { /* Overwrite #app-navigation > ul ul */ display: flex !important; @@ -1039,7 +1046,7 @@ $popovericon-size: 16px; /* CONTENT LIST ------------------------------------------------------------ */ .app-content-list { width: 300px; - position: sticky; + @include position('sticky'); top: $header-height; border-right: 1px solid var(--color-border); display: flex; diff --git a/core/css/functions.scss b/core/css/functions.scss index 30075df7f58..0815ba29ab6 100644 --- a/core/css/functions.scss +++ b/core/css/functions.scss @@ -59,4 +59,13 @@ .icon-#{$icon}.icon-white { @include icon-color($icon, $dir, $color-white, $version, $core); } -}
\ No newline at end of file +} + +@mixin position($value) { + @if $value == 'sticky' { + position: -webkit-sticky; // Safari support + position: sticky; + } @else { + position: $value; + } +} diff --git a/core/css/header.scss b/core/css/header.scss index 28aae342c6a..41ee0a63fbe 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -70,7 +70,8 @@ #header { /* Header menu */ - .menu { + .header-left > nav > .menu, + .header-right > div > .menu { background-color: var(--color-main-background); filter: drop-shadow(0 1px 5px var(--color-box-shadow)); border-radius: 0 0 3px 3px; @@ -152,6 +153,8 @@ #header-right, .header-right { justify-content: flex-end; + flex-basis: 210px; + flex-shrink: 1; } /* Right header standard */ @@ -226,6 +229,7 @@ nav[role='navigation'] { width: $header-height; height: $header-height; margin-left: -$header-height; + position: relative; } .header-left #navigation { @@ -396,13 +400,14 @@ nav[role='navigation'] { display: block; } } + + #expanddiv:after { + right: 22px; + } } /* Settings menu */ #expanddiv { - &.menu { - right: 17px; - } a { display: inline-flex; align-items: center; @@ -452,6 +457,7 @@ nav[role='navigation'] { opacity: .6; } } + .app-loading { > svg { display: none; @@ -552,6 +558,10 @@ nav[role='navigation'] { li.hidden { display: none; } + + #more-apps { + z-index: 2; + } } /* Skip navigation links – show only on keyboard focus */ diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss index 8ee7412af3c..e30beee44e5 100644 --- a/core/css/jquery-ui-fixes.scss +++ b/core/css/jquery-ui-fixes.scss @@ -173,6 +173,7 @@ .ui-menu-item a { &.ui-state-focus, &.ui-state-active { font-weight: inherit; + box-shadow: inset 4px 0 var(--color-primary); } } } @@ -184,15 +185,25 @@ &.ui-corner-all { border-radius: 0; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; + border-bottom-left-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); } - .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { + .ui-state-hover, .ui-widget-content .ui-state-hover, + .ui-widget-header .ui-state-hover, + .ui-state-focus, + .ui-widget-content .ui-state-focus, + .ui-widget-header .ui-state-focus { border: 1px solid transparent; background: inherit; color: var(--color-primary-element); } + + .ui-menu-item { + a { + border-radius: 0 !important; + } + } } .ui-button.primary { diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss index 0a6e99ddb4f..0a0222497bc 100644 --- a/core/css/jquery.ocdialog.scss +++ b/core/css/jquery.ocdialog.scss @@ -21,7 +21,7 @@ } .oc-dialog-buttonrow { position: relative; - display: block; + display: flex; background: transparent; right: 0; bottom: 0; @@ -32,24 +32,15 @@ background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background)); border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - clear: both; - button { - display: inline-block; + + &.twobuttons { + justify-content: space-between; } -} -/* align primary button to right, other buttons to left */ -.oc-dialog-buttonrow.twobuttons button:nth-child(1) { - float: left; -} -.oc-dialog-buttonrow.twobuttons.aside button:nth-child(1) { - float: none; -} -.oc-dialog-buttonrow.twobuttons button:nth-child(2) { - float: right; -} -.oc-dialog-buttonrow.onebutton button { - float: right; + &.onebutton, + &.twobuttons.aside { + justify-content: flex-end; + } } .oc-dialog-close { diff --git a/core/css/public.scss b/core/css/public.scss index 0c04b07ab09..a4e7ed579b9 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -1,3 +1,5 @@ +$footer-height: 60px; + #body-public { .header-right { @@ -36,8 +38,9 @@ } #content { - height: initial; - min-height: calc(100vh - 160px); + // 100% - footer + min-height: calc(100% - #{$footer-height}); + } /** don't apply content header padding on the base layout */ @@ -64,4 +67,22 @@ form input[type='checkbox']+label { text-align: center; } + + /* public footer */ + footer { + position: relative; + display: flex; + align-items: center; + justify-content: center; + height: $footer-height; + p { + color: var(--color-text-lighter); + a { + color: var(--color-text-lighter); + font-weight: 600; + padding: 13px; + margin: -13px; + } + } + } } diff --git a/core/css/styles.scss b/core/css/styles.scss index ad82a7acbf7..6a72df0e177 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -163,8 +163,7 @@ body { #controls { box-sizing: border-box; - position: -webkit-sticky; - position: sticky; + @include position('sticky'); height: 44px; padding: 0; margin: 0; @@ -601,6 +600,7 @@ code { margin-top: 10px !important; width: auto !important; border-radius: var(--border-radius); + z-index: 1600 !important; .ui-widget-content { border: none !important; @@ -1049,25 +1049,6 @@ div.crumb { } } -/* public footer */ - -#body-public footer { - position: relative; - text-align: center; - .info { - color: var(--color-text-lighter); - text-align: center; - margin: 0 auto; - padding: 20px 0; - a { - color: var(--color-text-lighter); - font-weight: 600; - padding: 13px; - margin: -13px; - } - } -} - /* LEGACY FIX only - do not use fieldsets for settings */ fieldset { diff --git a/core/css/whatsnew.scss b/core/css/whatsnew.scss index e13cdf86256..99d99ded691 100644 --- a/core/css/whatsnew.scss +++ b/core/css/whatsnew.scss @@ -9,6 +9,7 @@ bottom: 35px !important; left: 15px !important; width: 270px; + z-index: 700; } .whatsNewPopover p { diff --git a/core/js/jquery.contactsmenu.js b/core/js/jquery.contactsmenu.js index 1ea9f732f79..e3f24dfff52 100644 --- a/core/js/jquery.contactsmenu.js +++ b/core/js/jquery.contactsmenu.js @@ -15,7 +15,7 @@ + '</li>'; var LIST = '' - + '<div class="menu popovermenu bubble hidden contactsmenu-popover">' + + '<div class="menu popovermenu menu-left hidden contactsmenu-popover">' + ' <ul>' + ' <li>' + ' <a>' diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 0b2fec5588e..736404e2681 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -30,9 +30,13 @@ ' <input id="linkCheckbox-{{cid}}" {{#if isLinkShare}}checked="checked"{{/if}} type="checkbox" name="linkCheckbox" class="linkCheckbox permissions checkbox">' + ' <label for="linkCheckbox-{{cid}}">{{linkShareEnableLabel}}</label>' + ' </span>' + - ' {{#if isLinkShare}}' + + ' {{#if showMenu}}' + ' <div class="share-menu" tabindex="0"><span class="icon icon-more"></span>' + - ' {{{popoverMenu}}}' + + ' {{#if showPending}}' + + ' {{{pendingPopoverMenu}}}' + + ' {{else}}' + + ' {{{popoverMenu}}}' + + ' {{/if}}' + ' </div>' + ' {{/if}}' + ' </span>' + @@ -83,7 +87,8 @@ '{{/if}}' + '{{#if showPasswordCheckBox}}' + ' <li><span class="shareOption menuitem">' + - ' <input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" />' + + ' <input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox"' + + ' {{#if isPasswordSet}}checked="checked"{{/if}} {{#if isPasswordEnforced}}disabled="disabled"{{/if}} value="1" />' + ' <label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' + ' </span></li>' + ' <li class="{{#unless isPasswordSet}}hidden{{/unless}} linkPassMenu"><span class="shareOption menuitem icon-share-pass">' + @@ -92,16 +97,17 @@ ' </span></li>' + '{{/if}}' + '<li>' + - '<span class="shareOption menuitem">' + - '<input id="expireDate-{{cid}}" type="checkbox" name="expirationDate" class="expireDate checkbox" {{#if hasExpireDate}}checked="checked"{{/if}}" />' + - '<label for="expireDate-{{cid}}">{{expireDateLabel}}</label>' + + ' <span class="shareOption menuitem">' + + ' <input id="expireDate-{{cid}}" type="checkbox" name="expirationDate" class="expireDate checkbox"' + + ' {{#if hasExpireDate}}checked="checked"{{/if}} {{#if isExpirationEnforced}}disabled="disabled"{{/if}}" />' + + ' <label for="expireDate-{{cid}}">{{expireDateLabel}}</label>' + + ' </span>' + '</li>' + '<li class="{{#unless hasExpireDate}}hidden{{/unless}}">' + - '<span class="menuitem icon-expiredate expirationDateContainer-{{cid}}">' + - ' <label for="expirationDatePicker-{{cid}}" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' + - ' <input id="expirationDatePicker-{{cid}}" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{#if hasExpireDate}}{{expireDate}}{{else}}{{defaultExpireDate}}{{/if}}" />' + - '</span>' + - '</span>' + + ' <span class="menuitem icon-expiredate expirationDateContainer-{{cid}}">' + + ' <label for="expirationDatePicker-{{cid}}" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' + + ' <input id="expirationDatePicker-{{cid}}" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{#if hasExpireDate}}{{expireDate}}{{else}}{{defaultExpireDate}}{{/if}}" />' + + ' </span>' + '</li>' + '<li>' + '<a href="#" class="share-add"><span class="icon-loading-small hidden"></span>' + @@ -128,6 +134,23 @@ '</ul>' + '</div>'; + // popovermenu waiting for password or expiration date before saving the share + var TEMPLATE_POPOVER_MENU_PENDING = + '<div class="popovermenu pendingpopover menu">' + + '<ul>' + + '{{#if isPasswordEnforced}}' + + ' <li><span class="shareOption menuitem">' + + ' <input type="checkbox" name="showPassword" id="showPassword-{{cid}}" checked="checked" disabled class="checkbox showPasswordCheckbox" value="1" />' + + ' <label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' + + ' </span></li>' + + ' <li class="linkPassMenu"><span class="shareOption menuitem icon-share-pass">' + + ' <input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" autocomplete="new-password" />' + + ' <span class="icon icon-loading-small hidden"></span>' + + ' </span></li>' + + '{{/if}}' + + '</ul>' + + '</div>'; + /** * @class OCA.Share.ShareDialogLinkShareView * @member {OC.Share.ShareItemModel} model @@ -151,22 +174,36 @@ /** @type {Function} **/ _popoverMenuTemplate: undefined, + /** @type {Function} **/ + _pendingPopoverMenuTemplate: undefined, + /** @type {boolean} **/ showLink: true, + /** @type {boolean} **/ + showPending: false, + events: { + // enable/disable + 'change .linkCheckbox': 'onLinkCheckBoxChange', + // open menu + 'click .share-menu .icon-more': 'onToggleMenu', + // password 'focusout input.linkPassText': 'onPasswordEntered', 'keyup input.linkPassText': 'onPasswordKeyUp', - 'click .linkCheckbox': 'onLinkCheckBoxChange', - 'click .linkText': 'onLinkTextClick', + 'change .showPasswordCheckbox': 'onShowPasswordClick', 'change .publicEditingCheckbox': 'onAllowPublicEditingChange', - 'click .showPasswordCheckbox': 'onShowPasswordClick', - 'click .share-menu .icon-more': 'onToggleMenu', + // copy link url + 'click .linkText': 'onLinkTextClick', + // social 'click .pop-up': 'onPopUpClick', + // permission change 'change .publicUploadRadio': 'onPublicUploadChange', + // expire date 'click .expireDate' : 'onExpireDateChange', 'change .datepicker': 'onChangeExpirationDate', 'click .datepicker' : 'showDatePicker', + // note 'click .share-add': 'showNoteForm', 'click .share-note-delete': 'deleteNote', 'click .share-note-submit': 'updateNote' @@ -253,20 +290,26 @@ } if($checkBox.is(':checked')) { - if(this.configModel.get('enforcePasswordForPublicLink') === false && this.configModel.get('enableLinkPasswordByDefault') === false) { + if(this.configModel.get('enforcePasswordForPublicLink') === false) { $loading.removeClass('hidden'); // this will create it this.model.saveLinkShare(); + $('.share-menu .icon-more').click(); + $('.share-menu .icon-more + .popovermenu .clipboardButton').click(); } else { - this.$el.find('.linkPass').slideToggle(OC.menuSpeed); - this.$el.find('.linkPassText').focus(); + // force the rendering of the menu + this.showPending = true; + this.render() + $('.share-menu .icon-more').click(); + $('.share-menu .icon-more + .popovermenu input:eq(1)').focus() } } else { if (this.model.get('linkShare').isLinkShare) { $loading.removeClass('hidden'); this.model.removeLinkShare(); } else { - this.$el.find('.linkPass').slideToggle(OC.menuSpeed); + this.showPending = false; + this.render() } } }, @@ -388,8 +431,7 @@ var shareId = $li.data('share-id'); var $menu = $element.closest('li'); var $form = $menu.next('li.share-note-form'); - - console.log($form.find('.share-note')); + $form.find('.share-note').val(''); $form.addClass('hidden'); @@ -492,6 +534,8 @@ var isLinkShare = this.model.get('linkShare').isLinkShare; var isPasswordSet = !!this.model.get('linkShare').password; + var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink') + var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true var showPasswordCheckBox = isLinkShare && ( !this.configModel.get('enforcePasswordForPublicLink') || !this.model.get('linkShare').password); @@ -565,7 +609,7 @@ passwordLabel: t('core', 'Password'), passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE, passwordPlaceholderInitial: passwordPlaceholderInitial, - isPasswordSet: isPasswordSet, + isPasswordSet: isPasswordSet || isPasswordEnabledByDefault || isPasswordEnforced, showPasswordCheckBox: showPasswordCheckBox, publicUpload: publicUpload && isLinkShare, publicEditing: publicEditable, @@ -587,12 +631,23 @@ expirationDatePlaceholder: t('core', 'Expiration date'), hasExpireDate: hasExpireDate, isExpirationEnforced: isExpirationEnforced, + isPasswordEnforced: isPasswordEnforced, expireDate: expireDate, defaultExpireDate: moment().add(1, 'day').format('DD-MM-YYYY'), // Can't expire today shareNote: this.model.get('linkShare').note, addNoteLabel: t('core', 'Note to recipient'), }); + var pendingPopover = this.pendingPopoverMenuTemplate({ + cid: this.model.get('linkShare').id, + enablePasswordLabel: t('core', 'Password protect'), + passwordLabel: t('core', 'Password'), + passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE, + passwordPlaceholderInitial: passwordPlaceholderInitial, + showPasswordCheckBox: showPasswordCheckBox, + isPasswordEnforced: isPasswordEnforced, + }); + this.$el.html(linkShareTemplate({ cid: this.model.get('linkShare').id, shareAllowed: true, @@ -600,6 +655,9 @@ linkShareLabel: t('core', 'Share link'), linkShareEnableLabel: t('core', 'Enable'), popoverMenu: popover, + pendingPopoverMenu: pendingPopover, + showMenu: isLinkShare || this.showPending, + showPending: this.showPending && !isLinkShare })); this.delegateEvents(); @@ -645,6 +703,19 @@ return this._popoverMenuTemplate(data); }, + /** + * renders the pending popover template and returns the resulting HTML + * + * @param {Object} data + * @returns {string} + */ + pendingPopoverMenuTemplate: function(data) { + if(!this._pendingPopoverMenuTemplate) { + this._pendingPopoverMenuTemplate = Handlebars.compile(TEMPLATE_POPOVER_MENU_PENDING); + } + return this._pendingPopoverMenuTemplate(data); + }, + onPopUpClick: function(event) { event.preventDefault(); event.stopPropagation(); @@ -701,7 +772,6 @@ self.setExpirationDate(expireDate); } }); - console.log(event, $(expirationDatePicker)); $(expirationDatePicker).datepicker('show'); $(expirationDatePicker).focus(); diff --git a/core/js/tests/specs/jquery.contactsmenuSpec.js b/core/js/tests/specs/jquery.contactsmenuSpec.js index 7287648f5a2..80d08150c3f 100644 --- a/core/js/tests/specs/jquery.contactsmenuSpec.js +++ b/core/js/tests/specs/jquery.contactsmenuSpec.js @@ -45,7 +45,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left hidden contactsmenu-popover"> <ul> <li> <a> <span class="icon-loading-small"></span> </a> </li> </ul></div>'); }); }); @@ -120,7 +120,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left 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() { @@ -147,7 +147,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left 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() { @@ -167,7 +167,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left 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() { @@ -182,7 +182,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left 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() { @@ -197,7 +197,7 @@ describe('jquery.contactsMenu tests', function() { 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>'); + expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left 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>'); }); }); diff --git a/core/js/update.js b/core/js/update.js index 9562c7b2e47..eb65336229e 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -107,7 +107,7 @@ } setTimeout(function () { - OC.redirect(OC.webroot + '/'); + OC.redirect(window.location.href); }, 3000); } }); diff --git a/core/l10n/de.js b/core/l10n/de.js index c27529b2f23..ac2758a783b 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -139,7 +139,7 @@ OC.L10N.register( "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "Die PHP-Funktion \"set_time_limit\" ist nicht verfügbar. Dies kann in angehaltenen Scripten oder einer fehlerhaften Installation resultieren. Es wird dringend empfohlen, diese Funktion zu aktivieren.", "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Dein PHP unterstützt Freetype nicht. Dies wird defekte Profilbilder und eine defekte Anzeige der Einstellungen verursachen.", "Missing index \"{indexName}\" in table \"{tableName}\"." : "Fehlender Index \"{indexName}\" in der Tabelle \"{tableName}\".", - "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"ooc db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.", + "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"occ db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "This is particularly recommended when using the desktop client for file synchronisation." : "Dies wird insbesondere bei der Benutzung des Desktop-Clients zur Synchronisierung empfohlen.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Dokumentation ↗</a> schauen.", @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Aktivieren", "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt", "Shared with you and {circle} by {owner}" : "Von {owner} mit Dir und {circle} geteilt", + "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt", "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt", "Choose a password for the mail share" : "Wähle ein Passwort für das Teilen via E-Mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "Entfernte Freigabe", "remote group" : "Externe Gruppe", "email" : "E-Mail", + "conversation" : "Unterhaltung", "shared by {sharer}" : "Geteilt von {sharer}", "Unshare" : "Freigabe aufheben", "Can reshare" : "kann weiterteilen", diff --git a/core/l10n/de.json b/core/l10n/de.json index 4dfa2975267..5b396716880 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -137,7 +137,7 @@ "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "Die PHP-Funktion \"set_time_limit\" ist nicht verfügbar. Dies kann in angehaltenen Scripten oder einer fehlerhaften Installation resultieren. Es wird dringend empfohlen, diese Funktion zu aktivieren.", "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Dein PHP unterstützt Freetype nicht. Dies wird defekte Profilbilder und eine defekte Anzeige der Einstellungen verursachen.", "Missing index \"{indexName}\" in table \"{tableName}\"." : "Fehlender Index \"{indexName}\" in der Tabelle \"{tableName}\".", - "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"ooc db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.", + "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"occ db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "This is particularly recommended when using the desktop client for file synchronisation." : "Dies wird insbesondere bei der Benutzung des Desktop-Clients zur Synchronisierung empfohlen.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Dokumentation ↗</a> schauen.", @@ -177,6 +177,7 @@ "Enable" : "Aktivieren", "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt", "Shared with you and {circle} by {owner}" : "Von {owner} mit Dir und {circle} geteilt", + "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt", "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt", "Choose a password for the mail share" : "Wähle ein Passwort für das Teilen via E-Mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt", @@ -184,6 +185,7 @@ "remote" : "Entfernte Freigabe", "remote group" : "Externe Gruppe", "email" : "E-Mail", + "conversation" : "Unterhaltung", "shared by {sharer}" : "Geteilt von {sharer}", "Unshare" : "Freigabe aufheben", "Can reshare" : "kann weiterteilen", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index ccaee632a0b..6ee937b8028 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Aktivieren", "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.", "Shared with you and {circle} by {owner}" : "Von {owner} mit Ihnen und {circle} geteilt", + "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt", "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.", "Choose a password for the mail share" : "Wählen Sie ein Passwort für das Teilen via E-Mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "Entfernte Freigabe", "remote group" : "Externe Gruppe", "email" : "E-Mail", + "conversation" : "Unterhaltung", "shared by {sharer}" : "Geteilt von {sharer}", "Unshare" : "Freigabe aufheben", "Can reshare" : "kann weiterteilen", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 2200baf03cf..c9f5de9f2ac 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -177,6 +177,7 @@ "Enable" : "Aktivieren", "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.", "Shared with you and {circle} by {owner}" : "Von {owner} mit Ihnen und {circle} geteilt", + "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt", "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.", "Choose a password for the mail share" : "Wählen Sie ein Passwort für das Teilen via E-Mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt", @@ -184,6 +185,7 @@ "remote" : "Entfernte Freigabe", "remote group" : "Externe Gruppe", "email" : "E-Mail", + "conversation" : "Unterhaltung", "shared by {sharer}" : "Geteilt von {sharer}", "Unshare" : "Freigabe aufheben", "Can reshare" : "kann weiterteilen", diff --git a/core/l10n/es.js b/core/l10n/es.js index 65436ded677..0ee10c102d6 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Habilitar", "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}", "Shared with you and {circle} by {owner}" : "Compartido contigo y {circle} por {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Compartido contigo y con la conversación {conversation} por {owner}", "Shared with you by {owner}" : "Compartido contigo por {owner}", "Choose a password for the mail share" : "Elija una contraseña para compartir por correo electrónico", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} compartido por medio de un link", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "remoto", "remote group" : "grupo remoto", "email" : "email", + "conversation" : "conversación", "shared by {sharer}" : "compartido por {sharer}", "Unshare" : "Dejar de compartir", "Can reshare" : "Puede compartir", diff --git a/core/l10n/es.json b/core/l10n/es.json index 30ba2decda4..40fc621750a 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -177,6 +177,7 @@ "Enable" : "Habilitar", "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}", "Shared with you and {circle} by {owner}" : "Compartido contigo y {circle} por {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Compartido contigo y con la conversación {conversation} por {owner}", "Shared with you by {owner}" : "Compartido contigo por {owner}", "Choose a password for the mail share" : "Elija una contraseña para compartir por correo electrónico", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} compartido por medio de un link", @@ -184,6 +185,7 @@ "remote" : "remoto", "remote group" : "grupo remoto", "email" : "email", + "conversation" : "conversación", "shared by {sharer}" : "compartido por {sharer}", "Unshare" : "Dejar de compartir", "Can reshare" : "Puede compartir", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 15dc0502dc3..7fefd3c0f87 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Activer", "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}", "Shared with you and {circle} by {owner}" : "Partagé avec vous et {circle} par {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Partagé avec vous et la conversation {conversation} par {owner}", "Shared with you by {owner}" : "Partagé avec vous par {owner}", "Choose a password for the mail share" : "Choisissez un mot de passe pour le partage par email", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "distant", "remote group" : "groupe distant", "email" : "Adresse de courriel", + "conversation" : "conversation", "shared by {sharer}" : "partagé par {sharer}", "Unshare" : "Ne plus partager", "Can reshare" : "Peut repartager", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 891e3e813b7..45cffe3d557 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -177,6 +177,7 @@ "Enable" : "Activer", "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}", "Shared with you and {circle} by {owner}" : "Partagé avec vous et {circle} par {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Partagé avec vous et la conversation {conversation} par {owner}", "Shared with you by {owner}" : "Partagé avec vous par {owner}", "Choose a password for the mail share" : "Choisissez un mot de passe pour le partage par email", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien", @@ -184,6 +185,7 @@ "remote" : "distant", "remote group" : "groupe distant", "email" : "Adresse de courriel", + "conversation" : "conversation", "shared by {sharer}" : "partagé par {sharer}", "Unshare" : "Ne plus partager", "Can reshare" : "Peut repartager", diff --git a/core/l10n/he.js b/core/l10n/he.js index 9ba59625725..3ef4002f424 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -84,6 +84,7 @@ OC.L10N.register( "No" : "לא", "Yes" : "כן", "No files in here" : "אין כאן קבצים", + "No more subfolders in here" : "אין כאן עוד תת־תיקיות", "Choose" : "בחירה", "Copy" : "העתקה", "Move" : "העברה", @@ -105,6 +106,8 @@ OC.L10N.register( "Pending" : "בהמתנה", "Copy to {folder}" : "העתקה אל {folder}", "Move to {folder}" : "העברה אל {folder}", + "New in" : "חדש ב־", + "View changelog" : "הצגת יומן שינויים", "Very weak password" : "ססמה מאוד חלשה", "Weak password" : "ססמה חלשה", "So-so password" : "ססמה בינונית", @@ -158,6 +161,7 @@ OC.L10N.register( "Press Ctrl-C to copy." : "יש להקיש Ctrl-C כדי להעתיק.", "Resharing is not allowed" : "אסור לעשות שיתוף מחדש", "Share to {name}" : "שיתוף עם {name}", + "Copy URL" : "העתקת כתובת", "Link" : "קישור", "Password protect" : "הגנה בססמה", "Allow editing" : "אישור עריכה", @@ -297,6 +301,7 @@ OC.L10N.register( "Username or email" : "שם משתמש או דואר אלקטרוני", "Log in" : "כניסה", "Wrong password." : "ססמה שגויה.", + "User disabled" : "משתמש מושבת", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "זיהינו מספר ניסיונות כניסה שגויים מכתובת ה־IP שלך. לכן, ניסיון הכניסה הבא יתאפשר עבורך רק בעוד 30 שניות.", "Forgot password?" : "שכחת ססמה?", "Back to login" : "חזרה לכניסה", diff --git a/core/l10n/he.json b/core/l10n/he.json index 9f5b50ad789..ca851aaa2a2 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -82,6 +82,7 @@ "No" : "לא", "Yes" : "כן", "No files in here" : "אין כאן קבצים", + "No more subfolders in here" : "אין כאן עוד תת־תיקיות", "Choose" : "בחירה", "Copy" : "העתקה", "Move" : "העברה", @@ -103,6 +104,8 @@ "Pending" : "בהמתנה", "Copy to {folder}" : "העתקה אל {folder}", "Move to {folder}" : "העברה אל {folder}", + "New in" : "חדש ב־", + "View changelog" : "הצגת יומן שינויים", "Very weak password" : "ססמה מאוד חלשה", "Weak password" : "ססמה חלשה", "So-so password" : "ססמה בינונית", @@ -156,6 +159,7 @@ "Press Ctrl-C to copy." : "יש להקיש Ctrl-C כדי להעתיק.", "Resharing is not allowed" : "אסור לעשות שיתוף מחדש", "Share to {name}" : "שיתוף עם {name}", + "Copy URL" : "העתקת כתובת", "Link" : "קישור", "Password protect" : "הגנה בססמה", "Allow editing" : "אישור עריכה", @@ -295,6 +299,7 @@ "Username or email" : "שם משתמש או דואר אלקטרוני", "Log in" : "כניסה", "Wrong password." : "ססמה שגויה.", + "User disabled" : "משתמש מושבת", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "זיהינו מספר ניסיונות כניסה שגויים מכתובת ה־IP שלך. לכן, ניסיון הכניסה הבא יתאפשר עבורך רק בעוד 30 שניות.", "Forgot password?" : "שכחת ססמה?", "Back to login" : "חזרה לכניסה", diff --git a/core/l10n/it.js b/core/l10n/it.js index d489881a509..f6d05902c9f 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Abilita", "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}", "Shared with you and {circle} by {owner}" : "Condiviso con te e {circle} da {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Condiviso con te e con la conversazione {conversation} da {owner}", "Shared with you by {owner}" : "Condiviso con te da {owner}", "Choose a password for the mail share" : "Scegli una password per la condivisione tramite posta", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "remota", "remote group" : "gruppo remoto", "email" : "email", + "conversation" : "conversazione", "shared by {sharer}" : "condiviso da {sharer}", "Unshare" : "Rimuovi condivisione", "Can reshare" : "Può ri-condividere", diff --git a/core/l10n/it.json b/core/l10n/it.json index 4bf66ba3504..d4efb385796 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -177,6 +177,7 @@ "Enable" : "Abilita", "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}", "Shared with you and {circle} by {owner}" : "Condiviso con te e {circle} da {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Condiviso con te e con la conversazione {conversation} da {owner}", "Shared with you by {owner}" : "Condiviso con te da {owner}", "Choose a password for the mail share" : "Scegli una password per la condivisione tramite posta", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento", @@ -184,6 +185,7 @@ "remote" : "remota", "remote group" : "gruppo remoto", "email" : "email", + "conversation" : "conversazione", "shared by {sharer}" : "condiviso da {sharer}", "Unshare" : "Rimuovi condivisione", "Can reshare" : "Può ri-condividere", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 19958aff740..5e144091ab7 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -113,7 +113,7 @@ OC.L10N.register( "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "PHP OPcacheが適切に設定されていません。<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">よりパフォーマンスを向上させる</a>には、<code>php.ini</code>で以下の設定を推奨します:", "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "\"Strict-Transport-Security\" HTTPヘッダが最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer noopener\">セキュリティTips ↗</a>で解説しているHSTSを有効にすることを推奨します。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips ↗</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips ↗</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。", "Shared" : "共有中", "Choose a password for the public link" : "URLによる共有のパスワードを入力", "Choose a password for the public link or press the \"Enter\" key" : "公開リンクのパスワードを入力、または、\"エンター\"のみを叩く", @@ -284,7 +284,7 @@ OC.L10N.register( "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。可能であれば、パフォーマンスを向上するため、memcacheを設定してください。より詳しい情報は<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>で参照できます。", "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が適切に設定されていません。<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">よりパフォーマンスを向上させる</a>には、<code>php.ini</code>で以下の設定を推奨します:", "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ヘッダが、最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer\">セキュリティTips</a>で解説しているHSTSを有効にすることを推奨します。", - "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。", "Error setting expiration date" : "有効期限の設定でエラー発生", "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "ユーザー名、グループ、クラウド統合ID、メールアドレスで共有", @@ -295,6 +295,6 @@ OC.L10N.register( "Alternative login using app token" : "アプリトークンを使って代替ログイン", "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加", "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "\"Strict-Transport-Security\" HTTPヘッダが、最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer noopener\">セキュリティTips</a>で解説しているHSTSを有効にすることを推奨します。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。" + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。" }, "nplurals=1; plural=0;"); diff --git a/core/l10n/ja.json b/core/l10n/ja.json index c3aa6b3e175..1e36185b6e4 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -111,7 +111,7 @@ "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "PHP OPcacheが適切に設定されていません。<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">よりパフォーマンスを向上させる</a>には、<code>php.ini</code>で以下の設定を推奨します:", "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました", "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "\"Strict-Transport-Security\" HTTPヘッダが最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer noopener\">セキュリティTips ↗</a>で解説しているHSTSを有効にすることを推奨します。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips ↗</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips ↗</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。", "Shared" : "共有中", "Choose a password for the public link" : "URLによる共有のパスワードを入力", "Choose a password for the public link or press the \"Enter\" key" : "公開リンクのパスワードを入力、または、\"エンター\"のみを叩く", @@ -282,7 +282,7 @@ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。可能であれば、パフォーマンスを向上するため、memcacheを設定してください。より詳しい情報は<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>で参照できます。", "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が適切に設定されていません。<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">よりパフォーマンスを向上させる</a>には、<code>php.ini</code>で以下の設定を推奨します:", "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ヘッダが、最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer\">セキュリティTips</a>で解説しているHSTSを有効にすることを推奨します。", - "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。", "Error setting expiration date" : "有効期限の設定でエラー発生", "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります", "Share with other people by entering a user or group, a federated cloud ID or an email address." : "ユーザー名、グループ、クラウド統合ID、メールアドレスで共有", @@ -293,6 +293,6 @@ "Alternative login using app token" : "アプリトークンを使って代替ログイン", "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加", "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "\"Strict-Transport-Security\" HTTPヘッダが、最低でも \"{seconds}\" 秒に設定されていません。セキュリティを強化するには、<a href=\"{docUrl}\" rel=\"noreferrer noopener\">セキュリティTips</a>で解説しているHSTSを有効にすることを推奨します。", - "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバを設定することを強くおすすめします。" + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "セキュアではないHTTP経由でアクセスしています。<a href=\"{docUrl}\">セキュリティTips</a>で述べているように、代わりにHTTPSを必要とするようサーバーを設定することを強くおすすめします。" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/core/l10n/nb.js b/core/l10n/nb.js index 5aff62d7d38..1115410b949 100644 --- a/core/l10n/nb.js +++ b/core/l10n/nb.js @@ -127,7 +127,7 @@ OC.L10N.register( "Last background job execution ran {relativeTime}. Something seems wrong." : "Den siste bakgrunsjobben brukte {relativeTime}. Noe virker galt.", "Check the background job settings" : "Kontroller instillinger for bakgrunnsjobb", "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. Establish a connection from this server to the Internet to enjoy 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 tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Det anbefales å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.", - "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", + "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", "You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du bruker PHP-{version}. Oppgrader PHP-versjonen for å utnytte <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">ytelsen og sikkerhetsoppdateringene som tilbys av PHP Group</a, så fort din distribusjon støtter det.", "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "Du kjører nå PHP 5.6. Den nåværende hovedversjonen er den siste som støtter PHP 5.6. Det anbefales å oppgradere PHP-versjonen til 7.0+, for å kunne oppgradere til Nextcloud 14.", @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Aktiver", "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}", "Shared with you and {circle} by {owner}" : "Delt med deg og {circle} av {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Delt med deg og samtalen {conversation} 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", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "ekstern", "remote group" : "ekstern gruppe", "email" : "e-post", + "conversation" : "samtale", "shared by {sharer}" : "delt av {sharer}", "Unshare" : "Avslutt deling", "Can reshare" : "Kan dele videre", @@ -356,7 +358,7 @@ OC.L10N.register( "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 tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer 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>." : "Inget 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>.", + "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>." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjonen</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" 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-{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>.", @@ -366,7 +368,7 @@ OC.L10N.register( "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.", "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 nås 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>.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre 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 besøker 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 with {recipients}" : "Delt med {recipients}", "Error setting expiration date" : "Kan ikke sette utløpsdato", @@ -389,7 +391,7 @@ OC.L10N.register( "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et klarert domene", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "For hjelp, se i <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasjonen</a>.", "Your PHP does not have freetype support. This will result in broken profile pictures and settings interface." : "Din PHP-installasjon har ikke FreeType-støtte. Dette fører til knekte profilbilder og skadelidende innstillingsgrensesnitt.", - "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For bedret sikkerhet anbefales det å skru på HSTS som beskrevet i <a href=\"{docUrl}\" rel=\"noreferrer noopener\">sikkerhetstipsene</a>.", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i <a href=\"{docUrl}\" rel=\"noreferrer noopener\">sikkerhetstipsene</a>.", "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "Du besøker denne nettsiden via HTTP. Det anbefales sterkt at du setter opp tjeneren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstipsene</a>.", "Back to log in" : "Tilbake til innlogging", "Depending on your configuration, this button could also work to trust the domain:" : "Avhengig av ditt oppsett, kan denne knappen også betro domenet." diff --git a/core/l10n/nb.json b/core/l10n/nb.json index 67d4c77feb5..3f374cd0c4a 100644 --- a/core/l10n/nb.json +++ b/core/l10n/nb.json @@ -125,7 +125,7 @@ "Last background job execution ran {relativeTime}. Something seems wrong." : "Den siste bakgrunsjobben brukte {relativeTime}. Noe virker galt.", "Check the background job settings" : "Kontroller instillinger for bakgrunnsjobb", "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. Establish a connection from this server to the Internet to enjoy 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 tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Det anbefales å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.", - "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", + "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjonen</a>.", "You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du bruker PHP-{version}. Oppgrader PHP-versjonen for å utnytte <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">ytelsen og sikkerhetsoppdateringene som tilbys av PHP Group</a, så fort din distribusjon støtter det.", "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "Du kjører nå PHP 5.6. Den nåværende hovedversjonen er den siste som støtter PHP 5.6. Det anbefales å oppgradere PHP-versjonen til 7.0+, for å kunne oppgradere til Nextcloud 14.", @@ -177,6 +177,7 @@ "Enable" : "Aktiver", "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}", "Shared with you and {circle} by {owner}" : "Delt med deg og {circle} av {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Delt med deg og samtalen {conversation} 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", @@ -184,6 +185,7 @@ "remote" : "ekstern", "remote group" : "ekstern gruppe", "email" : "e-post", + "conversation" : "samtale", "shared by {sharer}" : "delt av {sharer}", "Unshare" : "Avslutt deling", "Can reshare" : "Kan dele videre", @@ -354,7 +356,7 @@ "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 tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer 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>." : "Inget 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>.", + "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>." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjonen</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" 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-{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>.", @@ -364,7 +366,7 @@ "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.", "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 nås 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>.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre 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 besøker 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 with {recipients}" : "Delt med {recipients}", "Error setting expiration date" : "Kan ikke sette utløpsdato", @@ -387,7 +389,7 @@ "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et klarert domene", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "For hjelp, se i <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasjonen</a>.", "Your PHP does not have freetype support. This will result in broken profile pictures and settings interface." : "Din PHP-installasjon har ikke FreeType-støtte. Dette fører til knekte profilbilder og skadelidende innstillingsgrensesnitt.", - "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For bedret sikkerhet anbefales det å skru på HSTS som beskrevet i <a href=\"{docUrl}\" rel=\"noreferrer noopener\">sikkerhetstipsene</a>.", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips</a>." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i <a href=\"{docUrl}\" rel=\"noreferrer noopener\">sikkerhetstipsene</a>.", "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips</a>." : "Du besøker denne nettsiden via HTTP. Det anbefales sterkt at du setter opp tjeneren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstipsene</a>.", "Back to log in" : "Tilbake til innlogging", "Depending on your configuration, this button could also work to trust the domain:" : "Avhengig av ditt oppsett, kan denne knappen også betro domenet." diff --git a/core/l10n/nl.js b/core/l10n/nl.js index cfd2ffae64b..5e2de96d025 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -35,6 +35,7 @@ OC.L10N.register( "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld", "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld", "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief", + "Waiting for cron to finish (checks again in 5 seconds) …" : "Wachten op gereedmelding cron (over 5 seconden nieuwe check) …", "Updating database schema" : "Databaseschema aan het bijwerken", "Updated database" : "Database bijgewerkt", "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Controleert of het databaseschema geüpdatet kan worden (dit kan lang duren afhankelijk van de grootte van de de database)", @@ -83,6 +84,7 @@ OC.L10N.register( "No" : "Nee", "Yes" : "Ja", "No files in here" : "Hier geen bestanden", + "No more subfolders in here" : "Hier niet meer submappen", "Choose" : "Kies", "Copy" : "Kopiëren", "Move" : "Verplaats", @@ -105,6 +107,7 @@ OC.L10N.register( "Copy to {folder}" : "Kopieer naar {folder}", "Move to {folder}" : "Verplaats naar {folder}", "New in" : "Nieuw in", + "View changelog" : "Bekijk wijzigingsoverzicht", "Very weak password" : "Zeer zwak wachtwoord", "Weak password" : "Zwak wachtwoord", "So-so password" : "Matig wachtwoord", @@ -112,6 +115,17 @@ OC.L10N.register( "Strong password" : "Sterk wachtwoord", "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface niet goed lijkt te werken.", "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", + "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn ingesteld voor opvragen systeemomgevingsvariabelen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">installation documentation ↗</a> for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">installatiedocumentatie ↗</a> voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.", + "The read-only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", + "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.", + "The PHP module \"fileinfo\" is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module \"fileinfo\" ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.", + "{name} below version {version} is installed, for stability and performance reasons it is recommended to update to a newer {name} version." : "{name} lager dan {version} is geïnstalleerd, voor stabiliteits- en prestatieredenen wodt geadviseerd om naar een recentere {name} versie bij te werken.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable \"filelocking.enabled\" in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a> for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel \"filelocking enabled\" in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie ↗</a> voor meer informatie.", + "If your installation is not installed at the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (suggestion: \"{suggestedOverwriteCliURL}\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen:\"{suggestedOverwriteCliURL}\")", + "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:", + "Last background job execution ran {relativeTime}. Something seems wrong." : "Laatst uitgevoerde achtergrondtaak {relativeTime}. Er lijkt iets fout gegaan.", + "Check the background job settings" : "Controleer de achtergrondtaak instellingen", "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. Establish a connection from this server to the Internet to enjoy all features." : "Deze server heeft geen werkende internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals het gebruik van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als je alle functies wilt gebruiken.", "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je een geheugencache configureren als die beschikbaar is. Meer informatie vind je in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar voor PHP, het geen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", @@ -120,13 +134,23 @@ OC.L10N.register( "The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</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 noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw…</a>)", + "The PHP OPcache module is not loaded. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to load it into your PHP installation." : "De PHP OPcache is niet correct geladen. </a>Voor betere prestaties adviseren we</a> die te laden in je php.ini instellingen.", "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "De PHP OPcache is niet correct geconfigureerd. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Voor betere prestaties adviseren we</a> de volgende <code>php.ini instellingen</code> te gebruiken:", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren sterk om deze functie in te schakelen.", "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Je PHP heeft geen FreeType ondersteuning. Dit zal leiden tot verminkte profielafbeeldingen en instellingeninterface.", + "Missing index \"{indexName}\" in table \"{tableName}\"." : "Ontbrekende index \"{indexName}\" in tabel \"{tableName}\".", + "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "De database mist een paar indexen. Omdat het toevoegen van indexen op grote tabellen veel tijd kan kosten, zijn ze niet automatisch gecreëerd. Door het draaien van \"occ db:add-missing-indices\" kunnen deze indexen handmatig worden toegevoegd terwijl de server blijft draaien. Als de indexe zijn toegevoegd, zullen opvragingen op die tabellen veel sneller plaatsvinden.", + "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.", + "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Om te migreren naar een andere database moet je de commandoregel tool gebruiken: 'occ db:convert-type'; <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">zie de documentatie ↗</a>.", + "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "D ingebouwde php mailer wordt niet langer ondersteund. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Werk je mailserverinstellingen bij ↗<a/>.", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is niet ingesteld als \"{expected}\". Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", "The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is ingesteld als \"{expected}\". Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.", + "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\" or \"{val4}\". This can leak referer information. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C Recommendation ↗</a>." : "De \"{header}\" HTTP header is niet ingesteld op \"{val1}\", \"{val2}\", \"{val3}\" of \"{val4}\". Hierdoor kan refer informatie uitlekken. Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C aanbeveling ↗</a>.", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "De \"Strict-Transport-Security\" HTTP header is niet ingesteld als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in de <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>.", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "De site is onveilig verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in de <a href=\"{docUrl}\">security tips ↗</a>.", "Shared" : "Gedeeld", "Shared with" : "Gedeeld met", "Shared by" : "Gedeeld door", @@ -138,6 +162,7 @@ OC.L10N.register( "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.", "Resharing is not allowed" : "Verder delen is niet toegestaan", "Share to {name}" : "Delen naar {name}", + "Copy URL" : "Kopiëren URL", "Link" : "Link", "Password protect" : "Wachtwoord beveiligd", "Allow editing" : "Bewerken toestaan", @@ -149,14 +174,20 @@ OC.L10N.register( "Set expiration date" : "Stel vervaldatum in", "Expiration" : "Vervaltermijn", "Expiration date" : "Vervaldatum", + "Note to recipient" : "Notitie voor ontvanger", "Share link" : "Deellink", + "Enable" : "Inschakelen", "Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}", + "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Gedeeld met jou en gesprek {conversation} door {owner}", "Shared with you by {owner}" : "Met je gedeeld door {owner}", "Choose a password for the mail share" : "Kies een wachtwoord om gedeelde te mailen", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delen via link", "group" : "groep", "remote" : "extern", + "remote group" : "externe groep", "email" : "email", + "conversation" : "gesprek", "shared by {sharer}" : "Gedeeld door {eigenaar}", "Unshare" : "Delen stoppen", "Can reshare" : "Kan doordelen", @@ -164,6 +195,7 @@ OC.L10N.register( "Can create" : "Kan creëren", "Can change" : "Kan wijzigen", "Can delete" : "Kan verwijderen", + "Password protect by Talk" : "Wachtwoord beveiligd door Talk", "Access control" : "Toegangscontrole", "Could not unshare" : "Kon delen niet ongedaan maken", "Error while sharing" : "Fout tijdens het delen", @@ -176,6 +208,7 @@ OC.L10N.register( "An error occurred. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (remote)" : "{sharee} (extern)", + "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Delen", @@ -260,9 +293,14 @@ OC.L10N.register( "Need help?" : "Hulp nodig?", "See the documentation" : "Zie de documentatie", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.", + "Skip to main content" : "Ga naar hoofdinhoud", + "Skip to navigation of app" : "Ga naar navigatie van app", "More apps" : "Meer apps", + "More apps menu" : "Meer apps menu", "Search" : "Zoeken", "Reset search" : "Zoekopdracht wissen", + "Contacts" : "Contactpersonen", + "Contacts menu" : "Contacten menu", "Settings menu" : "Instellingenmenu", "Confirm your password" : "Bevestig je wachtwoord", "Server side authentication failed!" : "Authenticatie bij de server mislukt!", @@ -272,6 +310,7 @@ OC.L10N.register( "Username or email" : "Gebruikersnaam of email", "Log in" : "Inloggen", "Wrong password." : "Onjuist wachtwoord.", + "User disabled" : "Gebruiker gedeactiveerd", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken van jouw IP gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.", "Forgot password?" : "Wachtwoord vergeten?", "Back to login" : "Terug naar inloggen", @@ -285,8 +324,11 @@ OC.L10N.register( "Redirecting …" : "Omleiding ...", "New password" : "Nieuw wachtwoord", "New Password" : "Nieuw wachtwoord", + "This share is password-protected" : "Deze share is wachtwoordbeveiligd", + "The password is wrong. Try again." : "Het wachtwoord is onjuist. Probeer opnieuw.", "Two-factor authentication" : "Tweefactor authenticatie", "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.", + "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Kon niet minimaal één an jouw ingeschakelde two-factor auth methoden laden. Neem contact op met je beheerder.", "Cancel log in" : "Inloggen annuleren", "Use backup code" : "Gebruik back-upcode", "Error while validating your second factor" : "Fout bij het verifiëren van je tweede factor", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 77f8206b0f3..5dae1bf1568 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -33,6 +33,7 @@ "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld", "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld", "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief", + "Waiting for cron to finish (checks again in 5 seconds) …" : "Wachten op gereedmelding cron (over 5 seconden nieuwe check) …", "Updating database schema" : "Databaseschema aan het bijwerken", "Updated database" : "Database bijgewerkt", "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Controleert of het databaseschema geüpdatet kan worden (dit kan lang duren afhankelijk van de grootte van de de database)", @@ -81,6 +82,7 @@ "No" : "Nee", "Yes" : "Ja", "No files in here" : "Hier geen bestanden", + "No more subfolders in here" : "Hier niet meer submappen", "Choose" : "Kies", "Copy" : "Kopiëren", "Move" : "Verplaats", @@ -103,6 +105,7 @@ "Copy to {folder}" : "Kopieer naar {folder}", "Move to {folder}" : "Verplaats naar {folder}", "New in" : "Nieuw in", + "View changelog" : "Bekijk wijzigingsoverzicht", "Very weak password" : "Zeer zwak wachtwoord", "Weak password" : "Zwak wachtwoord", "So-so password" : "Matig wachtwoord", @@ -110,6 +113,17 @@ "Strong password" : "Sterk wachtwoord", "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface niet goed lijkt te werken.", "Your web server is not properly set up to resolve \"{url}\". Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", + "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn ingesteld voor opvragen systeemomgevingsvariabelen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">installation documentation ↗</a> for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">installatiedocumentatie ↗</a> voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.", + "The read-only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", + "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.", + "The PHP module \"fileinfo\" is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module \"fileinfo\" ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.", + "{name} below version {version} is installed, for stability and performance reasons it is recommended to update to a newer {name} version." : "{name} lager dan {version} is geïnstalleerd, voor stabiliteits- en prestatieredenen wodt geadviseerd om naar een recentere {name} versie bij te werken.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable \"filelocking.enabled\" in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a> for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel \"filelocking enabled\" in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie ↗</a> voor meer informatie.", + "If your installation is not installed at the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (suggestion: \"{suggestedOverwriteCliURL}\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen:\"{suggestedOverwriteCliURL}\")", + "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:", + "Last background job execution ran {relativeTime}. Something seems wrong." : "Laatst uitgevoerde achtergrondtaak {relativeTime}. Er lijkt iets fout gegaan.", + "Check the background job settings" : "Controleer de achtergrondtaak instellingen", "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. Establish a connection from this server to the Internet to enjoy all features." : "Deze server heeft geen werkende internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals het gebruik van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als je alle functies wilt gebruiken.", "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je een geheugencache configureren als die beschikbaar is. Meer informatie vind je in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar voor PHP, het geen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>.", @@ -118,13 +132,23 @@ "The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</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 noopener\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw…</a>)", + "The PHP OPcache module is not loaded. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to load it into your PHP installation." : "De PHP OPcache is niet correct geladen. </a>Voor betere prestaties adviseren we</a> die te laden in je php.ini instellingen.", "The PHP OPcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:" : "De PHP OPcache is niet correct geconfigureerd. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Voor betere prestaties adviseren we</a> de volgende <code>php.ini instellingen</code> te gebruiken:", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren sterk om deze functie in te schakelen.", "Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Je PHP heeft geen FreeType ondersteuning. Dit zal leiden tot verminkte profielafbeeldingen en instellingeninterface.", + "Missing index \"{indexName}\" in table \"{tableName}\"." : "Ontbrekende index \"{indexName}\" in tabel \"{tableName}\".", + "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "De database mist een paar indexen. Omdat het toevoegen van indexen op grote tabellen veel tijd kan kosten, zijn ze niet automatisch gecreëerd. Door het draaien van \"occ db:add-missing-indices\" kunnen deze indexen handmatig worden toegevoegd terwijl de server blijft draaien. Als de indexe zijn toegevoegd, zullen opvragingen op die tabellen veel sneller plaatsvinden.", + "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.", + "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Om te migreren naar een andere database moet je de commandoregel tool gebruiken: 'occ db:convert-type'; <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">zie de documentatie ↗</a>.", + "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "D ingebouwde php mailer wordt niet langer ondersteund. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Werk je mailserverinstellingen bij ↗<a/>.", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is niet ingesteld als \"{expected}\". Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", "The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is ingesteld als \"{expected}\". Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.", + "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\" or \"{val4}\". This can leak referer information. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C Recommendation ↗</a>." : "De \"{header}\" HTTP header is niet ingesteld op \"{val1}\", \"{val2}\", \"{val3}\" of \"{val4}\". Hierdoor kan refer informatie uitlekken. Zie de <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C aanbeveling ↗</a>.", + "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "De \"Strict-Transport-Security\" HTTP header is niet ingesteld als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in de <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>.", + "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "De site is onveilig verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in de <a href=\"{docUrl}\">security tips ↗</a>.", "Shared" : "Gedeeld", "Shared with" : "Gedeeld met", "Shared by" : "Gedeeld door", @@ -136,6 +160,7 @@ "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.", "Resharing is not allowed" : "Verder delen is niet toegestaan", "Share to {name}" : "Delen naar {name}", + "Copy URL" : "Kopiëren URL", "Link" : "Link", "Password protect" : "Wachtwoord beveiligd", "Allow editing" : "Bewerken toestaan", @@ -147,14 +172,20 @@ "Set expiration date" : "Stel vervaldatum in", "Expiration" : "Vervaltermijn", "Expiration date" : "Vervaldatum", + "Note to recipient" : "Notitie voor ontvanger", "Share link" : "Deellink", + "Enable" : "Inschakelen", "Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}", + "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Gedeeld met jou en gesprek {conversation} door {owner}", "Shared with you by {owner}" : "Met je gedeeld door {owner}", "Choose a password for the mail share" : "Kies een wachtwoord om gedeelde te mailen", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delen via link", "group" : "groep", "remote" : "extern", + "remote group" : "externe groep", "email" : "email", + "conversation" : "gesprek", "shared by {sharer}" : "Gedeeld door {eigenaar}", "Unshare" : "Delen stoppen", "Can reshare" : "Kan doordelen", @@ -162,6 +193,7 @@ "Can create" : "Kan creëren", "Can change" : "Kan wijzigen", "Can delete" : "Kan verwijderen", + "Password protect by Talk" : "Wachtwoord beveiligd door Talk", "Access control" : "Toegangscontrole", "Could not unshare" : "Kon delen niet ongedaan maken", "Error while sharing" : "Fout tijdens het delen", @@ -174,6 +206,7 @@ "An error occurred. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (remote)" : "{sharee} (extern)", + "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", "Share" : "Delen", @@ -258,9 +291,14 @@ "Need help?" : "Hulp nodig?", "See the documentation" : "Zie de documentatie", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.", + "Skip to main content" : "Ga naar hoofdinhoud", + "Skip to navigation of app" : "Ga naar navigatie van app", "More apps" : "Meer apps", + "More apps menu" : "Meer apps menu", "Search" : "Zoeken", "Reset search" : "Zoekopdracht wissen", + "Contacts" : "Contactpersonen", + "Contacts menu" : "Contacten menu", "Settings menu" : "Instellingenmenu", "Confirm your password" : "Bevestig je wachtwoord", "Server side authentication failed!" : "Authenticatie bij de server mislukt!", @@ -270,6 +308,7 @@ "Username or email" : "Gebruikersnaam of email", "Log in" : "Inloggen", "Wrong password." : "Onjuist wachtwoord.", + "User disabled" : "Gebruiker gedeactiveerd", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken van jouw IP gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.", "Forgot password?" : "Wachtwoord vergeten?", "Back to login" : "Terug naar inloggen", @@ -283,8 +322,11 @@ "Redirecting …" : "Omleiding ...", "New password" : "Nieuw wachtwoord", "New Password" : "Nieuw wachtwoord", + "This share is password-protected" : "Deze share is wachtwoordbeveiligd", + "The password is wrong. Try again." : "Het wachtwoord is onjuist. Probeer opnieuw.", "Two-factor authentication" : "Tweefactor authenticatie", "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.", + "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Kon niet minimaal één an jouw ingeschakelde two-factor auth methoden laden. Neem contact op met je beheerder.", "Cancel log in" : "Inloggen annuleren", "Use backup code" : "Gebruik back-upcode", "Error while validating your second factor" : "Fout bij het verifiëren van je tweede factor", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 00b58995373..32511e73640 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Ativar", "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}", "Shared with you and {circle} by {owner}" : "Compartilhado com você e {circle} por {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Compartilhado com você e a conversa {conversation} por {owner}", "Shared with you by {owner}" : "Compartilhado com você por {owner}", "Choose a password for the mail share" : "Escolha uma senha para o compartilhamento de e-mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatiorDisplayName}} compartilhou via link", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "remoto", "remote group" : "grupo remoto", "email" : "e-mail", + "conversation" : "Conversa", "shared by {sharer}" : "compartilhado por {sharer}", "Unshare" : "Descompartilhar", "Can reshare" : "Pode compartilhar novamente", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 3ee90f539f3..5d6f853eb43 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -177,6 +177,7 @@ "Enable" : "Ativar", "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}", "Shared with you and {circle} by {owner}" : "Compartilhado com você e {circle} por {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "Compartilhado com você e a conversa {conversation} por {owner}", "Shared with you by {owner}" : "Compartilhado com você por {owner}", "Choose a password for the mail share" : "Escolha uma senha para o compartilhamento de e-mail", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatiorDisplayName}} compartilhou via link", @@ -184,6 +185,7 @@ "remote" : "remoto", "remote group" : "grupo remoto", "email" : "e-mail", + "conversation" : "Conversa", "shared by {sharer}" : "compartilhado por {sharer}", "Unshare" : "Descompartilhar", "Can reshare" : "Pode compartilhar novamente", diff --git a/core/l10n/sr.js b/core/l10n/sr.js index 8c4c569e482..53a2324364b 100644 --- a/core/l10n/sr.js +++ b/core/l10n/sr.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Укључи", "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.", "Shared with you and {circle} by {owner}" : "Дељемп са Вама и кругом {circle} од стране корисника {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} поделио са Вама и у разговору {conversation}", "Shared with you by {owner}" : "{owner} дели са вама", "Choose a password for the mail share" : "Изаберите лозинку за дељење е-поштом", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} је поделио преко везе", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "удаљени", "remote group" : "удаљена група", "email" : "е-пошта", + "conversation" : "разговор", "shared by {sharer}" : "поделио је {sharer}", "Unshare" : "Укини дељење", "Can reshare" : "Може да дели даље", diff --git a/core/l10n/sr.json b/core/l10n/sr.json index f8a8832f415..7c4870e639e 100644 --- a/core/l10n/sr.json +++ b/core/l10n/sr.json @@ -177,6 +177,7 @@ "Enable" : "Укључи", "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.", "Shared with you and {circle} by {owner}" : "Дељемп са Вама и кругом {circle} од стране корисника {owner}", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} поделио са Вама и у разговору {conversation}", "Shared with you by {owner}" : "{owner} дели са вама", "Choose a password for the mail share" : "Изаберите лозинку за дељење е-поштом", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} је поделио преко везе", @@ -184,6 +185,7 @@ "remote" : "удаљени", "remote group" : "удаљена група", "email" : "е-пошта", + "conversation" : "разговор", "shared by {sharer}" : "поделио је {sharer}", "Unshare" : "Укини дељење", "Can reshare" : "Може да дели даље", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index 1c66337ad81..6ffc48dae9e 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -179,6 +179,7 @@ OC.L10N.register( "Enable" : "Etkinleştir", "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaşılmış", "Shared with you and {circle} by {owner}" : "{owner} tarafından sizinle ve {circle} ile paylaşılmış", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} tarafından sizinle ve {conversation} görüşmesi ile paylaştırılmış", "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşılmış", "Choose a password for the mail share" : "E-posta ile paylaşmak için bir parola seçin", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} bağlantı ile paylaşılmış", @@ -186,6 +187,7 @@ OC.L10N.register( "remote" : "uzak", "remote group" : "uzak grup", "email" : "e-posta", + "conversation" : "görüşme", "shared by {sharer}" : "{sharer} tarafından paylaşıldı", "Unshare" : "Paylaşımdan Kaldır", "Can reshare" : "Yeniden paylaşabilir", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index a621ebbfa63..7c3ef071164 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -177,6 +177,7 @@ "Enable" : "Etkinleştir", "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaşılmış", "Shared with you and {circle} by {owner}" : "{owner} tarafından sizinle ve {circle} ile paylaşılmış", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} tarafından sizinle ve {conversation} görüşmesi ile paylaştırılmış", "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşılmış", "Choose a password for the mail share" : "E-posta ile paylaşmak için bir parola seçin", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} bağlantı ile paylaşılmış", @@ -184,6 +185,7 @@ "remote" : "uzak", "remote group" : "uzak grup", "email" : "e-posta", + "conversation" : "görüşme", "shared by {sharer}" : "{sharer} tarafından paylaşıldı", "Unshare" : "Paylaşımdan Kaldır", "Can reshare" : "Yeniden paylaşabilir", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index f7c2d6db7bf..b6861388987 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -138,6 +138,7 @@ OC.L10N.register( "Press Ctrl-C to copy." : "按 Ctrl + C 进行复制.", "Resharing is not allowed" : "不允许二次共享", "Share to {name}" : "分享给{name}", + "Copy URL" : "复制 URL", "Link" : "链接", "Password protect" : "密码保护", "Allow editing" : "允许编辑", @@ -151,6 +152,8 @@ OC.L10N.register( "Expiration date" : "过期日期", "Share link" : "分享链接", "Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组", + "Shared with you and {circle} by {owner}" : "{owner} 共享给您及 {circle}", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} 共享给您及对话 {conversation}", "Shared with you by {owner}" : "{owner} 分享给您", "Choose a password for the mail share" : "为电子邮件分享选择一个密码", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index 9c2bf3f8a0a..2a6e7f0391c 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -136,6 +136,7 @@ "Press Ctrl-C to copy." : "按 Ctrl + C 进行复制.", "Resharing is not allowed" : "不允许二次共享", "Share to {name}" : "分享给{name}", + "Copy URL" : "复制 URL", "Link" : "链接", "Password protect" : "密码保护", "Allow editing" : "允许编辑", @@ -149,6 +150,8 @@ "Expiration date" : "过期日期", "Share link" : "分享链接", "Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组", + "Shared with you and {circle} by {owner}" : "{owner} 共享给您及 {circle}", + "Shared with you and the conversation {conversation} by {owner}" : "{owner} 共享给您及对话 {conversation}", "Shared with you by {owner}" : "{owner} 分享给您", "Choose a password for the mail share" : "为电子邮件分享选择一个密码", "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享", diff --git a/core/templates/403.php b/core/templates/403.php index e053fad764a..72d5d3e4ae6 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -12,6 +12,6 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to / <ul> <li class='error'> <?php p($l->t( 'Access forbidden' )); ?><br> - <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> + <p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p> </li> </ul> diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 74ce43d4f88..13baf194010 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -78,7 +78,7 @@ </div> <?php if(isset($template) && $template->getFooterVisible()) { ?> <footer> - <p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p> + <p><?php print_unescaped($theme->getLongFooter()); ?></p> </footer> <?php } ?> |