diff options
Diffstat (limited to 'apps')
72 files changed, 468 insertions, 162 deletions
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js index e4e86df505b..5580dc11a64 100644 --- a/apps/encryption/l10n/de_DE.js +++ b/apps/encryption/l10n/de_DE.js @@ -59,7 +59,7 @@ OC.L10N.register( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.", "Enabled" : "Aktiviert", "Disabled" : "Deaktiviert", - "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ", + "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (Nextcloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.", "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'Nextcloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Nextcloud-Basisverschlüsselungsmodul' und das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Login Passwort' und in das 'aktuelles Login - Passwort'-Feld eingegeben wird.\n", diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json index 930ee8fc202..49f7a677fcc 100644 --- a/apps/encryption/l10n/de_DE.json +++ b/apps/encryption/l10n/de_DE.json @@ -57,7 +57,7 @@ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.", "Enabled" : "Aktiviert", "Disabled" : "Deaktiviert", - "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ", + "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (Nextcloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.", "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'Nextcloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Nextcloud-Basisverschlüsselungsmodul' und das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Login Passwort' und in das 'aktuelles Login - Passwort'-Feld eingegeben wird.\n", diff --git a/apps/federatedfilesharing/l10n/cs_CZ.js b/apps/federatedfilesharing/l10n/cs_CZ.js index c4f6a0be6de..b8189cb5b87 100644 --- a/apps/federatedfilesharing/l10n/cs_CZ.js +++ b/apps/federatedfilesharing/l10n/cs_CZ.js @@ -7,6 +7,7 @@ OC.L10N.register( "Remote share password" : "Heslo vzdáleného sdílení", "Cancel" : "Zrušit", "Add remote share" : "Přidat propojené sdílení", + "Copy" : "Kopie", "Copied!" : "Zkopírováno!", "Not supported!" : "Nepodporováno!", "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.", diff --git a/apps/federatedfilesharing/l10n/cs_CZ.json b/apps/federatedfilesharing/l10n/cs_CZ.json index 49caae1da8b..44f052e8a84 100644 --- a/apps/federatedfilesharing/l10n/cs_CZ.json +++ b/apps/federatedfilesharing/l10n/cs_CZ.json @@ -5,6 +5,7 @@ "Remote share password" : "Heslo vzdáleného sdílení", "Cancel" : "Zrušit", "Add remote share" : "Přidat propojené sdílení", + "Copy" : "Kopie", "Copied!" : "Zkopírováno!", "Not supported!" : "Nepodporováno!", "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.", diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js index ddf6c2b3ac5..677371b423c 100644 --- a/apps/federatedfilesharing/l10n/de_DE.js +++ b/apps/federatedfilesharing/l10n/de_DE.js @@ -7,6 +7,7 @@ OC.L10N.register( "Remote share password" : "Passwort für die entfernte Freigabe", "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", + "Copy" : "Kopieren", "Copied!" : "Kopiert!", "Not supported!" : "Nicht unterstützt!", "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.", diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json index 9d895123b8b..4451011acaa 100644 --- a/apps/federatedfilesharing/l10n/de_DE.json +++ b/apps/federatedfilesharing/l10n/de_DE.json @@ -5,6 +5,7 @@ "Remote share password" : "Passwort für die entfernte Freigabe", "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", + "Copy" : "Kopieren", "Copied!" : "Kopiert!", "Not supported!" : "Nicht unterstützt!", "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.", diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index 746968163e1..cc14f8dead6 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -7,6 +7,7 @@ OC.L10N.register( "Remote share password" : "Wachtwoord externe share", "Cancel" : "Annuleren", "Add remote share" : "Toevoegen externe share", + "Copy" : "Kopiëren", "Copied!" : "Gekopieerd!", "Not supported!" : "Niet ondersteund!", "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.", diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index af1f688c6ec..62e4cb7faf6 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -5,6 +5,7 @@ "Remote share password" : "Wachtwoord externe share", "Cancel" : "Annuleren", "Add remote share" : "Toevoegen externe share", + "Copy" : "Kopiëren", "Copied!" : "Gekopieerd!", "Not supported!" : "Niet ondersteund!", "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.", diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js index 10fabbeb9b9..9e3ed763168 100644 --- a/apps/federation/js/settings-admin.js +++ b/apps/federation/js/settings-admin.js @@ -18,66 +18,125 @@ * */ -$(document).ready(function () { +(function( $ ) { + + // ocFederationAddServer + $.fn.ocFederationAddServer = function() { + + /* Go easy on jquery and define some vars + ========================================================================== */ + + var $wrapper = $(this), + + // Buttons + $btnAddServer = $wrapper.find("#ocFederationAddServerButton"), + $btnSubmit = $wrapper.find("#ocFederationSubmit"), + + // Inputs + $inpServerUrl = $wrapper.find("#serverUrl"), + $inpAutoAddServers = $wrapper.find("#autoAddServers"), + + // misc + $msgBox = $wrapper.find("#ocFederationAddServer .msg"), + $srvList = $wrapper.find("#listOfTrustedServers"); + + + /* Interaction + ========================================================================== */ + + $btnAddServer.on('click', function() { + $btnAddServer.addClass('hidden'); + $inpServerUrl + .removeClass('hidden') + .focus(); + }); + + // trigger server removal + $srvList.on('click', 'li > .icon-delete', function() { + var $this = $(this).parent(); + var id = $this.attr('id'); + + removeServer( id ); + }); + + $inpAutoAddServers.on("change", function() { + $.post( + OC.generateUrl('/apps/federation/auto-add-servers'), + { + autoAddServers: $(this).is(":checked") + } + ); + }); + + $btnSubmit.on("click", function() + { + addServer($inpServerUrl.val()); + }); - // show input field to add a new trusted server - $("#ocFederationAddServer").on('click', function() { - $('#ocFederationAddServerButton').addClass('hidden'); - $("#serverUrl").removeClass('hidden'); - $("#serverUrl").focus(); - }); - - // add new trusted server - $("#serverUrl").keyup(function (e) { - if (e.keyCode === 13) { // add server on "enter" - var url = $('#serverUrl').val(); - OC.msg.startSaving('#ocFederationAddServer .msg'); - $.post( - OC.generateUrl('/apps/federation/trusted-servers'), - { - url: url - } - ).done(function (data) { - $('#serverUrl').attr('value', ''); - $('ul#listOfTrustedServers').prepend( - $('<li>') - .attr('id', data.id) - .html('<span class="status indeterminate"></span>' + - data.url + - '<span class="icon icon-delete"></span>') - ); - OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message); - }) - .fail(function (jqXHR) { - OC.msg.finishedError('#ocFederationAddServer .msg', JSON.parse(jqXHR.responseText).message); - }); - } else if (e.keyCode === 27) { // hide input filed again in ESC - $('#ocFederationAddServerButton').toggleClass('hidden'); - $("#serverUrl").toggleClass('hidden'); - } - }); - -// remove trusted server from list - $( "#listOfTrustedServers" ).on('click', 'li > .icon-delete', function() { - var $this = $(this).parent(); - var id = $this.attr('id'); - $.ajax({ - url: OC.generateUrl('/apps/federation/trusted-servers/' + id), - type: 'DELETE', - success: function(response) { - $this.remove(); - } - }); - - }); - - $("#ocFederationSettings #autoAddServers").change(function() { - $.post( - OC.generateUrl('/apps/federation/auto-add-servers'), - { - autoAddServers: $(this).is(":checked") - } - ); - }); + $inpServerUrl.on("change keyup", function (e) { + + console.log("typing away"); + + url = $(this).val(); + + // toggle add-button visiblity based on input length + if ( url.length > 0 ) + $btnSubmit.removeClass("hidden") + else + $btnSubmit.addClass("hidden") + + if (e.keyCode === 13) { // add server on "enter" + addServer(url); + } else if (e.keyCode === 27) { // hide input filed again in ESC + $btnAddServer.removeClass('hidden'); + $inpServerUrl.val("").addClass('hidden'); + $btnSubmit.addClass('hidden'); + } + }); + }; + + /* private Functions + ========================================================================== */ + + function addServer( url ) { + OC.msg.startSaving('#ocFederationAddServer .msg'); + + $.post( + OC.generateUrl('/apps/federation/trusted-servers'), + { + url: url + } + ).done(function (data) { + $("#serverUrl").attr('value', ''); + $("#listOfTrustedServers").prepend( + $('<li>') + .attr('id', data.id) + .html('<span class="status indeterminate"></span>' + + data.url + + '<span class="icon icon-delete"></span>') + ); + OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message); + }) + .fail(function (jqXHR) { + OC.msg.finishedError('#ocFederationAddServer .msg', JSON.parse(jqXHR.responseText).message); + }); + }; + + function removeServer( id ) { + $.ajax({ + url: OC.generateUrl('/apps/federation/trusted-servers/' + id), + type: 'DELETE', + success: function(response) { + $("#ocFederationSettings").find("#" + id).remove(); + } + }); + } + + +})( jQuery ); + +$(document).ready(function () { + $('#ocFederationSettings').ocFederationAddServer(); + }); diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index f802af594dc..1376dd683d3 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -137,7 +137,7 @@ class TrustedServers { * @return bool */ public function getAutoAddServers() { - $value = $this->config->getAppValue('federation', 'autoAddServers', '1'); + $value = $this->config->getAppValue('federation', 'autoAddServers', '0'); return $value === '1'; } diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index 8773851c768..0514bad8ee2 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -19,6 +19,7 @@ style('federation', 'settings-admin') <p id="ocFederationAddServer"> <button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add Nextcloud server')); ?></button> <input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Nextcloud Server')); ?>" name="server_url"/> + <button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button> <span class="msg"></span> </p> <ul id="listOfTrustedServers"> diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index d16c0908dd4..598c2f01c90 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -172,7 +172,7 @@ class TrustedServersTest extends TestCase { */ public function testGetAutoAddServers($status, $expected) { $this->config->expects($this->once())->method('getAppValue') - ->with('federation', 'autoAddServers', '1')->willReturn($status); + ->with('federation', 'autoAddServers', '0')->willReturn($status); $this->assertSame($expected, $this->trustedServers->getAutoAddServers() diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css index 2ec16993ef5..094f44fdf05 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.css @@ -19,8 +19,8 @@ } #app-sidebar .mainFileInfoView .permalink { - margin-left: 10px; - opacity: .5; + padding: 6px 10px; + vertical-align: text-top; } #app-sidebar .mainFileInfoView .permalink-field>input { clear: both; @@ -106,10 +106,18 @@ #app-sidebar .file-details { color: #999; } + #app-sidebar .file-details img { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; } + +#app-sidebar .file-details img:hover, +#app-sidebar .file-details img:focus{ + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; +} + #app-sidebar .action-favorite { vertical-align: text-bottom; padding: 10px; diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index 8e2ef23221d..c465f890dda 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -61,9 +61,9 @@ table td.filename .nametext .innernametext { max-width: 50%; } -/* ellipsis on user names in share sidebar */ +/* ellipsis on user names in share sidebar, less on mobile */ #shareWithList .username { - max-width: 80px !important; + max-width: 80px !important; } /* proper notification area for multi line messages */ diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 20cedcf4e82..e9259f75ba1 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -15,7 +15,7 @@ '<div class="fileName">' + '<h3 title="{{name}}" class="ellipsis">{{name}}</h3>' + '<a class="permalink" href="{{permalink}}" title="{{permalinkTitle}}">' + - '<span class="icon icon-public"></span>' + + '<span class="icon icon-clippy"></span>' + '<span class="hidden-visually">{{permalinkTitle}}</span>' + '</a>' + '</div>' + @@ -157,7 +157,7 @@ starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'), starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star'), permalink: this._makePermalink(this.model.get('id')), - permalinkTitle: t('files', 'Local link') + permalinkTitle: t('files', 'Copy local link') })); // TODO: we really need OC.Previews diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index 9df693c7203..967c95a7db3 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -67,24 +67,41 @@ OC.L10N.register( "New folder" : "Нова папка", "Upload" : "Качване", "An error occurred while trying to update the tags" : "Възникна грешка при опита за промяна на етикети", + "Created by %s" : "Създаден от %s", + "Created by {user1}" : "Създаден от {user1}", "Changed by %2$s" : "Променен от %2$s", + "Changed by {user1}" : "Променен от {user1}", "Deleted by %2$s" : "Изтрит от %2$s", + "Deleted by {user1}" : "Изтрит от {user1}", "Restored by %2$s" : "Възстанвен от %2$s", + "Restored by {user1}" : "Възстановен от {user1}", "Renamed by %2$s" : "Преимеуван от %2$s", + "Renamed by {user1}" : "Преименуван от {user1}", "Moved by %2$s" : "Преместен от %2$s", + "Moved by {user1}" : "Преместен от {user1}", "You created %1$s" : "Вие създадохте %1$s", + "You created {file1}" : "Вие създадохте {file1}", "%2$s created %1$s" : "%2$s създаде %1$s", + "{user1} created {file1}" : "{user1} създаде {file1}", "%1$s was created in a public folder" : "%1$s е създаден в публична папка", "You changed %1$s" : "Вие променихте %1$s", + "You changed {file1}" : "Вие променихте {file1}", "%2$s changed %1$s" : "%2$s промени %1$s", + "{user1} changed {file1}" : "{user1} промени {file1}", "You deleted %1$s" : "Вие изтрихте %1$s", + "You deleted {file1}" : "Вие променихте {file1}", "%2$s deleted %1$s" : "%2$s изтри %1$s.", + "{user1} deleted {file1}" : "{user1} изтри {file1}", "You restored %1$s" : "Вие възстановихте %1$s", + "You restored {file1}" : "Вие възстановихте {file1}", "%2$s restored %1$s" : "%2$s възстанови %1$s", + "{user1} restored {file1}" : "{user1} възстанови {file1}", "You renamed %2$s to %1$s" : "Вие преименувахте %2$s на %1$s", "%2$s renamed %3$s to %1$s" : "%2$s преименува %3$s на %1$s", "You moved %2$s to %1$s" : "Вие преместихте %2$s в %1$s", + "You moved {file2} to {file1}" : "Вие преместихте {file2} в {file1}", "%2$s moved %3$s to %1$s" : "%2$s премести %3$s в %1$s", + "{user1} moved {file2} to {file1}" : "{user1} премести {file2} в {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "<strong>Промяна</strong> или <strong>преименуване</strong> на файл / папка", "A new file or folder has been <strong>created</strong>" : "<strong>Създаване</strong> на нов файл / папка", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Изпращай известия само при създаване / промяна на <strong>любими файлове</strong> <em>(Само за потока)</em>", diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index 946764a822b..47121992918 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -65,24 +65,41 @@ "New folder" : "Нова папка", "Upload" : "Качване", "An error occurred while trying to update the tags" : "Възникна грешка при опита за промяна на етикети", + "Created by %s" : "Създаден от %s", + "Created by {user1}" : "Създаден от {user1}", "Changed by %2$s" : "Променен от %2$s", + "Changed by {user1}" : "Променен от {user1}", "Deleted by %2$s" : "Изтрит от %2$s", + "Deleted by {user1}" : "Изтрит от {user1}", "Restored by %2$s" : "Възстанвен от %2$s", + "Restored by {user1}" : "Възстановен от {user1}", "Renamed by %2$s" : "Преимеуван от %2$s", + "Renamed by {user1}" : "Преименуван от {user1}", "Moved by %2$s" : "Преместен от %2$s", + "Moved by {user1}" : "Преместен от {user1}", "You created %1$s" : "Вие създадохте %1$s", + "You created {file1}" : "Вие създадохте {file1}", "%2$s created %1$s" : "%2$s създаде %1$s", + "{user1} created {file1}" : "{user1} създаде {file1}", "%1$s was created in a public folder" : "%1$s е създаден в публична папка", "You changed %1$s" : "Вие променихте %1$s", + "You changed {file1}" : "Вие променихте {file1}", "%2$s changed %1$s" : "%2$s промени %1$s", + "{user1} changed {file1}" : "{user1} промени {file1}", "You deleted %1$s" : "Вие изтрихте %1$s", + "You deleted {file1}" : "Вие променихте {file1}", "%2$s deleted %1$s" : "%2$s изтри %1$s.", + "{user1} deleted {file1}" : "{user1} изтри {file1}", "You restored %1$s" : "Вие възстановихте %1$s", + "You restored {file1}" : "Вие възстановихте {file1}", "%2$s restored %1$s" : "%2$s възстанови %1$s", + "{user1} restored {file1}" : "{user1} възстанови {file1}", "You renamed %2$s to %1$s" : "Вие преименувахте %2$s на %1$s", "%2$s renamed %3$s to %1$s" : "%2$s преименува %3$s на %1$s", "You moved %2$s to %1$s" : "Вие преместихте %2$s в %1$s", + "You moved {file2} to {file1}" : "Вие преместихте {file2} в {file1}", "%2$s moved %3$s to %1$s" : "%2$s премести %3$s в %1$s", + "{user1} moved {file2} to {file1}" : "{user1} премести {file2} в {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "<strong>Промяна</strong> или <strong>преименуване</strong> на файл / папка", "A new file or folder has been <strong>created</strong>" : "<strong>Създаване</strong> на нов файл / папка", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Изпращай известия само при създаване / промяна на <strong>любими файлове</strong> <em>(Само за потока)</em>", diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index d1bba452cbb..d915522a75d 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -76,33 +76,54 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", - "Local link" : "Místní odkaz", "Folder" : "Adresář", "New folder" : "Nový adresář", "Upload" : "Odeslat", "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba", "File changes" : "Změny souboru", + "Created by %s" : "Vytvořil(a) %s", + "Created by {user1}" : "Vytvořil(a) {user1}", "Changed by %2$s" : "Změněno uživatelem %2$s", + "Changed by {user1}" : "Změnil(a) {user1}", "Deleted by %2$s" : "Smazáno uživatelem %2$s", + "Deleted by {user1}" : "Smazal(a) {user1}", "Restored by %2$s" : "Obnoveno uživatelem %2$s", + "Restored by {user1}" : "Obnovil(a) {user1}", "Renamed by %2$s" : "Přejmenováno uživatelem %2$s", + "Renamed by {user1}" : "Přejmenoval(a) {user1}", "Moved by %2$s" : "Přesunuto uživatelem %2$s", + "Moved by {user1}" : "Přesunul(a) {user1}", "You created %1$s" : "Vytvořili jste %1$s", + "You created {file1}" : "Vytvořil(a) jsi {file1}", "%2$s created %1$s" : "%2$s vytvořil(a) %1$s", + "{user1} created {file1}" : "{user1} vytvořil(a) {file1}", "%1$s was created in a public folder" : "%1$s byl vytvořen ve veřejném adresáři", + "{file1} was created in a public folder" : "{file1} byl vytvořen ve veřejném adresáři", "You changed %1$s" : "Změnili jste %1$s", + "You changed {file1}" : "Změnil(a) jsi {file1}", "%2$s changed %1$s" : "%2$s změnil(a) %1$s", + "{user1} changed {file1}" : "{user1} změnil(a) {file1}", "You deleted %1$s" : "Smazali jste %1$s", + "You deleted {file1}" : "Smazal(a) jsi {file1}", "%2$s deleted %1$s" : "%2$s smazal(a) %1$s", + "{user1} deleted {file1}" : "{user1} smazal(a) {file1}", "You restored %1$s" : "Obnovili jste %1$s", + "You restored {file1}" : "Obnovil(a) jsi {file1}", "%2$s restored %1$s" : "%2$s obnovil(a) %1$s", + "{user1} restored {file1}" : "{user1} obnovil(a) {file1}", "You renamed %2$s to %1$s" : "Přejmenoval jste %2$s na %1$s", + "You renamed {file2} to {file1}" : "Přejmenoval(a) jsi {file2} na {file1}", "%2$s renamed %3$s to %1$s" : "%2$s přejmenoval %3$s na %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} přejmenoval(a) {file2} na {file1}", "You moved %2$s to %1$s" : "Přesunul(a) jste %2$s na %1$s", + "You moved {file2} to {file1}" : "Přesunul(a) jsi {file2} do {file1}", "%2$s moved %3$s to %1$s" : "%2$s přesunul(a) %3$s na %1$s", + "{user1} moved {file2} to {file1}" : "{user1} přesunul(a) {file2} do {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Soubor nebo adresář byl <strong>změněn</strong> nebo <strong>přejmenován</strong>", "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo adresář", + "A new file or folder has been <strong>deleted</strong>" : "Nový soubor nebo adresář byl <strong>smazán</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omezovat oznámení o tvorbě a změnách <strong>oblíbených souborů</strong> <em>(Pouze v proudu)</em>", + "A new file or folder has been <strong>restored</strong>" : "Nový soubor nebo adresář byl <strong>obnoven</strong>", "Upload (max. %s)" : "Nahrát (max. %s)", "File handling" : "Zacházení se soubory", "Maximum upload size" : "Maximální velikost pro odesílání", @@ -149,6 +170,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'", + "Local link" : "Místní odkaz", "{newname} already exists" : "{newname} již existuje", "A file or folder has been <strong>changed</strong>" : "Soubor nebo adresář byl <strong>změněn</strong>", "A file or folder has been <strong>deleted</strong>" : "Soubor nebo adresář byl <strong>smazán</strong>", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index eb8d70ae08a..f89157f4b5c 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -74,33 +74,54 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", - "Local link" : "Místní odkaz", "Folder" : "Adresář", "New folder" : "Nový adresář", "Upload" : "Odeslat", "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba", "File changes" : "Změny souboru", + "Created by %s" : "Vytvořil(a) %s", + "Created by {user1}" : "Vytvořil(a) {user1}", "Changed by %2$s" : "Změněno uživatelem %2$s", + "Changed by {user1}" : "Změnil(a) {user1}", "Deleted by %2$s" : "Smazáno uživatelem %2$s", + "Deleted by {user1}" : "Smazal(a) {user1}", "Restored by %2$s" : "Obnoveno uživatelem %2$s", + "Restored by {user1}" : "Obnovil(a) {user1}", "Renamed by %2$s" : "Přejmenováno uživatelem %2$s", + "Renamed by {user1}" : "Přejmenoval(a) {user1}", "Moved by %2$s" : "Přesunuto uživatelem %2$s", + "Moved by {user1}" : "Přesunul(a) {user1}", "You created %1$s" : "Vytvořili jste %1$s", + "You created {file1}" : "Vytvořil(a) jsi {file1}", "%2$s created %1$s" : "%2$s vytvořil(a) %1$s", + "{user1} created {file1}" : "{user1} vytvořil(a) {file1}", "%1$s was created in a public folder" : "%1$s byl vytvořen ve veřejném adresáři", + "{file1} was created in a public folder" : "{file1} byl vytvořen ve veřejném adresáři", "You changed %1$s" : "Změnili jste %1$s", + "You changed {file1}" : "Změnil(a) jsi {file1}", "%2$s changed %1$s" : "%2$s změnil(a) %1$s", + "{user1} changed {file1}" : "{user1} změnil(a) {file1}", "You deleted %1$s" : "Smazali jste %1$s", + "You deleted {file1}" : "Smazal(a) jsi {file1}", "%2$s deleted %1$s" : "%2$s smazal(a) %1$s", + "{user1} deleted {file1}" : "{user1} smazal(a) {file1}", "You restored %1$s" : "Obnovili jste %1$s", + "You restored {file1}" : "Obnovil(a) jsi {file1}", "%2$s restored %1$s" : "%2$s obnovil(a) %1$s", + "{user1} restored {file1}" : "{user1} obnovil(a) {file1}", "You renamed %2$s to %1$s" : "Přejmenoval jste %2$s na %1$s", + "You renamed {file2} to {file1}" : "Přejmenoval(a) jsi {file2} na {file1}", "%2$s renamed %3$s to %1$s" : "%2$s přejmenoval %3$s na %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} přejmenoval(a) {file2} na {file1}", "You moved %2$s to %1$s" : "Přesunul(a) jste %2$s na %1$s", + "You moved {file2} to {file1}" : "Přesunul(a) jsi {file2} do {file1}", "%2$s moved %3$s to %1$s" : "%2$s přesunul(a) %3$s na %1$s", + "{user1} moved {file2} to {file1}" : "{user1} přesunul(a) {file2} do {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Soubor nebo adresář byl <strong>změněn</strong> nebo <strong>přejmenován</strong>", "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo adresář", + "A new file or folder has been <strong>deleted</strong>" : "Nový soubor nebo adresář byl <strong>smazán</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omezovat oznámení o tvorbě a změnách <strong>oblíbených souborů</strong> <em>(Pouze v proudu)</em>", + "A new file or folder has been <strong>restored</strong>" : "Nový soubor nebo adresář byl <strong>obnoven</strong>", "Upload (max. %s)" : "Nahrát (max. %s)", "File handling" : "Zacházení se soubory", "Maximum upload size" : "Maximální velikost pro odesílání", @@ -147,6 +168,7 @@ "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'", + "Local link" : "Místní odkaz", "{newname} already exists" : "{newname} již existuje", "A file or folder has been <strong>changed</strong>" : "Soubor nebo adresář byl <strong>změněn</strong>", "A file or folder has been <strong>deleted</strong>" : "Soubor nebo adresář byl <strong>smazán</strong>", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 3895b92d608..6783e2ea435 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", - "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein", + "Local link" : "Lokaler Link", "{newname} already exists" : "{newname} existiert bereits", "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 770edccd88b..aad4aedc156 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", - "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein", + "Local link" : "Lokaler Link", "{newname} already exists" : "{newname} existiert bereits", "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 273da302bfd..c15f74a9a4a 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", - "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", @@ -95,14 +94,22 @@ OC.L10N.register( "You deleted %1$s" : "Sie haben %1$s gelöscht", "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht", "You restored %1$s" : "Sie haben %1$s wiederhergestellt", - "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s", + "You restored {file1}" : "Sie haben {file1} wiederhergestellt", + "%2$s restored %1$s" : "%2$s hat %1$s wiederhergestellt ", + "{user1} restored {file1}" : "{user1} hat {file1} wiederhergestellt", "You renamed %2$s to %1$s" : "Sie haben %2$s in %1$s umbenannt", - "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umebenannt", + "You renamed {file2} to {file1}" : "Sie haben {file2} in {file1} umbenannt", + "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umbenannt", + "{user1} renamed {file2} to {file1}" : "{user1} hat {file2} in {file1} umbenannt", "You moved %2$s to %1$s" : "Sie haben %2$s nach %1$s verschoben", + "You moved {file2} to {file1}" : "Sie haben {file2} nach {file1} verschoben", "%2$s moved %3$s to %1$s" : "%2$s hat %3$s nach %1$s verschoben", + "{user1} moved {file2} to {file1}" : "{user1} hat {file2} nach {file1} verschoben", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Eine Datei oder Ordner wurden <strong>geändert</strong> oder <strong>umbenannt</strong>", "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>", + "A new file or folder has been <strong>deleted</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>gelöscht</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen zu Ihren <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>", + "A new file or folder has been <strong>restored</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>wiederhergestellt</strong>", "Upload (max. %s)" : "Hochladen (max. %s)", "File handling" : "Dateibehandlung", "Maximum upload size" : "Maximale Upload-Größe", @@ -149,6 +156,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein", + "Local link" : "Lokaler Link", "{newname} already exists" : "{newname} existiert bereits", "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index a92c97e5217..9cc6d5b253a 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", - "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", @@ -93,14 +92,22 @@ "You deleted %1$s" : "Sie haben %1$s gelöscht", "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht", "You restored %1$s" : "Sie haben %1$s wiederhergestellt", - "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s", + "You restored {file1}" : "Sie haben {file1} wiederhergestellt", + "%2$s restored %1$s" : "%2$s hat %1$s wiederhergestellt ", + "{user1} restored {file1}" : "{user1} hat {file1} wiederhergestellt", "You renamed %2$s to %1$s" : "Sie haben %2$s in %1$s umbenannt", - "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umebenannt", + "You renamed {file2} to {file1}" : "Sie haben {file2} in {file1} umbenannt", + "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umbenannt", + "{user1} renamed {file2} to {file1}" : "{user1} hat {file2} in {file1} umbenannt", "You moved %2$s to %1$s" : "Sie haben %2$s nach %1$s verschoben", + "You moved {file2} to {file1}" : "Sie haben {file2} nach {file1} verschoben", "%2$s moved %3$s to %1$s" : "%2$s hat %3$s nach %1$s verschoben", + "{user1} moved {file2} to {file1}" : "{user1} hat {file2} nach {file1} verschoben", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Eine Datei oder Ordner wurden <strong>geändert</strong> oder <strong>umbenannt</strong>", "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>", + "A new file or folder has been <strong>deleted</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>gelöscht</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen zu Ihren <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>", + "A new file or folder has been <strong>restored</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>wiederhergestellt</strong>", "Upload (max. %s)" : "Hochladen (max. %s)", "File handling" : "Dateibehandlung", "Maximum upload size" : "Maximale Upload-Größe", @@ -147,6 +154,7 @@ "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein", + "Local link" : "Lokaler Link", "{newname} already exists" : "{newname} existiert bereits", "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 4598d0a7f5b..47ae6bd57fe 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -74,7 +74,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", - "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "Upload" : "Subir", @@ -144,6 +143,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'", + "Local link" : "Enlace local", "{newname} already exists" : "{newname} ya existe", "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta", "A file or folder has been <strong>deleted</strong>" : "Se ha <strong>eliminado</strong> un archivo o carpeta", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index b23740be875..7373b91d2e6 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -72,7 +72,6 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", - "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "Upload" : "Subir", @@ -142,6 +141,7 @@ "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'", + "Local link" : "Enlace local", "{newname} already exists" : "{newname} ya existe", "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta", "A file or folder has been <strong>deleted</strong>" : "Se ha <strong>eliminado</strong> un archivo o carpeta", diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index 882dcd7aafd..ae40cfe2725 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"], "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", - "Local link" : "Paikallinen linkki", "Folder" : "Kansio", "New folder" : "Uusi kansio", "Upload" : "Lähetä", @@ -130,6 +129,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'", + "Local link" : "Paikallinen linkki", "{newname} already exists" : "{newname} on jo olemassa", "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>", "A file or folder has been <strong>deleted</strong>" : "Tiedosto tai kansio on <strong>poistettu</strong>", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index 222f8807a38..8e14deb1607 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"], "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", - "Local link" : "Paikallinen linkki", "Folder" : "Kansio", "New folder" : "Uusi kansio", "Upload" : "Lähetä", @@ -128,6 +127,7 @@ "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'", + "Local link" : "Paikallinen linkki", "{newname} already exists" : "{newname} on jo olemassa", "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>", "A file or folder has been <strong>deleted</strong>" : "Tiedosto tai kansio on <strong>poistettu</strong>", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index e2d87d145f0..831f032d7b9 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -76,33 +76,54 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", - "Local link" : "Dossier local", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "Upload" : "Chargement", "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes", "File changes" : "Modifications du fichier", + "Created by %s" : "Créé par %s", + "Created by {user1}" : "Créé par {user1}", "Changed by %2$s" : "Modifié par %2$s", + "Changed by {user1}" : "Modifié par {user1}", "Deleted by %2$s" : "Supprimé par %2$s", + "Deleted by {user1}" : "Supprimé par {user1}", "Restored by %2$s" : "Restauré par %2$s", + "Restored by {user1}" : "Restauré par {user1}", "Renamed by %2$s" : "Renommé par %2$s", + "Renamed by {user1}" : "Renommé par {user1}", "Moved by %2$s" : "Déplacé par %2$s", + "Moved by {user1}" : "Déplacé par {user1}", "You created %1$s" : "Vous avez créé %1$s", + "You created {file1}" : "Vous avez créé {file1}", "%2$s created %1$s" : "%2$s a créé %1$s", + "{user1} created {file1}" : "{user1} a créé {file1}", "%1$s was created in a public folder" : "%1$s a été créé dans un dossier public", + "{file1} was created in a public folder" : "{file1} a été créé dans un dossier public", "You changed %1$s" : "Vous avez modifié %1$s", + "You changed {file1}" : "Vous avez modifié {file1}", "%2$s changed %1$s" : "%2$s a modifié %1$s", + "{user1} changed {file1}" : "{user1} a modifié {file1}", "You deleted %1$s" : "Vous avez supprimé %1$s", + "You deleted {file1}" : "Vous avez supprimé {file1}", "%2$s deleted %1$s" : "%2$s a supprimé %1$s", + "{user1} deleted {file1}" : "{user1} a supprimé {file1}", "You restored %1$s" : "Vous avez restauré %1$s", + "You restored {file1}" : "Vous avez restauré {file1}", "%2$s restored %1$s" : "%2$s a restauré %1$s", + "{user1} restored {file1}" : "{user1} a restauré {file1}", "You renamed %2$s to %1$s" : "Vous avez renommé %2$s en %1$s", + "You renamed {file2} to {file1}" : "Vous avez renommé {file2} en {file1}", "%2$s renamed %3$s to %1$s" : "%2$s a renommé %3$s en %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} a renommé {file2} en {file1}", "You moved %2$s to %1$s" : "Vous avez déplacé %2$s dans %1$s", + "You moved {file2} to {file1}" : "Vous avez déplacé {file2} dans {file1}", "%2$s moved %3$s to %1$s" : "%2$s a déplacé %3$s dans %1$s", + "{user1} moved {file2} to {file1}" : "{user1} a déplacé {file2} dans {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Un fichier ou dossier a été <strong>modifié</strong> ou <strong>renommé</strong>", "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>", + "A new file or folder has been <strong>deleted</strong>" : "Un nouveau fichier ou répertoire a été <strong>supprimé</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>", + "A new file or folder has been <strong>restored</strong>" : "Un nouveau fichier ou répertoire a été <strong>restauré</strong>", "Upload (max. %s)" : "Envoi (max. %s)", "File handling" : "Gestion de fichiers", "Maximum upload size" : "Taille max. d'envoi", @@ -149,6 +170,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'", + "Local link" : "Dossier local", "{newname} already exists" : "{newname} existe déjà", "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>", "A file or folder has been <strong>deleted</strong>" : "Un fichier ou un répertoire a été <strong>supprimé</strong>", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index d4c7f016c88..04d1eb94477 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -74,33 +74,54 @@ "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", - "Local link" : "Dossier local", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "Upload" : "Chargement", "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes", "File changes" : "Modifications du fichier", + "Created by %s" : "Créé par %s", + "Created by {user1}" : "Créé par {user1}", "Changed by %2$s" : "Modifié par %2$s", + "Changed by {user1}" : "Modifié par {user1}", "Deleted by %2$s" : "Supprimé par %2$s", + "Deleted by {user1}" : "Supprimé par {user1}", "Restored by %2$s" : "Restauré par %2$s", + "Restored by {user1}" : "Restauré par {user1}", "Renamed by %2$s" : "Renommé par %2$s", + "Renamed by {user1}" : "Renommé par {user1}", "Moved by %2$s" : "Déplacé par %2$s", + "Moved by {user1}" : "Déplacé par {user1}", "You created %1$s" : "Vous avez créé %1$s", + "You created {file1}" : "Vous avez créé {file1}", "%2$s created %1$s" : "%2$s a créé %1$s", + "{user1} created {file1}" : "{user1} a créé {file1}", "%1$s was created in a public folder" : "%1$s a été créé dans un dossier public", + "{file1} was created in a public folder" : "{file1} a été créé dans un dossier public", "You changed %1$s" : "Vous avez modifié %1$s", + "You changed {file1}" : "Vous avez modifié {file1}", "%2$s changed %1$s" : "%2$s a modifié %1$s", + "{user1} changed {file1}" : "{user1} a modifié {file1}", "You deleted %1$s" : "Vous avez supprimé %1$s", + "You deleted {file1}" : "Vous avez supprimé {file1}", "%2$s deleted %1$s" : "%2$s a supprimé %1$s", + "{user1} deleted {file1}" : "{user1} a supprimé {file1}", "You restored %1$s" : "Vous avez restauré %1$s", + "You restored {file1}" : "Vous avez restauré {file1}", "%2$s restored %1$s" : "%2$s a restauré %1$s", + "{user1} restored {file1}" : "{user1} a restauré {file1}", "You renamed %2$s to %1$s" : "Vous avez renommé %2$s en %1$s", + "You renamed {file2} to {file1}" : "Vous avez renommé {file2} en {file1}", "%2$s renamed %3$s to %1$s" : "%2$s a renommé %3$s en %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} a renommé {file2} en {file1}", "You moved %2$s to %1$s" : "Vous avez déplacé %2$s dans %1$s", + "You moved {file2} to {file1}" : "Vous avez déplacé {file2} dans {file1}", "%2$s moved %3$s to %1$s" : "%2$s a déplacé %3$s dans %1$s", + "{user1} moved {file2} to {file1}" : "{user1} a déplacé {file2} dans {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Un fichier ou dossier a été <strong>modifié</strong> ou <strong>renommé</strong>", "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>", + "A new file or folder has been <strong>deleted</strong>" : "Un nouveau fichier ou répertoire a été <strong>supprimé</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>", + "A new file or folder has been <strong>restored</strong>" : "Un nouveau fichier ou répertoire a été <strong>restauré</strong>", "Upload (max. %s)" : "Envoi (max. %s)", "File handling" : "Gestion de fichiers", "Maximum upload size" : "Taille max. d'envoi", @@ -147,6 +168,7 @@ "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'", + "Local link" : "Dossier local", "{newname} already exists" : "{newname} existe déjà", "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>", "A file or folder has been <strong>deleted</strong>" : "Un fichier ou un répertoire a été <strong>supprimé</strong>", diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js index 2301c2f5b1b..a87febf2e18 100644 --- a/apps/files/l10n/hu_HU.js +++ b/apps/files/l10n/hu_HU.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"], "Favorited" : "Kedvenc", "Favorite" : "Kedvenc", - "Local link" : "Helyi hivatkozás", "Folder" : "Mappa", "New folder" : "Új mappa", "Upload" : "Feltöltés", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A szervertől nem kapható meg a művelet eredménye.", "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a mappában '{filter}'", + "Local link" : "Helyi hivatkozás", "{newname} already exists" : "{newname} már létezik", "A file or folder has been <strong>changed</strong>" : "Fájl vagy mappa <strong>módosítva</strong>", "A file or folder has been <strong>deleted</strong>" : "Fájl vagy mappa <strong>törölve</strong>", diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json index 46441adf9bc..92161d4ae72 100644 --- a/apps/files/l10n/hu_HU.json +++ b/apps/files/l10n/hu_HU.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"], "Favorited" : "Kedvenc", "Favorite" : "Kedvenc", - "Local link" : "Helyi hivatkozás", "Folder" : "Mappa", "New folder" : "Új mappa", "Upload" : "Feltöltés", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A szervertől nem kapható meg a művelet eredménye.", "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a mappában '{filter}'", + "Local link" : "Helyi hivatkozás", "{newname} already exists" : "{newname} már létezik", "A file or folder has been <strong>changed</strong>" : "Fájl vagy mappa <strong>módosítva</strong>", "A file or folder has been <strong>deleted</strong>" : "Fájl vagy mappa <strong>törölve</strong>", diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index d8169e1682f..237a6b0dec1 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -69,7 +69,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte"], "Favorited" : "Difavoritkan", "Favorite" : "Favorit", - "Local link" : "Pranala lokal", "Folder" : "Folder", "New folder" : "Map baru", "Upload" : "Unggah", @@ -129,6 +128,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Kesalahan saat mengunggah \"{filename}\": {message}", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'", + "Local link" : "Pranala lokal", "{newname} already exists" : "{newname} sudah ada", "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>", "A file or folder has been <strong>deleted</strong>" : "Sebuah berkas atau folder telah <strong>dihapus</strong>", diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index 7ee6e969490..7d1eaf17d53 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -67,7 +67,6 @@ "_%n byte_::_%n bytes_" : ["%n byte"], "Favorited" : "Difavoritkan", "Favorite" : "Favorit", - "Local link" : "Pranala lokal", "Folder" : "Folder", "New folder" : "Map baru", "Upload" : "Unggah", @@ -127,6 +126,7 @@ "Error uploading file \"{fileName}\": {message}" : "Kesalahan saat mengunggah \"{filename}\": {message}", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'", + "Local link" : "Pranala lokal", "{newname} already exists" : "{newname} sudah ada", "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>", "A file or folder has been <strong>deleted</strong>" : "Sebuah berkas atau folder telah <strong>dihapus</strong>", diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index d5f1816ad38..94d86a9a231 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"], "Favorited" : "Sett í eftirlæti", "Favorite" : "Eftirlæti", - "Local link" : "Staðvær tengill", "Folder" : "Mappa", "New folder" : "Ný mappa", "Upload" : "Senda inn", @@ -130,6 +129,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", "No entries in this folder match '{filter}'" : "Engar færslur í þessari möppu samsvara '{filter}'", + "Local link" : "Staðvær tengill", "{newname} already exists" : "{newname} er þegar til", "A file or folder has been <strong>changed</strong>" : "Skjali eða möppu hefur verið <strong>breytt</strong>", "A file or folder has been <strong>deleted</strong>" : "Skjali eða möppu hefur verið <strong>eytt</strong>", diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index 8ef22aef118..97f42689d32 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"], "Favorited" : "Sett í eftirlæti", "Favorite" : "Eftirlæti", - "Local link" : "Staðvær tengill", "Folder" : "Mappa", "New folder" : "Ný mappa", "Upload" : "Senda inn", @@ -128,6 +127,7 @@ "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", "No entries in this folder match '{filter}'" : "Engar færslur í þessari möppu samsvara '{filter}'", + "Local link" : "Staðvær tengill", "{newname} already exists" : "{newname} er þegar til", "A file or folder has been <strong>changed</strong>" : "Skjali eða möppu hefur verið <strong>breytt</strong>", "A file or folder has been <strong>deleted</strong>" : "Skjali eða möppu hefur verið <strong>eytt</strong>", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 480aa19cabb..d3293d6d1ce 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", "Favorite" : "Preferito", - "Local link" : "Collegamento locale", "Folder" : "Cartella", "New folder" : "Nuova cartella", "Upload" : "Carica", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'", + "Local link" : "Collegamento locale", "{newname} already exists" : "{newname} esiste già", "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>", "A file or folder has been <strong>deleted</strong>" : "Un file o una cartella è stato <strong>eliminato</strong>", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 5237e9036ff..97cb9530996 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", "Favorite" : "Preferito", - "Local link" : "Collegamento locale", "Folder" : "Cartella", "New folder" : "Nuova cartella", "Upload" : "Carica", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'", + "Local link" : "Collegamento locale", "{newname} already exists" : "{newname} esiste già", "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>", "A file or folder has been <strong>deleted</strong>" : "Un file o una cartella è stato <strong>eliminato</strong>", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index c264c8c4693..b24bedc3fde 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n バイト"], "Favorited" : "お気に入り済", "Favorite" : "お気に入り", - "Local link" : "ローカルリンク", "Folder" : "フォルダー", "New folder" : "新しいフォルダー", "Upload" : "アップロード", @@ -130,6 +129,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません", + "Local link" : "ローカルリンク", "{newname} already exists" : "{newname} はすでに存在します", "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき", "A file or folder has been <strong>deleted</strong>" : "ファイルまたはフォルダーを<strong>削除</strong>したとき", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 1941bd16736..5053cba2033 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n バイト"], "Favorited" : "お気に入り済", "Favorite" : "お気に入り", - "Local link" : "ローカルリンク", "Folder" : "フォルダー", "New folder" : "新しいフォルダー", "Upload" : "アップロード", @@ -128,6 +127,7 @@ "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません", + "Local link" : "ローカルリンク", "{newname} already exists" : "{newname} はすでに存在します", "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき", "A file or folder has been <strong>deleted</strong>" : "ファイルまたはフォルダーを<strong>削除</strong>したとき", diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js index 84868afb0c9..dfaa9479ca1 100644 --- a/apps/files/l10n/lv.js +++ b/apps/files/l10n/lv.js @@ -69,7 +69,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n baiti","%n baits","%n baiti"], "Favorited" : "Favorīti", "Favorite" : "Iecienītais", - "Local link" : "Lokāla saite", "Folder" : "Mape", "New folder" : "Jauna mape", "Upload" : "Augšupielādēt", @@ -129,6 +128,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Kļūda augšupielādējot datni \"{fileName}\": {message}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'", + "Local link" : "Lokāla saite", "{newname} already exists" : "{newname} jau eksistē", "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīta</strong> datne vai mape", "A file or folder has been <strong>deleted</strong>" : "<strong>Dzēsta</strong> datne vai mape", diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json index 83db2eaae79..d9b8c77e9de 100644 --- a/apps/files/l10n/lv.json +++ b/apps/files/l10n/lv.json @@ -67,7 +67,6 @@ "_%n byte_::_%n bytes_" : ["%n baiti","%n baits","%n baiti"], "Favorited" : "Favorīti", "Favorite" : "Iecienītais", - "Local link" : "Lokāla saite", "Folder" : "Mape", "New folder" : "Jauna mape", "Upload" : "Augšupielādēt", @@ -127,6 +126,7 @@ "Error uploading file \"{fileName}\": {message}" : "Kļūda augšupielādējot datni \"{fileName}\": {message}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'", + "Local link" : "Lokāla saite", "{newname} already exists" : "{newname} jau eksistē", "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīta</strong> datne vai mape", "A file or folder has been <strong>deleted</strong>" : "<strong>Dzēsta</strong> datne vai mape", diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index 86986940466..5c0a73c9719 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Er favoritt", "Favorite" : "Gjør til favoritt", - "Local link" : "Lokal lenke", "Folder" : "Mappe", "New folder" : "Ny mappe", "Upload" : "Last opp", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra tjeneren.", "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'", + "Local link" : "Lokal lenke", "{newname} already exists" : "{newname} finnes allerede", "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>", "A file or folder has been <strong>deleted</strong>" : "En fil eller mappe ble <strong>slettet</strong>", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 542ab6435b1..4c0183aec2f 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Er favoritt", "Favorite" : "Gjør til favoritt", - "Local link" : "Lokal lenke", "Folder" : "Mappe", "New folder" : "Ny mappe", "Upload" : "Last opp", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra tjeneren.", "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'", + "Local link" : "Lokal lenke", "{newname} already exists" : "{newname} finnes allerede", "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>", "A file or folder has been <strong>deleted</strong>" : "En fil eller mappe ble <strong>slettet</strong>", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index 859eb57099e..a3e68612710 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -76,17 +76,23 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", "Favorite" : "Favoriet", - "Local link" : "Lokale link", "Folder" : "Map", "New folder" : "Nieuwe map", "Upload" : "Uploaden", "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de markeringen bij te werken", "File changes" : "Bestandswijzigingen", + "Created by %s" : "Gecreëerd door %s", + "Created by {user1}" : "Gecreëerd door {user1}", "Changed by %2$s" : "Gewijzigd door %2$s", + "Changed by {user1}" : "Gewijzigd door {user1}", "Deleted by %2$s" : "Verwijderd door %2$s", + "Deleted by {user1}" : "Verwijderd door {user1}", "Restored by %2$s" : "Hersteld door %2$s", + "Restored by {user1}" : "Hersteld door {user1}", "Renamed by %2$s" : "Hernoemd door %2$s", + "Renamed by {user1}" : "Hernoemd door {user1}", "Moved by %2$s" : "Verplaatst door %2$s", + "Moved by {user1}" : "Verplaatst door {user1}", "You created %1$s" : "Gecreëerd: %1$s", "%2$s created %1$s" : "%2$s creëerde %1$s", "%1$s was created in a public folder" : "%1$s werd gecreëerd in een openbare map", @@ -94,12 +100,16 @@ OC.L10N.register( "%2$s changed %1$s" : "%2$s wijzigde %1$s", "You deleted %1$s" : "Je verwijderde: %1$s", "%2$s deleted %1$s" : "%2$s verwijderde %1$s", + "{user1} deleted {file1}" : "{user1} verwijderde {file1}", "You restored %1$s" : "Hersteld: %1$s", "%2$s restored %1$s" : "%2$s herstelde %1$s", + "{user1} restored {file1}" : "{user1} herstelde {file1}", "You renamed %2$s to %1$s" : "Je hernoemde %2$s naar %1$s", "%2$s renamed %3$s to %1$s" : "%2$s hernoemde %3$s naar %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} hernoemde file2} naar {file1}", "You moved %2$s to %1$s" : "Je verplaatste %2$s naar %1$s", "%2$s moved %3$s to %1$s" : "%2$s verplaatste %3$s naar %1$s", + "{user1} moved {file2} to {file1}" : "{user1} verplaatste {file2} naar {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Een bestand of map is <strong>gewijzigd</strong> of <strong>hernoemd</strong>", "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Beperk meldingen over aanmaken en wijzigen aan je <strong>favoriete bestanden</strong> <em>(Alleen stream)</em>", @@ -149,6 +159,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'", + "Local link" : "Lokale link", "{newname} already exists" : "{newname} bestaat al", "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>", "A file or folder has been <strong>deleted</strong>" : "Een bestand of map is <strong>verwijderd</strong>", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 27aa246989c..ac1627c0cbc 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -74,17 +74,23 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", "Favorite" : "Favoriet", - "Local link" : "Lokale link", "Folder" : "Map", "New folder" : "Nieuwe map", "Upload" : "Uploaden", "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de markeringen bij te werken", "File changes" : "Bestandswijzigingen", + "Created by %s" : "Gecreëerd door %s", + "Created by {user1}" : "Gecreëerd door {user1}", "Changed by %2$s" : "Gewijzigd door %2$s", + "Changed by {user1}" : "Gewijzigd door {user1}", "Deleted by %2$s" : "Verwijderd door %2$s", + "Deleted by {user1}" : "Verwijderd door {user1}", "Restored by %2$s" : "Hersteld door %2$s", + "Restored by {user1}" : "Hersteld door {user1}", "Renamed by %2$s" : "Hernoemd door %2$s", + "Renamed by {user1}" : "Hernoemd door {user1}", "Moved by %2$s" : "Verplaatst door %2$s", + "Moved by {user1}" : "Verplaatst door {user1}", "You created %1$s" : "Gecreëerd: %1$s", "%2$s created %1$s" : "%2$s creëerde %1$s", "%1$s was created in a public folder" : "%1$s werd gecreëerd in een openbare map", @@ -92,12 +98,16 @@ "%2$s changed %1$s" : "%2$s wijzigde %1$s", "You deleted %1$s" : "Je verwijderde: %1$s", "%2$s deleted %1$s" : "%2$s verwijderde %1$s", + "{user1} deleted {file1}" : "{user1} verwijderde {file1}", "You restored %1$s" : "Hersteld: %1$s", "%2$s restored %1$s" : "%2$s herstelde %1$s", + "{user1} restored {file1}" : "{user1} herstelde {file1}", "You renamed %2$s to %1$s" : "Je hernoemde %2$s naar %1$s", "%2$s renamed %3$s to %1$s" : "%2$s hernoemde %3$s naar %1$s", + "{user1} renamed {file2} to {file1}" : "{user1} hernoemde file2} naar {file1}", "You moved %2$s to %1$s" : "Je verplaatste %2$s naar %1$s", "%2$s moved %3$s to %1$s" : "%2$s verplaatste %3$s naar %1$s", + "{user1} moved {file2} to {file1}" : "{user1} verplaatste {file2} naar {file1}", "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Een bestand of map is <strong>gewijzigd</strong> of <strong>hernoemd</strong>", "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Beperk meldingen over aanmaken en wijzigen aan je <strong>favoriete bestanden</strong> <em>(Alleen stream)</em>", @@ -147,6 +157,7 @@ "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'", + "Local link" : "Lokale link", "{newname} already exists" : "{newname} bestaat al", "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>", "A file or folder has been <strong>deleted</strong>" : "Een bestand of map is <strong>verwijderd</strong>", diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index d0e8c4cf088..779ac796364 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtów"], "Favorited" : "Ulubione", "Favorite" : "Ulubione", - "Local link" : "Lokalny odnośnik", "Folder" : "Folder", "New folder" : "Nowy folder", "Upload" : "Wyślij", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", + "Local link" : "Lokalny odnośnik", "{newname} already exists" : "{newname} już istnieje", "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>", "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>", diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index f361a580d97..d5fcb2604e1 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtów"], "Favorited" : "Ulubione", "Favorite" : "Ulubione", - "Local link" : "Lokalny odnośnik", "Folder" : "Folder", "New folder" : "Nowy folder", "Upload" : "Wyślij", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", + "Local link" : "Lokalny odnośnik", "{newname} already exists" : "{newname} już istnieje", "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>", "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index b70169468be..6e3b1525982 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", "Favorite" : "Favorito", - "Local link" : "Link local", "Folder" : "Pasta", "New folder" : "Nova pasta", "Upload" : "Enviar", @@ -149,6 +148,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'", + "Local link" : "Link local", "{newname} already exists" : "{newname} já existe", "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>", "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluído</strong>", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 25a819fe648..e1106914d0b 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", "Favorite" : "Favorito", - "Local link" : "Link local", "Folder" : "Pasta", "New folder" : "Nova pasta", "Upload" : "Enviar", @@ -147,6 +146,7 @@ "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'", + "Local link" : "Link local", "{newname} already exists" : "{newname} já existe", "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>", "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluído</strong>", diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index a5b56b13de1..07988a078ce 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -76,7 +76,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", - "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "Upload" : "Загрузить", @@ -148,6 +147,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'", + "Local link" : "Локальная ссылка", "{newname} already exists" : "{newname} уже существует", "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог", "A file or folder has been <strong>deleted</strong>" : "<strong>Удалён</strong> файл или каталог", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index f55a3f7e50e..eb7b55b13e0 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -74,7 +74,6 @@ "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", - "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "Upload" : "Загрузить", @@ -146,6 +145,7 @@ "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'", + "Local link" : "Локальная ссылка", "{newname} already exists" : "{newname} уже существует", "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог", "A file or folder has been <strong>deleted</strong>" : "<strong>Удалён</strong> файл или каталог", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index afac496921a..2498801e059 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", - "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "Upload" : "Pošlji", @@ -130,6 +129,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'", + "Local link" : "Krajevna povezava", "{newname} already exists" : "{newname} že obstaja", "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.", "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je <strong>izbrisana</strong>.", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index 2bd291755c5..965db6b4eb1 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", - "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "Upload" : "Pošlji", @@ -128,6 +127,7 @@ "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'", + "Local link" : "Krajevna povezava", "{newname} already exists" : "{newname} že obstaja", "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.", "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je <strong>izbrisana</strong>.", diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js index d4ba250d9b8..704a2ff4dd3 100644 --- a/apps/files/l10n/sv.js +++ b/apps/files/l10n/sv.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bytes","%n bytes"], "Favorited" : "Favoriserad", "Favorite" : "Favorit", - "Local link" : "Lokal länk", "Folder" : "Mapp", "New folder" : "Ny mapp", "Upload" : "Ladda upp", @@ -130,6 +129,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", "No entries in this folder match '{filter}'" : "Inga poster i denna mapp match \"{filter}\"", + "Local link" : "Lokal länk", "{newname} already exists" : "{newname} existerar redan", "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>", "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>", diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json index 47aeb09487d..34573ec50ef 100644 --- a/apps/files/l10n/sv.json +++ b/apps/files/l10n/sv.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n bytes","%n bytes"], "Favorited" : "Favoriserad", "Favorite" : "Favorit", - "Local link" : "Lokal länk", "Folder" : "Mapp", "New folder" : "Ny mapp", "Upload" : "Ladda upp", @@ -128,6 +127,7 @@ "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", "No entries in this folder match '{filter}'" : "Inga poster i denna mapp match \"{filter}\"", + "Local link" : "Lokal länk", "{newname} already exists" : "{newname} existerar redan", "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>", "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>", diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 9295aa6833c..1b9af8dc6cd 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -70,7 +70,6 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n 位元組"], "Favorited" : "已加入最愛", "Favorite" : "我的最愛", - "Local link" : "本地連結", "Folder" : "資料夾", "New folder" : "新資料夾", "Upload" : "上傳", @@ -132,6 +131,7 @@ OC.L10N.register( "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符", + "Local link" : "本地連結", "{newname} already exists" : "{newname} 已經存在", "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>", "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 5483c897fab..383628a6b53 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -68,7 +68,6 @@ "_%n byte_::_%n bytes_" : ["%n 位元組"], "Favorited" : "已加入最愛", "Favorite" : "我的最愛", - "Local link" : "本地連結", "Folder" : "資料夾", "New folder" : "新資料夾", "Upload" : "上傳", @@ -130,6 +129,7 @@ "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符", + "Local link" : "本地連結", "{newname} already exists" : "{newname} 已經存在", "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>", "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>", diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 1de0cc7c75d..6ac6dff0a66 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -2,7 +2,10 @@ min-height: 100px; } -.shareTabView .oneline { white-space: nowrap; } +.shareTabView .oneline { + white-space: nowrap; + position: relative; +} .shareTabView .shareWithLoading { padding-left: 10px; @@ -12,7 +15,10 @@ .shareTabView .shareWithRemoteInfo, .shareTabView .clipboardButton { - padding-left: 10px; + position: absolute; + right: -7px; + top: -4px; + padding: 14px; } .shareTabView label { @@ -24,15 +30,14 @@ vertical-align: middle; } -.shareTabView input[type="text"], -.shareTabView input[type="password"] { - width: 94%; - margin-left: 0; -} .shareTabView input[type="text"].shareWithField, .shareTabView input[type="text"].emailField, -.shareTabView input[type="text"].linkText { - width: 80%; +.shareTabView input[type="text"].linkText, +.shareTabView input[type="password"] { + width: 100%; + box-sizing: border-box; + padding-right: 32px; + text-overflow: ellipsis; } .shareTabView form { @@ -54,16 +59,21 @@ } #shareWithList .unshare img, #shareWithList .showCruds img { - vertical-align:text-bottom; /* properly align icons */ + vertical-align: text-bottom; /* properly align icons */ } -#shareWithList .sharingOptionsGroup .icon-more, -#shareWithList .unshare .icon-delete { - vertical-align: sub; +#shareWithList .sharingOptionsGroup .icon-more { + padding: 7px; + vertical-align: middle; + opacity: .5; } #shareWithList .unshare { - padding: 0; + padding: 4px; + vertical-align: text-bottom; +} +#shareWithList .unshare .icon { + vertical-align: text-top; } #shareWithList .unshare .icon-delete { @@ -71,21 +81,23 @@ background-position-x: 0; } -#shareWithList label input[type=checkbox]{ +#shareWithList label input[type=checkbox] { margin-left: 0; position: relative; } -#shareWithList .username{ +#shareWithList .username { padding-right: 8px; white-space: nowrap; text-overflow: ellipsis; - max-width: 254px; + max-width: 110px; display: inline-block; overflow: hidden; vertical-align: middle; } -#shareWithList li label{ +#shareWithList li label { + padding: 6px; margin-right: 8px; + vertical-align: text-top; } .shareTabView .icon-loading-small { diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index a959c4ba543..f2eba22fa17 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -20,6 +20,7 @@ OC.L10N.register( "Sharing" : "Sdílení", "A file or folder has been <strong>shared</strong>" : "Soubor nebo adresář byl <strong>nasdílen</strong>", "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo adresář byl nasdílen z <strong>jiného serveru</strong>", + "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> soubor nebo adresář sdílený jako veřejný odkaz", "You received a new remote share %2$s from %1$s" : "Obdrželi jste nové vzdálené sdílení %2$s od uživatele %1$s", "You received a new remote share from %s" : "Obdrželi jste nové vzdálené sdílení z %s", "%1$s accepted remote share %2$s" : "%1$s přijal(a) vzdálené sdílení %2$s", @@ -43,6 +44,8 @@ OC.L10N.register( "The public link of %2$s for %1$s expired" : "Veřejný odkaz na %2$s pro %1$s vypršel", "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "%2$s removed the share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s", + "File %1$s shared by email with %2$s was downloaded" : "Soubor %1$s sdílen pomocí emailu s %2$s byl stažen", + "Folder %1$s shared by email with %2$s was downloaded" : "Adresář %1$s sdílen pomocí emailu s %2$s byl stažen", "Downloaded via public link" : "Staženo pomocí veřejného odkazu", "Shared with %2$s" : "Sdíleno s %2$s", "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s", diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 0b69474deb2..9d82343e895 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -18,6 +18,7 @@ "Sharing" : "Sdílení", "A file or folder has been <strong>shared</strong>" : "Soubor nebo adresář byl <strong>nasdílen</strong>", "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo adresář byl nasdílen z <strong>jiného serveru</strong>", + "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> soubor nebo adresář sdílený jako veřejný odkaz", "You received a new remote share %2$s from %1$s" : "Obdrželi jste nové vzdálené sdílení %2$s od uživatele %1$s", "You received a new remote share from %s" : "Obdrželi jste nové vzdálené sdílení z %s", "%1$s accepted remote share %2$s" : "%1$s přijal(a) vzdálené sdílení %2$s", @@ -41,6 +42,8 @@ "The public link of %2$s for %1$s expired" : "Veřejný odkaz na %2$s pro %1$s vypršel", "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "%2$s removed the share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s", + "File %1$s shared by email with %2$s was downloaded" : "Soubor %1$s sdílen pomocí emailu s %2$s byl stažen", + "Folder %1$s shared by email with %2$s was downloaded" : "Adresář %1$s sdílen pomocí emailu s %2$s byl stažen", "Downloaded via public link" : "Staženo pomocí veřejného odkazu", "Shared with %2$s" : "Sdíleno s %2$s", "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s", diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index b5fd9bc9935..7a90653289d 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -59,6 +59,7 @@ OC.L10N.register( "Public link expired" : "Openbare link is verlopen", "Public link of %2$s expired" : "Openbare link van %2$s is verlopen", "Shared by %2$s" : "Gedeeld door %2$s", + "Downloaded by %2$s" : "Gedownload door %2$s", "File shares" : "File shares", "Wrong share ID, share doesn't exist" : "Onjuist deel-ID, de share bestaat niet", "could not delete share" : "Kon share niet verwijderen", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 949702d635f..58d8fddba1f 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -57,6 +57,7 @@ "Public link expired" : "Openbare link is verlopen", "Public link of %2$s expired" : "Openbare link van %2$s is verlopen", "Shared by %2$s" : "Gedeeld door %2$s", + "Downloaded by %2$s" : "Gedownload door %2$s", "File shares" : "File shares", "Wrong share ID, share doesn't exist" : "Onjuist deel-ID, de share bestaat niet", "could not delete share" : "Kon share niet verwijderen", diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index 038be1c3fea..bc10ddbd94f 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -43,40 +43,34 @@ class Cache extends CacheJail { private $storage; /** - * @var IStorage - */ - private $sourceStorage; - - /** * @var ICacheEntry */ private $sourceRootInfo; - /** - * @var \OCP\Files\Cache\ICache - */ - private $sourceCache; - private $rootUnchanged = true; private $ownerDisplayName; /** * @param \OCA\Files_Sharing\SharedStorage $storage - * @param IStorage $sourceStorage * @param ICacheEntry $sourceRootInfo */ - public function __construct($storage, IStorage $sourceStorage, ICacheEntry $sourceRootInfo) { + public function __construct($storage, ICacheEntry $sourceRootInfo) { $this->storage = $storage; - $this->sourceStorage = $sourceStorage; $this->sourceRootInfo = $sourceRootInfo; - $this->sourceCache = $sourceStorage->getCache(); parent::__construct( - $this->sourceCache, + null, $this->sourceRootInfo->getPath() ); } + public function getCache() { + if (is_null($this->cache)) { + $this->cache = $this->storage->getSourceStorage()->getCache(); + } + return $this->cache; + } + public function getNumericStorageId() { if (isset($this->numericId)) { return $this->numericId; diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index 1ee6f2b35f6..40d2fb27535 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -172,6 +172,9 @@ class MountProvider implements IMountProvider { $share->setTarget($superShare->getTarget()); $this->shareManager->moveShare($share, $user->getUID()); } + if (!is_null($share->getNodeCacheEntry())) { + $superShare->setNodeCacheEntry($share->getNodeCacheEntry()); + } } $superShare->setPermissions($permissions); diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 7002d388d93..5b4aa061800 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -71,6 +71,8 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto */ private $logger; + private $options; + public function __construct($arguments) { $this->ownerView = $arguments['ownerView']; $this->logger = \OC::$server->getLogger(); @@ -86,6 +88,20 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto ]); } + /** + * @return ICacheEntry + */ + private function getSourceRootInfo() { + if (is_null($this->sourceRootInfo)) { + if (is_null($this->superShare->getNodeCacheEntry())) { + $this->sourceRootInfo = $this->getWrapperStorage()->getCache()->get($this->rootPath); + } else { + $this->sourceRootInfo = $this->superShare->getNodeCacheEntry(); + } + } + return $this->sourceRootInfo; + } + private function init() { if ($this->initialized) { return; @@ -95,7 +111,6 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto Filesystem::initMountPoints($this->superShare->getShareOwner()); $sourcePath = $this->ownerView->getPath($this->superShare->getNodeId()); list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath); - $this->sourceRootInfo = $this->storage->getCache()->get($this->rootPath); } catch (NotFoundException $e) { $this->storage = new FailedStorage(['exception' => $e]); $this->rootPath = ''; @@ -110,6 +125,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto * @inheritdoc */ public function instanceOfStorage($class) { + if ($class === '\OC\Files\Storage\Common') { + return true; + } if (in_array($class, ['\OC\Files\Storage\Home', '\OC\Files\ObjectStore\HomeObjectStoreStorage'])) { return false; } @@ -124,8 +142,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto } private function isValid() { - $this->init(); - return $this->sourceRootInfo && ($this->sourceRootInfo->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE; + return $this->getSourceRootInfo() && ($this->getSourceRootInfo()->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE; } /** @@ -314,14 +331,10 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto if ($this->cache) { return $this->cache; } - $this->init(); - if (is_null($this->storage) || $this->storage instanceof FailedStorage) { - return new FailedCache(false); - } if (!$storage) { $storage = $this; } - $this->cache = new \OCA\Files_Sharing\Cache($storage, $this->storage, $this->sourceRootInfo); + $this->cache = new \OCA\Files_Sharing\Cache($storage, $this->getSourceRootInfo(), $this->superShare); return $this->cache; } @@ -449,4 +462,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto return parent::file_put_contents($path, $data); } + public function setMountOptions(array $options) { + $this->mountOptions = $options; + } } diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index b159de82ea3..cd63a90ab51 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,6 +1,7 @@ .versionsTabView .clear-float { clear: both; } + .versionsTabView li { width: 100%; cursor: default; @@ -12,25 +13,30 @@ border-bottom: none; } -.versionsTabView li > * { +.versionsTabView a, +.versionsTabView div > span { vertical-align: middle; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; } -.versionsTabView li > a, -.versionsTabView li > span { +.versionsTabView li a{ padding: 15px 10px 11px; } -.versionsTabView li > *:hover, -.versionsTabView li > *:focus { +.versionsTabView a:hover, +.versionsTabView a:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; } +.versionsTabView .preview-container { + display: inline-block; + vertical-align: top; +} + .versionsTabView img { cursor: pointer; padding-right: 4px; @@ -38,7 +44,10 @@ .versionsTabView img.preview { cursor: default; - opacity: 1; +} + +.versionsTabView .version-container { + display: inline-block; } .versionsTabView .versiondate { @@ -46,6 +55,14 @@ vertical-align: super; } +.versionsTabView .version-details { + text-align: left; +} + +.versionsTabView .version-details > span { + padding: 0 10px; +} + .versionsTabView .revertVersion { cursor: pointer; float: right; diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js index 2e334edacb5..35abde6d34a 100644 --- a/apps/files_versions/js/versionstabview.js +++ b/apps/files_versions/js/versionstabview.js @@ -13,13 +13,26 @@ (function() { var TEMPLATE_ITEM = '<li data-revision="{{timestamp}}">' + + '<div>' + + '<div class="preview-container">' + '<img class="preview" src="{{previewUrl}}"/>' + + '</div>' + + '<div class="version-container">' + + '<div>' + '<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' + '<span class="versiondate has-tooltip live-relative-timestamp" data-timestamp="{{millisecondsTimestamp}}" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' + '</a>' + + '</div>' + + '{{#hasDetails}}' + + '<div class="version-details">' + + '<span class="size has-tooltip" title="{{altSize}}">{{humanReadableSize}}</span>' + + '</div>' + + '{{/hasDetails}}' + + '</div>' + '{{#canRevert}}' + '<a href="#" class="revertVersion" title="{{revertLabel}}"><img src="{{revertIconUrl}}" /></a>' + '{{/canRevert}}' + + '</div>' + '</li>'; var TEMPLATE = @@ -182,10 +195,14 @@ _formatItem: function(version) { var timestamp = version.get('timestamp') * 1000; + var size = version.has('size') ? version.get('size') : 0; return _.extend({ millisecondsTimestamp: timestamp, formattedTimestamp: OC.Util.formatDate(timestamp), relativeTimestamp: OC.Util.relativeModifiedDate(timestamp), + humanReadableSize: OC.Util.humanFileSize(size, true), + altSize: n('files', '%n byte', '%n bytes', size), + hasDetails: version.has('size'), downloadUrl: version.getDownloadUrl(), downloadIconUrl: OC.imagePath('core', 'actions/download'), revertIconUrl: OC.imagePath('core', 'actions/history'), diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js index 94285c93aba..9b788db1970 100644 --- a/apps/files_versions/tests/js/versionstabviewSpec.js +++ b/apps/files_versions/tests/js/versionstabviewSpec.js @@ -78,12 +78,14 @@ describe('OCA.Versions.VersionsTabView', function() { var $item = $versions.eq(0); expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('seconds ago'); + expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.revertVersion').length).toEqual(1); expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl()); $item = $versions.eq(1); expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('2 days ago'); + expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.revertVersion').length).toEqual(1); expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl()); }); @@ -231,4 +233,3 @@ describe('OCA.Versions.VersionsTabView', function() { }); }); }); - diff --git a/apps/systemtags/l10n/cs_CZ.js b/apps/systemtags/l10n/cs_CZ.js index 2a9df127eac..a58f4456d74 100644 --- a/apps/systemtags/l10n/cs_CZ.js +++ b/apps/systemtags/l10n/cs_CZ.js @@ -7,6 +7,7 @@ OC.L10N.register( "Select tag…" : "Zvolit značku…", "Tagged files" : "Otagované soubory", "Select tags to filter by" : "Vybrat tagy pro filtr", + "No tags found" : "Nebyly nalezeny žádné tagy", "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "<strong>System tags</strong> for a file have been modified" : "<strong>Systémové tagy</strong> souboru byly upraveny", diff --git a/apps/systemtags/l10n/cs_CZ.json b/apps/systemtags/l10n/cs_CZ.json index 2705db475c1..4c431198836 100644 --- a/apps/systemtags/l10n/cs_CZ.json +++ b/apps/systemtags/l10n/cs_CZ.json @@ -5,6 +5,7 @@ "Select tag…" : "Zvolit značku…", "Tagged files" : "Otagované soubory", "Select tags to filter by" : "Vybrat tagy pro filtr", + "No tags found" : "Nebyly nalezeny žádné tagy", "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "<strong>System tags</strong> for a file have been modified" : "<strong>Systémové tagy</strong> souboru byly upraveny", diff --git a/apps/systemtags/l10n/nl.js b/apps/systemtags/l10n/nl.js index da07439d6d5..e7292e883be 100644 --- a/apps/systemtags/l10n/nl.js +++ b/apps/systemtags/l10n/nl.js @@ -7,6 +7,7 @@ OC.L10N.register( "Select tag…" : "Selecteren markering…", "Tagged files" : "Gemarkeerde bestanden", "Select tags to filter by" : "Selecteer markering om op te filteren", + "No tags found" : "Geen tags gevonden", "Please select tags to filter by" : "Selecteer markeringen om op te filteren", "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde markeringen", "<strong>System tags</strong> for a file have been modified" : "<strong>Systeemmarkeringen</strong> voor een bestand zijn gewijzigd", diff --git a/apps/systemtags/l10n/nl.json b/apps/systemtags/l10n/nl.json index 3fa3fdf24d8..7895bb4ff27 100644 --- a/apps/systemtags/l10n/nl.json +++ b/apps/systemtags/l10n/nl.json @@ -5,6 +5,7 @@ "Select tag…" : "Selecteren markering…", "Tagged files" : "Gemarkeerde bestanden", "Select tags to filter by" : "Selecteer markering om op te filteren", + "No tags found" : "Geen tags gevonden", "Please select tags to filter by" : "Selecteer markeringen om op te filteren", "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde markeringen", "<strong>System tags</strong> for a file have been modified" : "<strong>Systeemmarkeringen</strong> voor een bestand zijn gewijzigd", |