diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css index 09771b4e9544b..1ed418df2fc66 100644 --- a/apps/comments/css/comments.css +++ b/apps/comments/css/comments.css @@ -60,6 +60,8 @@ #commentsTabView .comment { position: relative; margin-bottom: 30px; + word-wrap: break-word; + overflow-wrap: break-word; } #commentsTabView .comment .avatar, diff --git a/apps/dav/l10n/da.js b/apps/dav/l10n/da.js index b26fcb51510ea..8ddad543dc702 100644 --- a/apps/dav/l10n/da.js +++ b/apps/dav/l10n/da.js @@ -41,6 +41,17 @@ OC.L10N.register( "A calendar event was modified" : "En kalender begivenhed er blevet ændret", "A calendar todo was modified" : "En kalender opgave blev ændret", "Contact birthdays" : "Kontakt fødselsdag", + "%s via %s" : "%s via %s", + "Invitation canceled" : "Invitation annulleret", + "Hello %s," : "Goddag %s,", + "The meeting »%s« with %s was canceled." : "Mødet »%s« med %s blev annulleret.", + "Invitation updated" : "Invitation opdateret ", + "The meeting »%s« with %s was updated." : "Mødet »%s« med %s blev opdateret.", + "%s invited you to »%s«" : "%s inviterede dig til »%s«", + "When:" : "Hvornår:", + "Where:" : "Hvor:", + "Description:" : "Beskrivelse:", + "Link:" : "Link:", "Contacts" : "Kontakter", "Technical details" : "Tekniske detaljer", "Remote Address: %s" : "Fjernadresse: %s", diff --git a/apps/dav/l10n/da.json b/apps/dav/l10n/da.json index be5aa72d05ba1..fd40e7d035011 100644 --- a/apps/dav/l10n/da.json +++ b/apps/dav/l10n/da.json @@ -39,6 +39,17 @@ "A calendar event was modified" : "En kalender begivenhed er blevet ændret", "A calendar todo was modified" : "En kalender opgave blev ændret", "Contact birthdays" : "Kontakt fødselsdag", + "%s via %s" : "%s via %s", + "Invitation canceled" : "Invitation annulleret", + "Hello %s," : "Goddag %s,", + "The meeting »%s« with %s was canceled." : "Mødet »%s« med %s blev annulleret.", + "Invitation updated" : "Invitation opdateret ", + "The meeting »%s« with %s was updated." : "Mødet »%s« med %s blev opdateret.", + "%s invited you to »%s«" : "%s inviterede dig til »%s«", + "When:" : "Hvornår:", + "Where:" : "Hvor:", + "Description:" : "Beskrivelse:", + "Link:" : "Link:", "Contacts" : "Kontakter", "Technical details" : "Tekniske detaljer", "Remote Address: %s" : "Fjernadresse: %s", diff --git a/apps/dav/l10n/en_GB.js b/apps/dav/l10n/en_GB.js index 94c9592316e32..16b82fac54618 100644 --- a/apps/dav/l10n/en_GB.js +++ b/apps/dav/l10n/en_GB.js @@ -41,6 +41,7 @@ OC.L10N.register( "A calendar event was modified" : "A calendar event was modified", "A calendar todo was modified" : "A calendar todo was modified", "Contact birthdays" : "Contact birthdays", + "%s via %s" : "%s via %s", "Invitation canceled" : "Invitation canceled", "Hello %s," : "Hello %s,", "The meeting »%s« with %s was canceled." : "The meeting »%s« with %s was canceled.", diff --git a/apps/dav/l10n/en_GB.json b/apps/dav/l10n/en_GB.json index 9b6a26cf0ed25..2e9b63b16e4ba 100644 --- a/apps/dav/l10n/en_GB.json +++ b/apps/dav/l10n/en_GB.json @@ -39,6 +39,7 @@ "A calendar event was modified" : "A calendar event was modified", "A calendar todo was modified" : "A calendar todo was modified", "Contact birthdays" : "Contact birthdays", + "%s via %s" : "%s via %s", "Invitation canceled" : "Invitation canceled", "Hello %s," : "Hello %s,", "The meeting »%s« with %s was canceled." : "The meeting »%s« with %s was canceled.", diff --git a/apps/dav/l10n/es.js b/apps/dav/l10n/es.js index b2591b7dda91c..cb67f8774b6f1 100644 --- a/apps/dav/l10n/es.js +++ b/apps/dav/l10n/es.js @@ -41,6 +41,7 @@ OC.L10N.register( "A calendar event was modified" : "Un evento del calendario fue modificado.", "A calendar todo was modified" : "Una lista de tareas fue modificada", "Contact birthdays" : "Cumpleaños del contacto", + "%s via %s" : "%s vía %s", "Invitation canceled" : "Invitación cancelada", "Hello %s," : "Hola, %s:", "The meeting »%s« with %s was canceled." : "La reunión »%s« con %s se ha cancelado.", diff --git a/apps/dav/l10n/es.json b/apps/dav/l10n/es.json index d114b339b13e0..7d3abca51cbdf 100644 --- a/apps/dav/l10n/es.json +++ b/apps/dav/l10n/es.json @@ -39,6 +39,7 @@ "A calendar event was modified" : "Un evento del calendario fue modificado.", "A calendar todo was modified" : "Una lista de tareas fue modificada", "Contact birthdays" : "Cumpleaños del contacto", + "%s via %s" : "%s vía %s", "Invitation canceled" : "Invitación cancelada", "Hello %s," : "Hola, %s:", "The meeting »%s« with %s was canceled." : "La reunión »%s« con %s se ha cancelado.", diff --git a/apps/dav/l10n/ka_GE.js b/apps/dav/l10n/ka_GE.js index 8508ccc011dcd..152db86aa929f 100644 --- a/apps/dav/l10n/ka_GE.js +++ b/apps/dav/l10n/ka_GE.js @@ -41,6 +41,7 @@ OC.L10N.register( "A calendar event was modified" : "კალენდრის მოვლენა შეიცვალა", "A calendar todo was modified" : "კალენდრის შესასრულებელი დავალება შეიცვალა", "Contact birthdays" : "კონტაქტების დაბადების დღეები", + "%s via %s" : "%s %s-ით", "Invitation canceled" : "მოწვევა გაუქმდა", "Hello %s," : "გამარჯობა %s,", "The meeting »%s« with %s was canceled." : "შეხვედრა »%s« %s-სთან გაუქმდა.", diff --git a/apps/dav/l10n/ka_GE.json b/apps/dav/l10n/ka_GE.json index 8cd4e90873d2e..6b6e6536ddaa6 100644 --- a/apps/dav/l10n/ka_GE.json +++ b/apps/dav/l10n/ka_GE.json @@ -39,6 +39,7 @@ "A calendar event was modified" : "კალენდრის მოვლენა შეიცვალა", "A calendar todo was modified" : "კალენდრის შესასრულებელი დავალება შეიცვალა", "Contact birthdays" : "კონტაქტების დაბადების დღეები", + "%s via %s" : "%s %s-ით", "Invitation canceled" : "მოწვევა გაუქმდა", "Hello %s," : "გამარჯობა %s,", "The meeting »%s« with %s was canceled." : "შეხვედრა »%s« %s-სთან გაუქმდა.", diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js index 8289d726a6331..76331fecc5404 100644 --- a/apps/dav/l10n/nl.js +++ b/apps/dav/l10n/nl.js @@ -41,6 +41,7 @@ OC.L10N.register( "A calendar event was modified" : "Een agenda gebeurtenis is aangepast", "A calendar todo was modified" : "Een agenda Te doen was aangepast", "Contact birthdays" : "Verjaardagen", + "%s via %s" : "%s via %s", "Invitation canceled" : "Uitnodiging geannuleerd", "Hello %s," : "Hallo %s,", "The meeting »%s« with %s was canceled." : "De vergadering »%s« met %s is geannuleerd.", diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json index 7c96d226dd62a..e7cb2acd39571 100644 --- a/apps/dav/l10n/nl.json +++ b/apps/dav/l10n/nl.json @@ -39,6 +39,7 @@ "A calendar event was modified" : "Een agenda gebeurtenis is aangepast", "A calendar todo was modified" : "Een agenda Te doen was aangepast", "Contact birthdays" : "Verjaardagen", + "%s via %s" : "%s via %s", "Invitation canceled" : "Uitnodiging geannuleerd", "Hello %s," : "Hallo %s,", "The meeting »%s« with %s was canceled." : "De vergadering »%s« met %s is geannuleerd.", diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index b2e4c4490958f..979336d86fed8 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -300,6 +300,9 @@ public function getDavPermissions() { if ($this->info->isMounted()) { $p .= 'M'; } + if ($this->info->isReadable()) { + $p .= 'G'; + } if ($this->info->isDeletable()) { $p .= 'D'; } diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php index d4964557126c1..b46c731d3dc63 100644 --- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php @@ -42,15 +42,17 @@ class NodeTest extends \Test\TestCase { public function davPermissionsProvider() { return array( - array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RDNVW'), - array(\OCP\Constants::PERMISSION_ALL, 'dir', false, false, 'RDNVCK'), - array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'), - array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RD'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'), + array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RGDNVW'), + array(\OCP\Constants::PERMISSION_ALL, 'dir', false, false, 'RGDNVCK'), + array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRGDNVW'), + array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMGDNVW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SGDNVW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RGD'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RGNVW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RGDNVW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_READ, 'file', false, false, 'RDNVW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RGDNV'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_READ, 'dir', false, false, 'RDNVCK'), ); } diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 0f320c8b3c7c9..6c031ab06d5ac 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -235,7 +235,7 @@ } var filteredActions = {}; $.each(actions, function (name, action) { - if (action.permissions & permissions) { + if ((action.permissions === OC.PERMISSION_NONE) || (action.permissions & permissions)) { filteredActions[name] = action; } }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 03e9c138efb10..6996e423776ae 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -408,7 +408,7 @@ mime: 'all', order: -50, iconClass: 'icon-details', - permissions: OC.PERMISSION_READ, + permissions: OC.PERMISSION_NONE, actionHandler: function(fileName, context) { self._updateDetailsView(fileName); } @@ -1161,6 +1161,11 @@ } } + var permissions = fileData.permissions; + if (permissions === undefined || permissions === null) { + permissions = this.getDirectoryPermissions(); + } + //containing tr var tr = $('').attr({ "data-id" : fileData.id, @@ -1170,7 +1175,7 @@ "data-mime": mime, "data-mtime": mtime, "data-etag": fileData.etag, - "data-permissions": fileData.permissions || this.getDirectoryPermissions(), + "data-permissions": permissions, "data-has-preview": fileData.hasPreview !== false }); diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js index 747a7245a56b3..b174aa7d76620 100644 --- a/apps/files/js/tagsplugin.js +++ b/apps/files/js/tagsplugin.js @@ -104,7 +104,7 @@ }, mime: 'all', order: -100, - permissions: OC.PERMISSION_READ, + permissions: OC.PERMISSION_NONE, iconClass: function(fileName, context) { var $file = context.$file; var isFavorite = $file.data('favorite') === true; diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index 5836568f67342..242fcc20334ec 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -19,6 +19,8 @@ OC.L10N.register( "Uploading …" : "Wysyłanie...", "…" : "...", "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})", + "Target folder does not exist any more" : "Folder docelowy już nie istnieje", + "Error when assembling chunks, status code {status}" : "Błąd podczas łączenia fragmentów, kod statusu {status}", "Actions" : "Akcje", "Download" : "Pobierz", "Rename" : "Zmień nazwę", diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index f8d90f4c6aeb6..25da511ea2129 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -17,6 +17,8 @@ "Uploading …" : "Wysyłanie...", "…" : "...", "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})", + "Target folder does not exist any more" : "Folder docelowy już nie istnieje", + "Error when assembling chunks, status code {status}" : "Błąd podczas łączenia fragmentów, kod statusu {status}", "Actions" : "Akcje", "Download" : "Pobierz", "Rename" : "Zmień nazwę", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index ffa02a73a5f69..ad983c19924e4 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -5,7 +5,7 @@ OC.L10N.register( "Storage invalid" : "Неисправно складиште", "Unknown error" : "Непозната грешка", "All files" : "Сви фајлови", - "Recent" : "Скорашње", + "Recent" : "Скорашњи", "File could not be found" : "Фајл није нађен", "Home" : "Почетна", "Close" : "Затвори", @@ -137,9 +137,9 @@ OC.L10N.register( "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.", "No favorites yet" : "Још нема омиљених", "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде", - "Shared with you" : "Дељено са вама", - "Shared with others" : "Дељено са осталима", - "Shared by link" : "Дељено путем везе", + "Shared with you" : "Дељени са вама", + "Shared with others" : "Дељени са осталима", + "Shared by link" : "Дељени путем везе", "Tags" : "Ознаке", "Deleted files" : "Обрисани фајлови", "Text file" : "Tекстуални фајл", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index 40acca2420d9e..7e4a1b31b9015 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -3,7 +3,7 @@ "Storage invalid" : "Неисправно складиште", "Unknown error" : "Непозната грешка", "All files" : "Сви фајлови", - "Recent" : "Скорашње", + "Recent" : "Скорашњи", "File could not be found" : "Фајл није нађен", "Home" : "Почетна", "Close" : "Затвори", @@ -135,9 +135,9 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.", "No favorites yet" : "Још нема омиљених", "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде", - "Shared with you" : "Дељено са вама", - "Shared with others" : "Дељено са осталима", - "Shared by link" : "Дељено путем везе", + "Shared with you" : "Дељени са вама", + "Shared with others" : "Дељени са осталима", + "Shared by link" : "Дељени путем везе", "Tags" : "Ознаке", "Deleted files" : "Обрисани фајлови", "Text file" : "Tекстуални фајл", diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index c590275e1cfe9..64fc68764938f 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -297,6 +297,15 @@ describe('OCA.Files.FileList tests', function() { expect($tr.find('.filesize').text()).toEqual('Pending'); expect($tr.find('.date').text()).not.toEqual('?'); }); + it('generates file element with no permissions when permissions are explicitly none', function() { + var fileData = { + type: 'dir', + name: 'testFolder', + permissions: OC.PERMISSION_NONE + }; + var $tr = fileList.add(fileData); + expect($tr.attr('data-permissions')).toEqual('0'); + }); it('generates file element with zero size when size is explicitly zero', function() { var fileData = { type: 'dir', diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index e32cb5222af0c..ddff1a6a318fb 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -91,14 +91,14 @@ OC.L10N.register( "SMB / CIFS" : "SMB / CIFS", "Share" : "Дели", "Domain" : "Домен", - "SMB / CIFS using OC login" : "SMB / CIFS користећи оунКлауд пријаву", + "SMB / CIFS using OC login" : "SMB / CIFS користећи Некстклауд пријаву", "Username as share" : "Корисничко име као дељење", "OpenStack Object Storage" : "OpenStack Object Storage", "Service name" : "Назив услуге", "Request timeout (seconds)" : "Време захтева истекло (секунде)", "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "cURL подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", - "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", + "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталиран. Монтирање %s није могуће. Затражите од вашег администратора система да га инсталира.", "No external storage configured" : "Нема подешеног спољашњег складишта", "You can add external storages in the personal settings" : "Можете додати спољашња складишта у вашим личним подешавањима", "Name" : "Назив", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index 1f1a8b7dfe921..15b84d8ac515f 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -89,14 +89,14 @@ "SMB / CIFS" : "SMB / CIFS", "Share" : "Дели", "Domain" : "Домен", - "SMB / CIFS using OC login" : "SMB / CIFS користећи оунКлауд пријаву", + "SMB / CIFS using OC login" : "SMB / CIFS користећи Некстклауд пријаву", "Username as share" : "Корисничко име као дељење", "OpenStack Object Storage" : "OpenStack Object Storage", "Service name" : "Назив услуге", "Request timeout (seconds)" : "Време захтева истекло (секунде)", "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "cURL подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", - "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", + "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталиран. Монтирање %s није могуће. Затражите од вашег администратора система да га инсталира.", "No external storage configured" : "Нема подешеног спољашњег складишта", "You can add external storages in the personal settings" : "Можете додати спољашња складишта у вашим личним подешавањима", "Name" : "Назив", diff --git a/apps/sharebymail/l10n/nl.js b/apps/sharebymail/l10n/nl.js index 498e5eca91363..01053b0397b4c 100644 --- a/apps/sharebymail/l10n/nl.js +++ b/apps/sharebymail/l10n/nl.js @@ -34,10 +34,10 @@ OC.L10N.register( "This is the password: %s" : "Dit is het wachtwoord: %s", "You can choose a different password at any time in the share dialog." : "Je kunt in de Delen-dialoog altijd een ander wachtwoord kiezen.", "Could not find share" : "Kon gedeeld niet vinden", - "Share by mail" : "Gedeeld per email", - "Allows users to share a personalized link to a file or folder by putting in an email address." : "Staat gebruikers toe om een gepersonaliseerde link of map te delen door een emailadres in te voegen.", + "Share by mail" : "Delen via email", + "Allows users to share a personalized link to a file or folder by putting in an email address." : "Staat gebruikers toe om een gepersonaliseerde link of map te delen door een e-mailadres op te geven.", "Send password by mail" : "Wachtwoord per email verzenden", - "Enforce password protection" : "Afdwingen wachtwoord beveiliging", + "Enforce password protection" : "Wachtwoord-beveiliging afdwingen", "Failed to send share by E-mail" : "delen per email is mislukt", "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s", "Failed to create the E-mail" : "Maken van de mail is mislukt", diff --git a/apps/sharebymail/l10n/nl.json b/apps/sharebymail/l10n/nl.json index eaac09dc2088a..d6b8974ca9fb0 100644 --- a/apps/sharebymail/l10n/nl.json +++ b/apps/sharebymail/l10n/nl.json @@ -32,10 +32,10 @@ "This is the password: %s" : "Dit is het wachtwoord: %s", "You can choose a different password at any time in the share dialog." : "Je kunt in de Delen-dialoog altijd een ander wachtwoord kiezen.", "Could not find share" : "Kon gedeeld niet vinden", - "Share by mail" : "Gedeeld per email", - "Allows users to share a personalized link to a file or folder by putting in an email address." : "Staat gebruikers toe om een gepersonaliseerde link of map te delen door een emailadres in te voegen.", + "Share by mail" : "Delen via email", + "Allows users to share a personalized link to a file or folder by putting in an email address." : "Staat gebruikers toe om een gepersonaliseerde link of map te delen door een e-mailadres op te geven.", "Send password by mail" : "Wachtwoord per email verzenden", - "Enforce password protection" : "Afdwingen wachtwoord beveiliging", + "Enforce password protection" : "Wachtwoord-beveiliging afdwingen", "Failed to send share by E-mail" : "delen per email is mislukt", "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s", "Failed to create the E-mail" : "Maken van de mail is mislukt", diff --git a/apps/theming/l10n/da.js b/apps/theming/l10n/da.js index 14e7bf8b0bd66..d81ce607e7b89 100644 --- a/apps/theming/l10n/da.js +++ b/apps/theming/l10n/da.js @@ -33,6 +33,7 @@ OC.L10N.register( "Login image" : "Login billede", "Upload new login background" : "Upload nyt login billede", "Remove background image" : "Fjern baggrundsbillede", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer Imagemagick PHP udvidelsen med SVG support for automatisk at genererer favikoner baseret på the uploadede logo og farver.", "reset to default" : "nulstil til standardindstillinger ", "Log in image" : "Log ind billede" }, diff --git a/apps/theming/l10n/da.json b/apps/theming/l10n/da.json index 8c2cac7b07e38..7c2653a85a252 100644 --- a/apps/theming/l10n/da.json +++ b/apps/theming/l10n/da.json @@ -31,6 +31,7 @@ "Login image" : "Login billede", "Upload new login background" : "Upload nyt login billede", "Remove background image" : "Fjern baggrundsbillede", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installer Imagemagick PHP udvidelsen med SVG support for automatisk at genererer favikoner baseret på the uploadede logo og farver.", "reset to default" : "nulstil til standardindstillinger ", "Log in image" : "Log ind billede" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/theming/l10n/nl.js b/apps/theming/l10n/nl.js index ceb5ce0a8c7ab..796c14be4fa1b 100644 --- a/apps/theming/l10n/nl.js +++ b/apps/theming/l10n/nl.js @@ -33,6 +33,7 @@ OC.L10N.register( "Login image" : "Inlog afbeelding", "Upload new login background" : "Uploaden nieuwe inlog achtergrond", "Remove background image" : "Achtergrond beeld verwijderen", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installeer de Imagemagick PHP extensie met ondersteuning voor SVG afbeeldingen om automatisch favicons te genereren op basis van het geuploade logo en kleur.", "reset to default" : "herstellen naar standaard", "Log in image" : "Inlog afbeelding" }, diff --git a/apps/theming/l10n/nl.json b/apps/theming/l10n/nl.json index ec031703cf2ff..15aade1aff6d8 100644 --- a/apps/theming/l10n/nl.json +++ b/apps/theming/l10n/nl.json @@ -31,6 +31,7 @@ "Login image" : "Inlog afbeelding", "Upload new login background" : "Uploaden nieuwe inlog achtergrond", "Remove background image" : "Achtergrond beeld verwijderen", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Installeer de Imagemagick PHP extensie met ondersteuning voor SVG afbeeldingen om automatisch favicons te genereren op basis van het geuploade logo en kleur.", "reset to default" : "herstellen naar standaard", "Log in image" : "Inlog afbeelding" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/theming/l10n/pl.js b/apps/theming/l10n/pl.js index 3743426eb3781..bf5fe1df19841 100644 --- a/apps/theming/l10n/pl.js +++ b/apps/theming/l10n/pl.js @@ -33,6 +33,7 @@ OC.L10N.register( "Login image" : "Obraz logowania", "Upload new login background" : "Wyślij nowe tło ekranu logowania", "Remove background image" : "Usuń obraz tła", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Aby wygenerować favicon oparte o wysłane logo i kolor, zainstaluj rozszerzenie PHP Imagemagick z obsługą SVG.", "reset to default" : "przywróć domyślne", "Log in image" : "Zdjęcie logowania" }, diff --git a/apps/theming/l10n/pl.json b/apps/theming/l10n/pl.json index 58d0fb4c877d5..57a38f783c7a8 100644 --- a/apps/theming/l10n/pl.json +++ b/apps/theming/l10n/pl.json @@ -31,6 +31,7 @@ "Login image" : "Obraz logowania", "Upload new login background" : "Wyślij nowe tło ekranu logowania", "Remove background image" : "Usuń obraz tła", + "Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color." : "Aby wygenerować favicon oparte o wysłane logo i kolor, zainstaluj rozszerzenie PHP Imagemagick z obsługą SVG.", "reset to default" : "przywróć domyślne", "Log in image" : "Zdjęcie logowania" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 26195c91f76df..1359799d5580e 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -99,6 +99,7 @@ OC.L10N.register( "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.", "Password" : "Wachtwoord", "For anonymous access, leave DN and Password empty." : "Voor anonieme toegang, laat de DN en het wachtwoord leeg.", + "Save Credentials" : "Opslaan inloggegevens", "One Base DN per line" : "Een Base DN per regel", "You can specify Base DN for users and groups in the Advanced tab" : "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.", "Detect Base DN" : "Detecteren basis DN", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index 53290cf89ca69..94b72498ba191 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -97,6 +97,7 @@ "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.", "Password" : "Wachtwoord", "For anonymous access, leave DN and Password empty." : "Voor anonieme toegang, laat de DN en het wachtwoord leeg.", + "Save Credentials" : "Opslaan inloggegevens", "One Base DN per line" : "Een Base DN per regel", "You can specify Base DN for users and groups in the Advanced tab" : "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.", "Detect Base DN" : "Detecteren basis DN", diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index ddecd2ec63d24..57cae87515f8f 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -99,6 +99,7 @@ OC.L10N.register( "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste", "Password" : "Hasło", "For anonymous access, leave DN and Password empty." : "Dla dostępu anonimowego pozostawić DN i hasło puste.", + "Save Credentials" : "Zapisz poświadczenia", "One Base DN per line" : "Jedna baza DN na linię", "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane", "Detect Base DN" : "Wykryj bazowy DN", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index a3bcc3fbb569c..a054864b28c54 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -97,6 +97,7 @@ "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste", "Password" : "Hasło", "For anonymous access, leave DN and Password empty." : "Dla dostępu anonimowego pozostawić DN i hasło puste.", + "Save Credentials" : "Zapisz poświadczenia", "One Base DN per line" : "Jedna baza DN na linię", "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane", "Detect Base DN" : "Wykryj bazowy DN", diff --git a/apps/workflowengine/l10n/ka_GE.js b/apps/workflowengine/l10n/ka_GE.js index ae307b316d12b..c86461c1cd255 100644 --- a/apps/workflowengine/l10n/ka_GE.js +++ b/apps/workflowengine/l10n/ka_GE.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Saved" : "შენახულია", "Saving failed:" : "შენახვა ვერ მოხერხდა:", - "File MIME type" : "ფაილის MIME ტიპი", + "File MIME type" : "ფაილის MIME სახეობა", "is" : "არის", "is not" : "არ არის", "matches" : "ემთხვევა", @@ -11,13 +11,13 @@ OC.L10N.register( "Example: {placeholder}" : "მაგალითი: {placeholder}", "File size (upload)" : "ფაილის ზომა (ატვირთვა)", "less" : "უფრო ნაკლები", - "less or equals" : "უფრო ნაკლებია ან ტოლია", - "greater or equals" : "უფრო მეტია ან ტოლია", + "less or equals" : "უფრო ნაკლები ან ტოლი", + "greater or equals" : "უფრო მეტი ან ტოლი", "greater" : "უფრო მეტია", "File system tag" : "ფაილის სისტემური ტეგი", "is tagged with" : "დატეგილია როგორც", "is not tagged with" : "არაა დატეგილი როგორც", - "Select tag…" : "აირჩიეთ ტეგი", + "Select tag…" : "აირჩიეთ ტეგი...", "Request remote address" : "დისტანციური მისამართის მოთხოვნა", "matches IPv4" : "ემთხვევა IPv4-ს", "does not match IPv4" : "არ ემთხვევა IPv4-ს", @@ -33,7 +33,7 @@ OC.L10N.register( "Predefined URLs" : "წინასწარ განსაზღვრული URL-ები", "Files WebDAV" : "ფაილები WebDAV", "Request user agent" : "მოთხოვნის მომხმარებლის აგენტი", - "Sync clients" : "Sync. კლიენტები", + "Sync clients" : "სინქ. კლიენტები", "Android client" : "Android კლიენტი", "iOS client" : "iOS კლიენტი", "Desktop client" : "დესკტოპ კლიენტი", @@ -68,6 +68,6 @@ OC.L10N.register( "Saving…" : "მიმდინარეობს დამახსოვრება...", "Loading…" : "იტვირთება...", "Successfully saved" : "წარმატებით დამახსოვრდა", - "File mime type" : "ფაილის mime ტიპი" + "File mime type" : "ფაილის mime სახეობა" }, "nplurals=1; plural=0;"); diff --git a/apps/workflowengine/l10n/ka_GE.json b/apps/workflowengine/l10n/ka_GE.json index 36c9f75169d15..e4f42973cb3d9 100644 --- a/apps/workflowengine/l10n/ka_GE.json +++ b/apps/workflowengine/l10n/ka_GE.json @@ -1,7 +1,7 @@ { "translations": { "Saved" : "შენახულია", "Saving failed:" : "შენახვა ვერ მოხერხდა:", - "File MIME type" : "ფაილის MIME ტიპი", + "File MIME type" : "ფაილის MIME სახეობა", "is" : "არის", "is not" : "არ არის", "matches" : "ემთხვევა", @@ -9,13 +9,13 @@ "Example: {placeholder}" : "მაგალითი: {placeholder}", "File size (upload)" : "ფაილის ზომა (ატვირთვა)", "less" : "უფრო ნაკლები", - "less or equals" : "უფრო ნაკლებია ან ტოლია", - "greater or equals" : "უფრო მეტია ან ტოლია", + "less or equals" : "უფრო ნაკლები ან ტოლი", + "greater or equals" : "უფრო მეტი ან ტოლი", "greater" : "უფრო მეტია", "File system tag" : "ფაილის სისტემური ტეგი", "is tagged with" : "დატეგილია როგორც", "is not tagged with" : "არაა დატეგილი როგორც", - "Select tag…" : "აირჩიეთ ტეგი", + "Select tag…" : "აირჩიეთ ტეგი...", "Request remote address" : "დისტანციური მისამართის მოთხოვნა", "matches IPv4" : "ემთხვევა IPv4-ს", "does not match IPv4" : "არ ემთხვევა IPv4-ს", @@ -31,7 +31,7 @@ "Predefined URLs" : "წინასწარ განსაზღვრული URL-ები", "Files WebDAV" : "ფაილები WebDAV", "Request user agent" : "მოთხოვნის მომხმარებლის აგენტი", - "Sync clients" : "Sync. კლიენტები", + "Sync clients" : "სინქ. კლიენტები", "Android client" : "Android კლიენტი", "iOS client" : "iOS კლიენტი", "Desktop client" : "დესკტოპ კლიენტი", @@ -66,6 +66,6 @@ "Saving…" : "მიმდინარეობს დამახსოვრება...", "Loading…" : "იტვირთება...", "Successfully saved" : "წარმატებით დამახსოვრდა", - "File mime type" : "ფაილის mime ტიპი" + "File mime type" : "ფაილის mime სახეობა" },"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file diff --git a/build/integration/features/sharing-v1-part3.feature b/build/integration/features/sharing-v1-part3.feature index b4b1ae9bf94d3..44a41341a028c 100644 --- a/build/integration/features/sharing-v1-part3.feature +++ b/build/integration/features/sharing-v1-part3.feature @@ -167,7 +167,7 @@ Feature: sharing And folder "/merge-test-outside-perms" of user "user0" is shared with user "user1" with permissions 31 Then as "user1" gets properties of folder "/merge-test-outside-perms" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRGDNVCK" And as "user1" the folder "/merge-test-outside-perms (2)" does not exist Scenario: Merging shares for recipient when shared from outside with two groups @@ -197,7 +197,7 @@ Feature: sharing And folder "/merge-test-outside-twogroups-perms" of user "user0" is shared with group "group2" with permissions 31 Then as "user1" gets properties of folder "/merge-test-outside-twogroups-perms" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRGDNVCK" And as "user1" the folder "/merge-test-outside-twogroups-perms (2)" does not exist Scenario: Merging shares for recipient when shared from outside with two groups and member @@ -214,7 +214,7 @@ Feature: sharing And folder "/merge-test-outside-twogroups-member-perms" of user "user0" is shared with user "user1" with permissions 1 Then as "user1" gets properties of folder "/merge-test-outside-twogroups-member-perms" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRGDNVCK" And as "user1" the folder "/merge-test-outside-twogroups-member-perms (2)" does not exist Scenario: Merging shares for recipient when shared from inside with group @@ -253,7 +253,7 @@ Feature: sharing And folder "/merge-test-inside-twogroups-perms" of user "user0" is shared with group "group2" Then as "user0" gets properties of folder "/merge-test-inside-twogroups-perms" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RGDNVCK" And as "user0" the folder "/merge-test-inside-twogroups-perms (2)" does not exist And as "user0" the folder "/merge-test-inside-twogroups-perms (3)" does not exist @@ -270,7 +270,7 @@ Feature: sharing And folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1" Then as "user1" gets properties of folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRGDNVCK" And as "user1" the folder "/merge-test-outside-groups-renamebeforesecondshare" does not exist Scenario: Merging shares for recipient when shared from outside with user then group and recipient renames in between @@ -287,7 +287,7 @@ Feature: sharing And folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1" Then as "user1" gets properties of folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" with |{http://owncloud.org/ns}permissions| - And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK" + And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRGDNVCK" And as "user1" the folder "/merge-test-outside-groups-renamebeforesecondshare" does not exist Scenario: Empting trashbin diff --git a/core/css/apps.scss b/core/css/apps.scss index 8f49df7fdaf8c..54f0c47688580 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -906,3 +906,196 @@ kbd { } } + + +#app-content-wrapper { + display: flex; +} +.app-content-list { + width: 300px; + min-height: 100%; + overflow-x: hidden; + overflow-y: auto; + border-right: 1px solid nc-darken($color-main-background, 8%); + display: flex; + flex-direction: column; + transition: transform 250ms ease-in-out; + + /* Icon fixes */ + [class^='icon-'], + [class*=' icon-'] { + order: 4; + width: 24px; + height: 24px; + margin: -10px; + padding: 22px; + opacity: .3; + &:hover, &:focus { + opacity: .7; + } + &[class^='icon-star'], + &[class*=' icon-star'] { + opacity: .7; + &:hover, &:focus { + opacity: 1 ; + } + + } + &.icon-starred { + opacity: 1 ; + } + } + + /* Default item */ + .app-content-list-item { + position: relative; + height: 68px; + border-top: 1px solid nc-darken($color-main-background, 8%); + cursor: pointer; + padding: 10px 7px; + display: flex; + flex-wrap: wrap; + align-items: center; + + &:hover, &:focus, + &.active { + background-color: nc-darken($color-main-background, 6%); + } + + .app-content-list-item-checkbox.checkbox + label, + .app-content-list-item-star { + position: absolute; + height: 40px; + width: 40px; + display: flex; + z-index: 50; + + .app-content-list-item-icon { + opacity: .7; + } + } + + .app-content-list-item-checkbox.checkbox + label { + top: 14px; + left: 7px; + &::before { + margin: 0; + } + /* Hide the star, priority to the checkbox */ + ~ .app-content-list-item-star { + display: none; + } + } + + .app-content-list-item-star { + top: 10px; + left: 32px; + background-size: 16px; + height: 20px; + width: 20px; + margin: 0; + padding: 0; + } + + .app-content-list-item-icon { + position: absolute; + display: inline-block; + height: 40px; + width: 40px; + line-height: 40px; + border-radius: 50%; + vertical-align: middle; + margin-right: 10px; + color: #fff; + text-align: center; + font-size: 1.5em; + text-transform: capitalize; + object-fit: cover; + user-select: none; + } + + .app-content-list-item-line-one, + .app-content-list-item-line-two { + display: block; + padding-left: 50px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + order: 1; + flex: 1 1 0; + padding-right: 10px; + } + + .app-content-list-item-line-two { + opacity: .5; + order: 3; + flex: 1 0 calc(100% - 24px); + } + + .app-content-list-item-details { + order: 2; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 100px; + opacity: .5; + font-size: 80%; + user-select: none; + } + } +} +/* App content */ +.app-content-detail { + width: 70%; + + #app-navigation-toggle-back { + display: none; + } +} + +/* Mobile width < 768px */ +@media only screen and (max-width: 768px) { + + /* full width for message list on mobile */ + .app-content-list { + width: 100%; + background: $color-main-background; + position: relative; + z-index: 100; + } + + /* overlay message detail on top of message list */ + .app-content-detail { + background: $color-main-background; + width: 100%; + left: 0; + height: 100%; + top: 0; + box-shadow: 0 0 100px rgba(100, 100, 100, .9); + position: absolute; + } + + /* Show app details page */ + #app-content.showdetails { + #app-navigation-toggle { + transform: translateX(-44px); + } + #app-navigation-toggle-back { + position: fixed; + display: inline-block !important; + top: 45px; + left: 0; + width: 44px; + height: 44px; + z-index: 149; + background-color: rgba(255, 255, 255, .7); + cursor: pointer; + opacity: .6; + transform: rotate(90deg); + } + .app-content-list { + transform: translateX(-100%); + } + } + + /* end of media query */ +} diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg index 575d5bb3e060a..16ebc047f8c31 100644 --- a/core/img/actions/toggle-filelist.svg +++ b/core/img/actions/toggle-filelist.svg @@ -1 +1 @@ - + diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg index 51e1c733f00df..91097e5cd7169 100644 --- a/core/img/actions/user.svg +++ b/core/img/actions/user.svg @@ -1 +1 @@ - + diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg index 3bd8759fe7865..36fecc154305f 100644 --- a/core/img/breadcrumb.svg +++ b/core/img/breadcrumb.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/categories/social.svg b/core/img/categories/social.svg index 5bc91dc59ab29..97361beb9d033 100644 --- a/core/img/categories/social.svg +++ b/core/img/categories/social.svg @@ -1 +1 @@ - + diff --git a/core/img/facebook.svg b/core/img/facebook.svg index 2d0c6477493db..01e183a1831fe 100644 --- a/core/img/facebook.svg +++ b/core/img/facebook.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/favicon-mask.svg b/core/img/favicon-mask.svg index 380c89056b8f0..decce4b4c7676 100644 --- a/core/img/favicon-mask.svg +++ b/core/img/favicon-mask.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/favicon.png b/core/img/favicon.png index 3988dce0b413c..71520e5bbf439 100644 Binary files a/core/img/favicon.png and b/core/img/favicon.png differ diff --git a/core/img/favicon.svg b/core/img/favicon.svg index a7e98470c3736..7008be01a195f 100644 --- a/core/img/favicon.svg +++ b/core/img/favicon.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/filetypes/text-vcard.svg b/core/img/filetypes/text-vcard.svg index 42dec95aa2a63..86c3d4a413201 100644 --- a/core/img/filetypes/text-vcard.svg +++ b/core/img/filetypes/text-vcard.svg @@ -1 +1 @@ - + diff --git a/core/img/googleplus.svg b/core/img/googleplus.svg index 7e001f467706d..a499c7155e000 100644 --- a/core/img/googleplus.svg +++ b/core/img/googleplus.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/logo.svg b/core/img/logo.svg index 5fdf57a016d50..1d52d93b0f26b 100644 --- a/core/img/logo.svg +++ b/core/img/logo.svg @@ -1 +1 @@ - + diff --git a/core/img/mail.svg b/core/img/mail.svg index 37d97065d0089..d757773c74fbe 100644 --- a/core/img/mail.svg +++ b/core/img/mail.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/rss.svg b/core/img/rss.svg index 6962c85b1d0b5..98f031f39784b 100644 --- a/core/img/rss.svg +++ b/core/img/rss.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/img/twitter.svg b/core/img/twitter.svg index da1de00be5823..2bd85154e63e5 100644 --- a/core/img/twitter.svg +++ b/core/img/twitter.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/js/files/client.js b/core/js/files/client.js index e810381342a6e..fa3d795d4123a 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -320,7 +320,7 @@ } } - data.permissions = OC.PERMISSION_READ; + data.permissions = OC.PERMISSION_NONE; var permissionProp = props[Client.PROPERTY_PERMISSIONS]; if (!_.isUndefined(permissionProp)) { var permString = permissionProp || ''; @@ -333,6 +333,9 @@ case 'K': data.permissions |= OC.PERMISSION_CREATE; break; + case 'G': + data.permissions |= OC.PERMISSION_READ; + break; case 'W': case 'N': case 'V': diff --git a/core/js/js.js b/core/js/js.js index 730586713a0f5..9af80676d5e78 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -60,6 +60,7 @@ function fileDownloadPath(dir, file) { /** @namespace */ var OCP = {}, OC = { + PERMISSION_NONE:0, PERMISSION_CREATE:4, PERMISSION_READ:1, PERMISSION_UPDATE:2, diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index d3802824fe05a..b4828e3b0dce3 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -376,7 +376,7 @@ var sharee = this.getShareeObject(shareWithIndex); $.extend(sharee, this.getShareProperties()); var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']'); - $li.find('.popovermenu').replaceWith(this.popoverMenuTemplate(sharee)); + $li.find('.sharingOptionsGroup .popovermenu').replaceWith(this.popoverMenuTemplate(sharee)); var checkBoxId = 'canEdit-' + this.cid + '-' + sharee.shareWith; checkBoxId = '#' + checkBoxId.replace( /(:|\.|\[|\]|,|=|@)/g, "\\$1"); @@ -403,12 +403,12 @@ } } }); - if (this._menuOpen != false) { + if (this._menuOpen !== false) { // Open menu again if it was opened before var shareId = parseInt(this._menuOpen, 10); if(!_.isNaN(shareId)) { var liSelector = 'li[data-share-id=' + shareId + ']'; - OC.showMenu(null, this.$(liSelector + '.sharingOptionsGroup .popovermenu')); + OC.showMenu(null, this.$(liSelector + ' .sharingOptionsGroup .popovermenu')); } } diff --git a/core/js/tests/specs/files/clientSpec.js b/core/js/tests/specs/files/clientSpec.js index d66c209bca5c1..6593372144a5b 100644 --- a/core/js/tests/specs/files/clientSpec.js +++ b/core/js/tests/specs/files/clientSpec.js @@ -164,7 +164,7 @@ describe('OC.Files.Client tests', function() { 'd:resourcetype': '', 'oc:id': '00000011oc2d13a6a068', 'oc:fileid': '11', - 'oc:permissions': 'RDNVCK', + 'oc:permissions': 'GRDNVCK', 'oc:size': '120' }, [ @@ -196,7 +196,7 @@ describe('OC.Files.Client tests', function() { 'd:resourcetype': '', 'oc:id': '00000015oc2d13a6a068', 'oc:fileid': '15', - 'oc:permissions': 'RDNVCK', + 'oc:permissions': 'GRDNVCK', 'oc:size': '100' }, [ @@ -257,7 +257,7 @@ describe('OC.Files.Client tests', function() { expect(info.id).toEqual(51); expect(info.path).toEqual('/path/to space/文件夹'); expect(info.name).toEqual('One.txt'); - expect(info.permissions).toEqual(27); + expect(info.permissions).toEqual(26); expect(info.size).toEqual(250); expect(info.mtime).toEqual(1436535485000); expect(info.mimetype).toEqual('text/plain'); @@ -482,7 +482,7 @@ describe('OC.Files.Client tests', function() { 'd:resourcetype': '', 'oc:id': '00000011oc2d13a6a068', 'oc:fileid': '11', - 'oc:permissions': 'RDNVCK', + 'oc:permissions': 'GRDNVCK', 'oc:size': '120' }, [ @@ -549,7 +549,7 @@ describe('OC.Files.Client tests', function() { 'd:resourcetype': '', 'oc:id': '00000011oc2d13a6a068', 'oc:fileid': '11', - 'oc:permissions': 'RDNVCK', + 'oc:permissions': 'GRDNVCK', 'oc:size': '120' }, [ @@ -640,14 +640,14 @@ describe('OC.Files.Client tests', function() { function testPermission(permission, isFile, expectedPermissions) { var promise = getFileInfoWithPermission(permission, isFile); - promise.then(function(result) { + promise.then(function(status, result) { expect(result.permissions).toEqual(expectedPermissions); }); } function testMountType(permission, isFile, expectedMountType) { var promise = getFileInfoWithPermission(permission, isFile); - promise.then(function(result) { + promise.then(function(status, result) { expect(result.mountType).toEqual(expectedMountType); }); } @@ -655,43 +655,29 @@ describe('OC.Files.Client tests', function() { it('properly parses file permissions', function() { // permission, isFile, expectedPermissions var testCases = [ - ['', true, OC.PERMISSION_READ], - ['C', true, OC.PERMISSION_READ | OC.PERMISSION_CREATE], - ['K', true, OC.PERMISSION_READ | OC.PERMISSION_CREATE], - ['W', true, OC.PERMISSION_READ | OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE], - ['D', true, OC.PERMISSION_READ | OC.PERMISSION_DELETE], - ['R', true, OC.PERMISSION_READ | OC.PERMISSION_SHARE], - ['CKWDR', true, OC.PERMISSION_ALL] + ['', true, OC.PERMISSION_NONE], + ['C', true, OC.PERMISSION_CREATE], + ['K', true, OC.PERMISSION_CREATE], + ['G', true, OC.PERMISSION_READ], + ['W', true, OC.PERMISSION_UPDATE], + ['D', true, OC.PERMISSION_DELETE], + ['R', true, OC.PERMISSION_SHARE], + ['CKGWDR', true, OC.PERMISSION_ALL] ]; _.each(testCases, function(testCase) { - return testPermission.apply(testCase); - }); - }); - it('properly parses folder permissions', function() { - var testCases = [ - ['', false, OC.PERMISSION_READ], - ['C', false, OC.PERMISSION_READ | OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE], - ['K', false, OC.PERMISSION_READ | OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE], - ['W', false, OC.PERMISSION_READ | OC.PERMISSION_UPDATE], - ['D', false, OC.PERMISSION_READ | OC.PERMISSION_DELETE], - ['R', false, OC.PERMISSION_READ | OC.PERMISSION_SHARE], - ['CKWDR', false, OC.PERMISSION_ALL] - ]; - - _.each(testCases, function(testCase) { - return testPermission.apply(testCase); + return testPermission.apply(this, testCase); }); }); it('properly parses mount types', function() { var testCases = [ - ['CKWDR', false, null], + ['CKGWDR', false, null], ['M', false, 'external'], ['S', false, 'shared'], ['SM', false, 'shared'] ]; _.each(testCases, function(testCase) { - return testMountType.apply(testCase); + return testMountType.apply(this, testCase); }); }); }); diff --git a/core/l10n/da.js b/core/l10n/da.js index a6697b3dad7eb..1cbedff21cafd 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -81,6 +81,7 @@ OC.L10N.register( "I know what I'm doing" : "Jeg ved, hvad jeg har gang i", "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.", "Reset password" : "Nulstil kodeord", + "Sending email …" : "Sender email...", "No" : "Nej", "Yes" : "Ja", "No files in here" : "Ingen filer", @@ -264,6 +265,8 @@ OC.L10N.register( "Wrong password." : "Forkert kodeord.", "Log in" : "Log ind", "Stay logged in" : "Forbliv logget ind", + "Forgot password?" : "Glemt adgangskode?", + "Back to log in" : "Tilbage til log in", "Alternative Logins" : "Alternative logins", "Account access" : "Konto adgang", "You are about to grant %s access to your %s account." : "Du er ved at tildele %s adgang til din %s konto.", diff --git a/core/l10n/da.json b/core/l10n/da.json index dcf957e6961bd..4893f67151c26 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -79,6 +79,7 @@ "I know what I'm doing" : "Jeg ved, hvad jeg har gang i", "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.", "Reset password" : "Nulstil kodeord", + "Sending email …" : "Sender email...", "No" : "Nej", "Yes" : "Ja", "No files in here" : "Ingen filer", @@ -262,6 +263,8 @@ "Wrong password." : "Forkert kodeord.", "Log in" : "Log ind", "Stay logged in" : "Forbliv logget ind", + "Forgot password?" : "Glemt adgangskode?", + "Back to log in" : "Tilbage til log in", "Alternative Logins" : "Alternative logins", "Account access" : "Konto adgang", "You are about to grant %s access to your %s account." : "Du er ved at tildele %s adgang til din %s konto.", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 2bf5ed9a93a02..e857912fda9a4 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -124,6 +124,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est recommandé d'ajuster ce paramètre.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\". Quelques fonctionnalités peuvent ne pas marcher correctement et il est recommandé d'ajuster ce paramètre.", "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à au moins \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans nos conseils de sécurisation.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans nos conseils de sécurisation.", "Shared" : "Partagé", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 9677a9600b632..6eba0d8f5e481 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -122,6 +122,7 @@ "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est recommandé d'ajuster ce paramètre.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\". Quelques fonctionnalités peuvent ne pas marcher correctement et il est recommandé d'ajuster ce paramètre.", "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à au moins \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans nos conseils de sécurisation.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans nos conseils de sécurisation.", "Shared" : "Partagé", diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js index 0e9fa00158bc4..fea8353eca577 100644 --- a/core/l10n/ka_GE.js +++ b/core/l10n/ka_GE.js @@ -81,6 +81,7 @@ OC.L10N.register( "I know what I'm doing" : "ვიცი რასაც ვაკეთებ", "Password can not be changed. Please contact your administrator." : "პაროლი ვერ იცვლება. დაუკავშირდით თქვენს ადმინისტრატორს.", "Reset password" : "პაროლის შეცვლა", + "Sending email …" : "წერილი იგზავნება ...", "No" : "არა", "Yes" : "კი", "No files in here" : "აქ ფაილები არაა", @@ -123,6 +124,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "შეცდომა სერვერის მოწყობის შემოწმებისას", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "თქვენი data დირექტორია და ფაილები ალბათ წვდომადია ინტერნეტიდან. .htaccess ფაილი არ მუშაობს. მკაცრად რეკომენდირებულია ისე გაუწიოთ თქვენს ვებ-სერვერს კონფიგურაცია, რომ data დირექტორია აღარ იყოს წვდომადი, ან გაიტანოთ ის ვებ-სერვერის root დირექტორიიდან.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP დასათაურება \"{header}\" არაა კონფიგურირებული რომ უტოლდებოდეს \"{expected\"}-ს. ეს პოტენციური უსაფრთხოების და კონფიდენციალურობის რისკია, გირჩევთ ამ პარამეტრის გამოსწორებას.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "HTTP დასათაურება \"{header}\" არაა კონფიგურირებული რომ უტოლდებოდეს \"{expected\"}-ს. ზოგიერთმა ფუნქციამ შეიძლება არ იმუშაოს სწორად და გიწევთ რეკომენდაციას გაძლევთ ამ პარამეტრის რეგულაციისთვის.", "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "\"Strict-Transport-Security\" HTTP დასათაურება არაა კონფიგურირებული \"{seconds}\" წამამდე მაინც. გაუმჯობესებული თავდაცვის მიზნებისთვის რეკომენდაციას გიწევთ ჩართოთ HSTS როგორც აღწერილია ჩვენს თავდაცვის რეკომენდაციებში.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "ამ საიტს უკავშირდებით HTTP-თი. მტკიცედ გირჩევთ გაუწიოთ სერვერს კონფიგურაცია, ისე რომ გამოიყენოთ HTTPS, როგორც აღწერილია ჩვენს თავდაცვის რეკომენდაციებში.", "Shared" : "გაზიარებული", @@ -274,6 +276,8 @@ OC.L10N.register( "Wrong password." : "არასწორი პაროლი.", "Log in" : "შესვლა", "Stay logged in" : "ავტორიზებულად დარჩენა", + "Forgot password?" : "დაგავიწყდათ პაროლი?", + "Back to log in" : "უკან ავტორიზაციისკენ", "Alternative Logins" : "ალტერნატიული ლოგინები", "Account access" : "წვდომა ანგარიშზე", "You are about to grant %s access to your %s account." : "თქვენ აპირებთ წვდომის უფლებები მიანიჭოთ %s-ს თქვენს %s ანგარიშზე.", diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json index 3b549dc8398ed..be6f87d75b5d1 100644 --- a/core/l10n/ka_GE.json +++ b/core/l10n/ka_GE.json @@ -79,6 +79,7 @@ "I know what I'm doing" : "ვიცი რასაც ვაკეთებ", "Password can not be changed. Please contact your administrator." : "პაროლი ვერ იცვლება. დაუკავშირდით თქვენს ადმინისტრატორს.", "Reset password" : "პაროლის შეცვლა", + "Sending email …" : "წერილი იგზავნება ...", "No" : "არა", "Yes" : "კი", "No files in here" : "აქ ფაილები არაა", @@ -121,6 +122,7 @@ "Error occurred while checking server setup" : "შეცდომა სერვერის მოწყობის შემოწმებისას", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "თქვენი data დირექტორია და ფაილები ალბათ წვდომადია ინტერნეტიდან. .htaccess ფაილი არ მუშაობს. მკაცრად რეკომენდირებულია ისე გაუწიოთ თქვენს ვებ-სერვერს კონფიგურაცია, რომ data დირექტორია აღარ იყოს წვდომადი, ან გაიტანოთ ის ვებ-სერვერის root დირექტორიიდან.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP დასათაურება \"{header}\" არაა კონფიგურირებული რომ უტოლდებოდეს \"{expected\"}-ს. ეს პოტენციური უსაფრთხოების და კონფიდენციალურობის რისკია, გირჩევთ ამ პარამეტრის გამოსწორებას.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "HTTP დასათაურება \"{header}\" არაა კონფიგურირებული რომ უტოლდებოდეს \"{expected\"}-ს. ზოგიერთმა ფუნქციამ შეიძლება არ იმუშაოს სწორად და გიწევთ რეკომენდაციას გაძლევთ ამ პარამეტრის რეგულაციისთვის.", "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "\"Strict-Transport-Security\" HTTP დასათაურება არაა კონფიგურირებული \"{seconds}\" წამამდე მაინც. გაუმჯობესებული თავდაცვის მიზნებისთვის რეკომენდაციას გიწევთ ჩართოთ HSTS როგორც აღწერილია ჩვენს თავდაცვის რეკომენდაციებში.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "ამ საიტს უკავშირდებით HTTP-თი. მტკიცედ გირჩევთ გაუწიოთ სერვერს კონფიგურაცია, ისე რომ გამოიყენოთ HTTPS, როგორც აღწერილია ჩვენს თავდაცვის რეკომენდაციებში.", "Shared" : "გაზიარებული", @@ -272,6 +274,8 @@ "Wrong password." : "არასწორი პაროლი.", "Log in" : "შესვლა", "Stay logged in" : "ავტორიზებულად დარჩენა", + "Forgot password?" : "დაგავიწყდათ პაროლი?", + "Back to log in" : "უკან ავტორიზაციისკენ", "Alternative Logins" : "ალტერნატიული ლოგინები", "Account access" : "წვდომა ანგარიშზე", "You are about to grant %s access to your %s account." : "თქვენ აპირებთ წვდომის უფლებები მიანიჭოთ %s-ს თქვენს %s ანგარიშზე.", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 897336ea25803..0b45131db4f35 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -71,7 +71,7 @@ OC.L10N.register( "This action requires you to confirm your password" : "Deze actie vereist dat je je wachtwoord bevestigt", "Authentication required" : "Authenticatie vereist", "Password" : "Wachtwoord", - "Cancel" : "Annuleer", + "Cancel" : "Annuleren", "Confirm" : "Bevestig", "Failed to authenticate, try again" : "Authenticatie mislukt, probeer opnieuw", "seconds ago" : "seconden geleden", @@ -81,6 +81,7 @@ OC.L10N.register( "I know what I'm doing" : "Ik weet wat ik doe", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met je beheerder.", "Reset password" : "Reset wachtwoord", + "Sending email …" : "Versturen e-mail...", "No" : "Nee", "Yes" : "Ja", "No files in here" : "Hier geen bestanden", @@ -110,11 +111,21 @@ OC.L10N.register( "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our documentation." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze documentatie.", "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je de memcache configureren als die beschikbaar is. Meer informatie vind je in onze documentatie.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "/dev/urandom is niet leesbaar voor PHP, hetgeen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze documentatie.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Je draait momenteel PHP {version}. We adviseren je om, zo gauw je distributie dat biedt, je PHP versie bij te werken voor betere prestaties en beveiliging geleverd door de PHP Group.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze documentatie.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de memcached wiki over beide modules.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our documentation. (List of invalid files… / Rescan…)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze documentatie. (Lijst met ongeldige bestanden… / Opnieuw…)", + "The PHP OPcache is not properly configured. For better performance we recommend to use following settings in the php.ini:" : "De PHP OPcache is niet correct geconfigureed. Voor betere prestaties adviseren we de volgende php.ini instellingen te gebruiken:", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren met klem om deze functie in te schakelen.", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze security tips.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Je bent met deze site verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze security tips.", "Shared" : "Gedeeld", "Shared with" : "Gedeeld met", @@ -229,6 +240,7 @@ OC.L10N.register( "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", + "For information how to properly configure your server, please see the documentation." : "Bekijk de documentatie voor Informatie over het correct configureren van je server.", "Create an admin account" : "Maak een beheerdersaccount aan", "Username" : "Gebruikersnaam", "Storage & database" : "Opslag & database", @@ -264,6 +276,8 @@ OC.L10N.register( "Wrong password." : "Onjuist wachtwoord.", "Log in" : "Meld u aan", "Stay logged in" : "Ingelogd blijven", + "Forgot password?" : "Wachtwoord vergeten?", + "Back to log in" : "Terug naar inloggen", "Alternative Logins" : "Alternatieve inlogs", "Account access" : "Account toegang", "You are about to grant %s access to your %s account." : "Je staat op het punt om %s toegang te verlenen to je %s account.", @@ -293,6 +307,7 @@ OC.L10N.register( "Detailed logs" : "Gedetailleerde logs", "Update needed" : "Update vereist", "Please use the command line updater because you have a big instance with more than 50 users." : "Gebruik alsjeblieft de command line updater omdat je een installatie hebt met meer dan 50 gebruikers.", + "For help, see the documentation." : "Bekijk de documentatie voor hulp.", "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "De update via de web UI heeft risico's. Het verzoek leidt mogelijk tot een timeout en kan tot verlies van gegevens leiden. Ik heb een backup gemaakt en weet hoe deze te herstellen in het geval van een update mislukking.", "Upgrade via web on my own risk" : "Web opwaarding is op eigen risico", "This %s instance is currently in maintenance mode, which may take a while." : "Deze %s staat momenteel in de onderhoudsstand, dat kan enige tijd duren.", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 63de419ca11da..f8fb12efbd91f 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -69,7 +69,7 @@ "This action requires you to confirm your password" : "Deze actie vereist dat je je wachtwoord bevestigt", "Authentication required" : "Authenticatie vereist", "Password" : "Wachtwoord", - "Cancel" : "Annuleer", + "Cancel" : "Annuleren", "Confirm" : "Bevestig", "Failed to authenticate, try again" : "Authenticatie mislukt, probeer opnieuw", "seconds ago" : "seconden geleden", @@ -79,6 +79,7 @@ "I know what I'm doing" : "Ik weet wat ik doe", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met je beheerder.", "Reset password" : "Reset wachtwoord", + "Sending email …" : "Versturen e-mail...", "No" : "Nee", "Yes" : "Ja", "No files in here" : "Hier geen bestanden", @@ -108,11 +109,21 @@ "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our documentation." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze documentatie.", "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je de memcache configureren als die beschikbaar is. Meer informatie vind je in onze documentatie.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "/dev/urandom is niet leesbaar voor PHP, hetgeen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze documentatie.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Je draait momenteel PHP {version}. We adviseren je om, zo gauw je distributie dat biedt, je PHP versie bij te werken voor betere prestaties en beveiliging geleverd door de PHP Group.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze documentatie.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de memcached wiki over beide modules.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our documentation. (List of invalid files… / Rescan…)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze documentatie. (Lijst met ongeldige bestanden… / Opnieuw…)", + "The PHP OPcache is not properly configured. For better performance we recommend to use following settings in the php.ini:" : "De PHP OPcache is niet correct geconfigureed. Voor betere prestaties adviseren we de volgende php.ini instellingen te gebruiken:", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren met klem om deze functie in te schakelen.", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze security tips.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Je bent met deze site verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze security tips.", "Shared" : "Gedeeld", "Shared with" : "Gedeeld met", @@ -227,6 +238,7 @@ "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", + "For information how to properly configure your server, please see the documentation." : "Bekijk de documentatie voor Informatie over het correct configureren van je server.", "Create an admin account" : "Maak een beheerdersaccount aan", "Username" : "Gebruikersnaam", "Storage & database" : "Opslag & database", @@ -262,6 +274,8 @@ "Wrong password." : "Onjuist wachtwoord.", "Log in" : "Meld u aan", "Stay logged in" : "Ingelogd blijven", + "Forgot password?" : "Wachtwoord vergeten?", + "Back to log in" : "Terug naar inloggen", "Alternative Logins" : "Alternatieve inlogs", "Account access" : "Account toegang", "You are about to grant %s access to your %s account." : "Je staat op het punt om %s toegang te verlenen to je %s account.", @@ -291,6 +305,7 @@ "Detailed logs" : "Gedetailleerde logs", "Update needed" : "Update vereist", "Please use the command line updater because you have a big instance with more than 50 users." : "Gebruik alsjeblieft de command line updater omdat je een installatie hebt met meer dan 50 gebruikers.", + "For help, see the documentation." : "Bekijk de documentatie voor hulp.", "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "De update via de web UI heeft risico's. Het verzoek leidt mogelijk tot een timeout en kan tot verlies van gegevens leiden. Ik heb een backup gemaakt en weet hoe deze te herstellen in het geval van een update mislukking.", "Upgrade via web on my own risk" : "Web opwaarding is op eigen risico", "This %s instance is currently in maintenance mode, which may take a while." : "Deze %s staat momenteel in de onderhoudsstand, dat kan enige tijd duren.", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index b0f5b58d9febd..42135294104bd 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -81,6 +81,7 @@ OC.L10N.register( "I know what I'm doing" : "Wiem co robię", "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.", "Reset password" : "Zresetuj hasło", + "Sending email …" : "Wysyłam email ...", "No" : "Nie", "Yes" : "Tak", "No files in here" : "Nie ma tu żadnych plików", @@ -110,13 +111,25 @@ OC.L10N.register( "Good password" : "Dobre hasło", "Strong password" : "Silne hasło", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Serwer WWW nie jest jeszcze na tyle poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our documentation." : "Twój serwer WWW nie jest poprawnie skonfigurowany aby poprawnie wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej dokumentacji.", "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serwer nie ma aktywnego połączenia z Internetem. Wiele połączeń nie może być osiągniętych. Oznacza to, że część funkcji takich jak zewnętrzny magazyn, powiadomienia o aktualizacjach lub instalacja aplikacji firm trzecich nie będzie działała. Dostęp zdalny do plików oraz wysyłanie powiadomień mailowych również może nie działać. Sugerujemy udostępnienie połączenia z Internetem temu serwerowi jeśli chcesz mieć pełną funkcjonalność.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Nie skonfigurowano pamięci cache. Jeśli to możliwe skonfiguruj pamięć cache, aby zwiększyć wydajność. Więcej informacji można znaleźć w naszej dokumentacji.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "PHP nie może czytać z /dev/urandom co jest wymagane ze względów bezpieczeństwa. Więcej informacji można znaleźć w naszej dokumentacji.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Posiadasz aktualnie PHP w wersji {version}. Aby skorzystać z aktualizacji dotyczących wydajności i bezpieczeństwa otrzymanych z PHP Group zachęcamy do podniesienia wersji PHP, kiedy tylko Twoja dystrybucja będzie je wspierała.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "Konfiguracja nagłówków reverse proxy jest niepoprawna albo łączysz się do Nextclouda przez zaufane proxy. Jeśli nie łączysz się z zaufanego proxy, to jest to problem bezpieczeństwa i atakujący może podszyć się pod adres IP jako widoczny dla Nextclouda. Więcej informacji można znaleźć w naszej dokumentacji.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Jako cache jest skonfigurowane \"memcached\", ale błędny moduł PHP \"memcache\" jest zainstalowany. \\OC\\Memcache\\Memcached wspiera tylko \"memcached\", a nie \"memcache\". Sprawdź memcached wiki o obu tych modułach.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our documentation. (List of invalid files… / Rescan…)" : "Niektóre pliki nie przeszły sprawdzania spójności. Dalsze informacje jak to naprawić mogą być znalezione w naszej dokumentacji. (Lista niepoprawnych plików... / Skanowanie ponowne…)", + "The PHP OPcache is not properly configured. For better performance we recommend to use following settings in the php.ini:" : "PHP OPcache nie jest prawidłowo skonfigurowany Dla lepszej wydajności zalecamy użycie następujących ustawień w php.ini: ", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "Funkcja PHP \"set_time_limit\" nie jest dostępna. Może to powodować zatrzymanie skryptów w podczas działania i w efekcie przerwanie instalacji. Silnie rekomendujemy włączenie tej funkcji.", "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Twój katalog z danymi i twoje pliki prawdopodobnie są dostępne przez Internet. Plik .htaccess nie działa. Usilnie zalecamy, żebyś tak skonfigurował swój serwer, żeby katalog z danymi nie był dalej dostępny lub przenieś swój katalog z danymi poza katalog root serwera webowego.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "Nagłówek HTTP \"Strict-Transport-Security\" nie jest ustawiony na przynajmniej \"{seconds}\" sekund. Dla zwiększenia bezpieczeństwa zalecamy ustawienie HSTS tak jak opisaliśmy to w naszych wskazówkach dotyczących bezpieczeństwa.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych wskazówkach bezpieczeństwa.", "Shared" : "Udostępniono", + "Shared with" : "Współdzielone z", + "Shared by" : "Współdzielone przez", "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia", "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia", "Set expiration date" : "Ustaw datę wygaśnięcia", @@ -227,6 +240,7 @@ OC.L10N.register( "Trace" : "Ślad", "Security warning" : "Ostrzeżenie bezpieczeństwa", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", + "For information how to properly configure your server, please see the documentation." : "Aby uzyskać informację jak poprawnie skonfigurować Twój serwer, zajrzyj do dokumentacji.", "Create an admin account" : "Utwórz konto administratora", "Username" : "Nazwa użytkownika", "Storage & database" : "Magazyn i baza danych", @@ -262,9 +276,12 @@ OC.L10N.register( "Wrong password." : "Złe hasło", "Log in" : "Zaloguj", "Stay logged in" : "Pozostań zalogowany", + "Forgot password?" : "Zapomniano hasła?", + "Back to log in" : "Powrót do logowania", "Alternative Logins" : "Alternatywne loginy", "Account access" : "Dostęp do konta", "You are about to grant %s access to your %s account." : "Zamierzasz udzielić %s dostępu do Twojego konta %s.", + "Grant access" : "Udziel dostępu", "App token" : "Token aplikacji", "Alternative login using app token" : "Zaloguj alternatywnie używając tokenu aplikacji", "Redirecting …" : "Przekierowuję...", @@ -290,6 +307,7 @@ OC.L10N.register( "Detailed logs" : "Szczegółowe logi", "Update needed" : "Wymagana aktualizacja", "Please use the command line updater because you have a big instance with more than 50 users." : "Proszę uzyć aktualizatora z wiersza poleceń, ponieważ masz dużą instancję z ponad 50-cioma użytkownikami.", + "For help, see the documentation." : "Aby uzyskać pomoc, zajrzyj do dokumentacji.", "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Wiem, że jeśli kontynuuję aktualizację za pomocą przeglądarki, istnieje ryzyko że operacja może nie wykonać się w okreśłonym limicie czasu co może doprowadzić do utraty danych, ale mam kopię zapasową i wiem jak jej użyć w przypadku niepowodzenia.", "Upgrade via web on my own risk" : "Wykonaj aktualizację poprzez przeglądarkę na moją odpowiedzialność", "This %s instance is currently in maintenance mode, which may take a while." : "Ta instalacja %s działa obecnie w trybie konserwacji. Może to potrwać jakiś czas.", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 5b3ecaa6cdb45..dffcd2c080b65 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -79,6 +79,7 @@ "I know what I'm doing" : "Wiem co robię", "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.", "Reset password" : "Zresetuj hasło", + "Sending email …" : "Wysyłam email ...", "No" : "Nie", "Yes" : "Tak", "No files in here" : "Nie ma tu żadnych plików", @@ -108,13 +109,25 @@ "Good password" : "Dobre hasło", "Strong password" : "Silne hasło", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Serwer WWW nie jest jeszcze na tyle poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our documentation." : "Twój serwer WWW nie jest poprawnie skonfigurowany aby poprawnie wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej dokumentacji.", "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serwer nie ma aktywnego połączenia z Internetem. Wiele połączeń nie może być osiągniętych. Oznacza to, że część funkcji takich jak zewnętrzny magazyn, powiadomienia o aktualizacjach lub instalacja aplikacji firm trzecich nie będzie działała. Dostęp zdalny do plików oraz wysyłanie powiadomień mailowych również może nie działać. Sugerujemy udostępnienie połączenia z Internetem temu serwerowi jeśli chcesz mieć pełną funkcjonalność.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Nie skonfigurowano pamięci cache. Jeśli to możliwe skonfiguruj pamięć cache, aby zwiększyć wydajność. Więcej informacji można znaleźć w naszej dokumentacji.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "PHP nie może czytać z /dev/urandom co jest wymagane ze względów bezpieczeństwa. Więcej informacji można znaleźć w naszej dokumentacji.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Posiadasz aktualnie PHP w wersji {version}. Aby skorzystać z aktualizacji dotyczących wydajności i bezpieczeństwa otrzymanych z PHP Group zachęcamy do podniesienia wersji PHP, kiedy tylko Twoja dystrybucja będzie je wspierała.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "Konfiguracja nagłówków reverse proxy jest niepoprawna albo łączysz się do Nextclouda przez zaufane proxy. Jeśli nie łączysz się z zaufanego proxy, to jest to problem bezpieczeństwa i atakujący może podszyć się pod adres IP jako widoczny dla Nextclouda. Więcej informacji można znaleźć w naszej dokumentacji.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Jako cache jest skonfigurowane \"memcached\", ale błędny moduł PHP \"memcache\" jest zainstalowany. \\OC\\Memcache\\Memcached wspiera tylko \"memcached\", a nie \"memcache\". Sprawdź memcached wiki o obu tych modułach.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our documentation. (List of invalid files… / Rescan…)" : "Niektóre pliki nie przeszły sprawdzania spójności. Dalsze informacje jak to naprawić mogą być znalezione w naszej dokumentacji. (Lista niepoprawnych plików... / Skanowanie ponowne…)", + "The PHP OPcache is not properly configured. For better performance we recommend to use following settings in the php.ini:" : "PHP OPcache nie jest prawidłowo skonfigurowany Dla lepszej wydajności zalecamy użycie następujących ustawień w php.ini: ", "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "Funkcja PHP \"set_time_limit\" nie jest dostępna. Może to powodować zatrzymanie skryptów w podczas działania i w efekcie przerwanie instalacji. Silnie rekomendujemy włączenie tej funkcji.", "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Twój katalog z danymi i twoje pliki prawdopodobnie są dostępne przez Internet. Plik .htaccess nie działa. Usilnie zalecamy, żebyś tak skonfigurował swój serwer, żeby katalog z danymi nie był dalej dostępny lub przenieś swój katalog z danymi poza katalog root serwera webowego.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". Some features might not work correctly and we recommend adjusting this setting." : "Nagłówek HTTP {header} nie jest skonfigurowany, aby pasował do {expected}. Jest to poterncjalne zagrożenie prywatności oraz bezpieczeństwa i zalecamy poprawienie tego ustawienia.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "Nagłówek HTTP \"Strict-Transport-Security\" nie jest ustawiony na przynajmniej \"{seconds}\" sekund. Dla zwiększenia bezpieczeństwa zalecamy ustawienie HSTS tak jak opisaliśmy to w naszych wskazówkach dotyczących bezpieczeństwa.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych wskazówkach bezpieczeństwa.", "Shared" : "Udostępniono", + "Shared with" : "Współdzielone z", + "Shared by" : "Współdzielone przez", "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia", "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia", "Set expiration date" : "Ustaw datę wygaśnięcia", @@ -225,6 +238,7 @@ "Trace" : "Ślad", "Security warning" : "Ostrzeżenie bezpieczeństwa", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", + "For information how to properly configure your server, please see the documentation." : "Aby uzyskać informację jak poprawnie skonfigurować Twój serwer, zajrzyj do dokumentacji.", "Create an admin account" : "Utwórz konto administratora", "Username" : "Nazwa użytkownika", "Storage & database" : "Magazyn i baza danych", @@ -260,9 +274,12 @@ "Wrong password." : "Złe hasło", "Log in" : "Zaloguj", "Stay logged in" : "Pozostań zalogowany", + "Forgot password?" : "Zapomniano hasła?", + "Back to log in" : "Powrót do logowania", "Alternative Logins" : "Alternatywne loginy", "Account access" : "Dostęp do konta", "You are about to grant %s access to your %s account." : "Zamierzasz udzielić %s dostępu do Twojego konta %s.", + "Grant access" : "Udziel dostępu", "App token" : "Token aplikacji", "Alternative login using app token" : "Zaloguj alternatywnie używając tokenu aplikacji", "Redirecting …" : "Przekierowuję...", @@ -288,6 +305,7 @@ "Detailed logs" : "Szczegółowe logi", "Update needed" : "Wymagana aktualizacja", "Please use the command line updater because you have a big instance with more than 50 users." : "Proszę uzyć aktualizatora z wiersza poleceń, ponieważ masz dużą instancję z ponad 50-cioma użytkownikami.", + "For help, see the documentation." : "Aby uzyskać pomoc, zajrzyj do dokumentacji.", "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Wiem, że jeśli kontynuuję aktualizację za pomocą przeglądarki, istnieje ryzyko że operacja może nie wykonać się w okreśłonym limicie czasu co może doprowadzić do utraty danych, ale mam kopię zapasową i wiem jak jej użyć w przypadku niepowodzenia.", "Upgrade via web on my own risk" : "Wykonaj aktualizację poprzez przeglądarkę na moją odpowiedzialność", "This %s instance is currently in maintenance mode, which may take a while." : "Ta instalacja %s działa obecnie w trybie konserwacji. Może to potrwać jakiś czas.", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 9eafbab5cee20..37bc15b858acb 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -65,7 +65,7 @@ OC.L10N.register( "Users" : "Gebruikers", "APCu" : "APCu", "Redis" : "Redis", - "Basic settings" : "Basis instellingen", + "Basic settings" : "Basis-instellingen", "Sharing" : "Delen", "Security" : "Beveiliging", "Encryption" : "Versleuteling", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index 0bf4a5bbfe9d8..79148f5768661 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -63,7 +63,7 @@ "Users" : "Gebruikers", "APCu" : "APCu", "Redis" : "Redis", - "Basic settings" : "Basis instellingen", + "Basic settings" : "Basis-instellingen", "Sharing" : "Delen", "Security" : "Beveiliging", "Encryption" : "Versleuteling", diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 3ac207ebf75c9..5ce64671ffa5e 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -128,8 +128,9 @@ protected function fetch($ETag, $content) { */ public function get() { $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true); + $internetavailable = $this->config->getSystemValue('has_internet_connection', true); - if (!$appstoreenabled) { + if (!$appstoreenabled || !$internetavailable) { return []; } diff --git a/settings/img/admin.svg b/settings/img/admin.svg index 104254e0783cb..750ac552933ab 100644 --- a/settings/img/admin.svg +++ b/settings/img/admin.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/apps.svg b/settings/img/apps.svg index b6e545799a3d6..130516e99d26b 100644 --- a/settings/img/apps.svg +++ b/settings/img/apps.svg @@ -1,4 +1 @@ - - - - + diff --git a/settings/img/change.svg b/settings/img/change.svg index cbc5d982b30ab..b3404d2ef84a2 100644 --- a/settings/img/change.svg +++ b/settings/img/change.svg @@ -1,5 +1 @@ - - - - - + diff --git a/settings/img/help.svg b/settings/img/help.svg index cf91b1fd67e53..02d44921d4c96 100644 --- a/settings/img/help.svg +++ b/settings/img/help.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/password.svg b/settings/img/password.svg index 3d161917f6ec6..edd1edf6c0323 100644 --- a/settings/img/password.svg +++ b/settings/img/password.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/personal.png b/settings/img/personal.png index 3c9c7345f65d1..643d6036d692d 100644 Binary files a/settings/img/personal.png and b/settings/img/personal.png differ diff --git a/settings/img/personal.svg b/settings/img/personal.svg index d541921630b0b..91097e5cd7169 100644 --- a/settings/img/personal.svg +++ b/settings/img/personal.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/share.svg b/settings/img/share.svg index 68f2100e490e7..014392d5a5706 100644 --- a/settings/img/share.svg +++ b/settings/img/share.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/toggle-filelist.svg b/settings/img/toggle-filelist.svg index 47f019057ea66..16ebc047f8c31 100644 --- a/settings/img/toggle-filelist.svg +++ b/settings/img/toggle-filelist.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/img/users.svg b/settings/img/users.svg index 71c4d6667d7a1..97361beb9d033 100644 --- a/settings/img/users.svg +++ b/settings/img/users.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/settings/l10n/es.js b/settings/l10n/es.js index ea08fa8f9ab3e..4b9e2c57a6e8d 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -259,6 +259,7 @@ OC.L10N.register( "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Su base de datos no se ejecuta con el nivel de aislamiento de transacción \"READ COMMITTED\" . Ésto puede causar problemas cuando múltiples acciones se ejecutan en paralelo.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "%1$sestá instalado por debajo de la versión %2$s, por motivos de estabilidad y rendimiento se recomienda actualizar a una versión más moderna de %1$s.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "Falta el módulo PHP 'fileinfo'. Es muy recomendable activar este módulo para conseguir mejores resultados en la detección de los tipos MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "El bloqueo de archivos transaccional está desactivado. Esto podría llevar a errores en algunas condiciones. Activa 'filelocking.enabled' en config.php para evitar estos problemas. Más información en la documentación ↗.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in filenames." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 0c6aa20128f67..fb83fe140f5fe 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -257,6 +257,7 @@ "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Su base de datos no se ejecuta con el nivel de aislamiento de transacción \"READ COMMITTED\" . Ésto puede causar problemas cuando múltiples acciones se ejecutan en paralelo.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "%1$sestá instalado por debajo de la versión %2$s, por motivos de estabilidad y rendimiento se recomienda actualizar a una versión más moderna de %1$s.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "Falta el módulo PHP 'fileinfo'. Es muy recomendable activar este módulo para conseguir mejores resultados en la detección de los tipos MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "El bloqueo de archivos transaccional está desactivado. Esto podría llevar a errores en algunas condiciones. Activa 'filelocking.enabled' en config.php para evitar estos problemas. Más información en la documentación ↗.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in filenames." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index aa43c35a9fb8e..cf9612b175963 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -72,6 +72,7 @@ OC.L10N.register( "Your %s account was created" : "Je %s account is aangemaakt", "Welcome aboard" : "Welkom aan boord", "Welcome aboard %s" : "Welkom aan boord %s", + "Welcome to your %s account, you can add, protect, and share your data." : "Welkom bij je %s account; je kan nu je bestanden en gegevens toevoegen, beschermen en delen.", "Your username is: %s" : "Je gebruikersnaam is: %s", "Set your password" : "Stel je wachtwoord in", "Go to %s" : "Ga naar %s", @@ -97,7 +98,7 @@ OC.L10N.register( "Disabling app …" : "Uitschakelen app ...", "Error while disabling app" : "Fout tijdens het uitschakelen van de app", "Disable" : "Uitschakelen", - "Enable" : "Activeer", + "Enable" : "Inschakelen", "Enabling app …" : "Activeren app ...", "Error while enabling app" : "Fout tijdens het inschakelen van het programma", "Error: This app can not be enabled because it makes the server unstable" : "Fout: Deze app kan niet ingeschakeld worden, omdat die de server onstabiel maakt", @@ -184,7 +185,7 @@ OC.L10N.register( "A valid email must be provided" : "Er moet een geldig e-mailadres worden opgegeven", "Developer documentation" : "Ontwikkelaarsdocumentatie", "View in store" : "Bekijken in store", - "Limit to groups" : "Beperk to groepen", + "Limit to groups" : "Beperk tot groepen", "by %s" : "op %s", "%s-licensed" : "%s-licensed", "Documentation:" : "Documentatie:", @@ -251,17 +252,20 @@ OC.L10N.register( "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen", "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information." : "Voor beveiliging en prestaties van je server is het belangrijk dat alles correct is geconfigureerd. Om je hierbij te helpen doen we paar automatische controles. Bekijk de Tips & Trucs sectie en de documentatie voor meer informatie.", "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn opgezet om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de installatiedocumentatie ↗ voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kern apps niet berijkbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "%1$s lager dan versie %2$s is geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te vervangen door een nieuwere versie.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de documentatie ↗ voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in filenames." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op je systeem te installeren om een van de volgende talen te ondersteunen: %s.", "If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen: \"%s\")", "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:", + "Please double check the installation guides ↗, and check for any errors or warnings in the log." : "Lees de installatie-handleiding ↗ goed door en controleer de logs op fouten en waarschuwingen.", "All checks passed." : "Alle checks geslaagd", "Background jobs" : "Achtergrond jobs", "Last job ran %s." : "Laatste job liep %s.", @@ -275,7 +279,7 @@ OC.L10N.register( "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "PHP POSIX extensie is vereist om dit te draaien. Bekijk {linkstart}PHP documentatie{linkend} voor meer informatie.", "Version" : "Versie", "Sharing" : "Delen", - "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Als beheerder kun je het deel-gedrag optimaliseren. Bekijk de documentatie voor meer informatie.", + "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Als beheerder kun je gedetailleerde regels voor delen instellen. Bekijk de documentatie voor meer informatie.", "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken", "Allow users to share via link" : "Sta gebruikers toe om te delen via een link", "Allow public uploads" : "Sta publieke uploads toe", @@ -284,19 +288,20 @@ OC.L10N.register( "Set default expiration date" : "Stel standaard vervaldatum in", "Expire after " : "Vervalt na", "days" : "dagen", - "Enforce expiration date" : "Verplicht de vervaldatum", - "Allow resharing" : "Toestaan opnieuw delen", + "Enforce expiration date" : "Het kiezen van een vervaldatum verplichten", + "Allow resharing" : "Laat gebruikers de met hen gedeelde bestanden opnieuw delen", "Allow sharing with groups" : "Sta delen met groepen toe", "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen", - "Exclude groups from sharing" : "Sluit groepen uit van delen", - "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.", + "Exclude groups from sharing" : "Sta bepaalde groepen niet toe om te delen", + "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen en bestanden ontvangen, maar kunnen zelf geen niks delen.", "Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered." : "Automatisch afmaken gebruikersnaam bij het delen. Als dit is uitgeschakeld moet een volledige gebruiksnaam of volledig emailadres worden opgegeven.", - "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Tonen disclaimer op de openbare link uploadpagina (alleen tonen als het bestandsoverzicht verborgen is).", + "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Toon disclaimer op de openbare link uploadpagina (alleen tonen als het bestandsoverzicht verborgen is).", "This text will be shown on the public link upload page when the file list is hidden." : "Deze tekst wordt getoond op de openbare link uploadpagina als het bestandsoverzicht is verborgen.", "Tips & tricks" : "Tips & trucs", "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Er zijn veel mogelijkheden en instellingsschakelaars beschikbaar om je installatie te optimaliseren. Hier zijn wat aanwijzigen.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.", "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.", "How to do backups" : "Hoe maak je back-ups", "Advanced monitoring" : "Geavanceerde monitoring", "Performance tuning" : "Prestatie afstelling", @@ -314,7 +319,7 @@ OC.L10N.register( "Remove image" : "Afbeelding verwijderen", "png or jpg, max. 20 MB" : "png of jpg, max. 20 MB", "Picture provided by original account" : "Afbeelding is verstrekt door originele account.", - "Cancel" : "Annuleer", + "Cancel" : "Annuleren", "Choose as profile picture" : "Kies als profielafbeelding", "Full name" : "Volledige naam", "No display name set" : "Nog geen weergavenaam ingesteld", @@ -419,7 +424,7 @@ OC.L10N.register( "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.", "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "Om dit te draaien, is de PHP posix extensie vereist. Bekijk {linkstart}PHP documentatie{linkend} voor meer informatie.", "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.", - "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de documentatie ↗.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.", "Uninstall app" : "De-installeren app", "Hey there,

just letting you know that you now have a %s account.

Your username: %s
Access it: %s

" : "Hallo daar,

we willen je laten weten dat je nu een %s account hebt.

Je gebruikersnaam: %s
Ga naar: %s

", "Cheers!" : "Proficiat!", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index e72be010a0b81..27f6e32c2bccc 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -70,6 +70,7 @@ "Your %s account was created" : "Je %s account is aangemaakt", "Welcome aboard" : "Welkom aan boord", "Welcome aboard %s" : "Welkom aan boord %s", + "Welcome to your %s account, you can add, protect, and share your data." : "Welkom bij je %s account; je kan nu je bestanden en gegevens toevoegen, beschermen en delen.", "Your username is: %s" : "Je gebruikersnaam is: %s", "Set your password" : "Stel je wachtwoord in", "Go to %s" : "Ga naar %s", @@ -95,7 +96,7 @@ "Disabling app …" : "Uitschakelen app ...", "Error while disabling app" : "Fout tijdens het uitschakelen van de app", "Disable" : "Uitschakelen", - "Enable" : "Activeer", + "Enable" : "Inschakelen", "Enabling app …" : "Activeren app ...", "Error while enabling app" : "Fout tijdens het inschakelen van het programma", "Error: This app can not be enabled because it makes the server unstable" : "Fout: Deze app kan niet ingeschakeld worden, omdat die de server onstabiel maakt", @@ -182,7 +183,7 @@ "A valid email must be provided" : "Er moet een geldig e-mailadres worden opgegeven", "Developer documentation" : "Ontwikkelaarsdocumentatie", "View in store" : "Bekijken in store", - "Limit to groups" : "Beperk to groepen", + "Limit to groups" : "Beperk tot groepen", "by %s" : "op %s", "%s-licensed" : "%s-licensed", "Documentation:" : "Documentatie:", @@ -249,17 +250,20 @@ "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen", "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information." : "Voor beveiliging en prestaties van je server is het belangrijk dat alles correct is geconfigureerd. Om je hierbij te helpen doen we paar automatische controles. Bekijk de Tips & Trucs sectie en de documentatie voor meer informatie.", "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn opgezet om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de installatiedocumentatie ↗ voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kern apps niet berijkbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "%1$s lager dan versie %2$s is geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te vervangen door een nieuwere versie.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de documentatie ↗ voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in filenames." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op je systeem te installeren om een van de volgende talen te ondersteunen: %s.", "If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen: \"%s\")", "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:", + "Please double check the installation guides ↗, and check for any errors or warnings in the log." : "Lees de installatie-handleiding ↗ goed door en controleer de logs op fouten en waarschuwingen.", "All checks passed." : "Alle checks geslaagd", "Background jobs" : "Achtergrond jobs", "Last job ran %s." : "Laatste job liep %s.", @@ -273,7 +277,7 @@ "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "PHP POSIX extensie is vereist om dit te draaien. Bekijk {linkstart}PHP documentatie{linkend} voor meer informatie.", "Version" : "Versie", "Sharing" : "Delen", - "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Als beheerder kun je het deel-gedrag optimaliseren. Bekijk de documentatie voor meer informatie.", + "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Als beheerder kun je gedetailleerde regels voor delen instellen. Bekijk de documentatie voor meer informatie.", "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken", "Allow users to share via link" : "Sta gebruikers toe om te delen via een link", "Allow public uploads" : "Sta publieke uploads toe", @@ -282,19 +286,20 @@ "Set default expiration date" : "Stel standaard vervaldatum in", "Expire after " : "Vervalt na", "days" : "dagen", - "Enforce expiration date" : "Verplicht de vervaldatum", - "Allow resharing" : "Toestaan opnieuw delen", + "Enforce expiration date" : "Het kiezen van een vervaldatum verplichten", + "Allow resharing" : "Laat gebruikers de met hen gedeelde bestanden opnieuw delen", "Allow sharing with groups" : "Sta delen met groepen toe", "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen", - "Exclude groups from sharing" : "Sluit groepen uit van delen", - "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.", + "Exclude groups from sharing" : "Sta bepaalde groepen niet toe om te delen", + "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen en bestanden ontvangen, maar kunnen zelf geen niks delen.", "Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered." : "Automatisch afmaken gebruikersnaam bij het delen. Als dit is uitgeschakeld moet een volledige gebruiksnaam of volledig emailadres worden opgegeven.", - "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Tonen disclaimer op de openbare link uploadpagina (alleen tonen als het bestandsoverzicht verborgen is).", + "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Toon disclaimer op de openbare link uploadpagina (alleen tonen als het bestandsoverzicht verborgen is).", "This text will be shown on the public link upload page when the file list is hidden." : "Deze tekst wordt getoond op de openbare link uploadpagina als het bestandsoverzicht is verborgen.", "Tips & tricks" : "Tips & trucs", "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Er zijn veel mogelijkheden en instellingsschakelaars beschikbaar om je installatie te optimaliseren. Hier zijn wat aanwijzigen.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.", "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.", "How to do backups" : "Hoe maak je back-ups", "Advanced monitoring" : "Geavanceerde monitoring", "Performance tuning" : "Prestatie afstelling", @@ -312,7 +317,7 @@ "Remove image" : "Afbeelding verwijderen", "png or jpg, max. 20 MB" : "png of jpg, max. 20 MB", "Picture provided by original account" : "Afbeelding is verstrekt door originele account.", - "Cancel" : "Annuleer", + "Cancel" : "Annuleren", "Choose as profile picture" : "Kies als profielafbeelding", "Full name" : "Volledige naam", "No display name set" : "Nog geen weergavenaam ingesteld", @@ -417,7 +422,7 @@ "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.", "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "Om dit te draaien, is de PHP posix extensie vereist. Bekijk {linkstart}PHP documentatie{linkend} voor meer informatie.", "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.", - "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de documentatie ↗.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.", "Uninstall app" : "De-installeren app", "Hey there,

just letting you know that you now have a %s account.

Your username: %s
Access it: %s

" : "Hallo daar,

we willen je laten weten dat je nu een %s account hebt.

Je gebruikersnaam: %s
Ga naar: %s

", "Cheers!" : "Proficiat!", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index e7b041b77aa27..9f61f5030152b 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -72,6 +72,7 @@ OC.L10N.register( "Your %s account was created" : "Twoje konto %s zostało stworzone", "Welcome aboard" : "Witamy na pokładzie", "Welcome aboard %s" : "Witamy na pokładzie %s", + "Welcome to your %s account, you can add, protect, and share your data." : "Masz teraz konto na %s, możesz edytować, chronić i współdzielić dane.", "Your username is: %s" : "Twoja nazwa użytkownika to: %s", "Set your password" : "Ustaw hasło", "Go to %s" : "Idź do: %s", @@ -251,17 +252,20 @@ OC.L10N.register( "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji", "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information." : "Poprawna konfiguracja jest ważna dla bezpieczeństwa i wydajności Twojej instancji. W celach pomocniczych przeprowadzane są automatyczne kontrole. Więcej informacji można znaleźć w dziale Wskazówki i Porady oraz w dokumentacji.", "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP wydaje się być błędnie skonfigurowane odnośnie zapytania o zmienne środowiskowe systemu. Test gentenv(\"PATH\") zwraca pustą wartość.", + "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Sprawdź proszę dokumentację instalacji dla konfiguracji PHP Twojego serwera względem informacji konfiguracyjnych dokumentacji, zwłaszcza kiedy używasz php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Została włączona konfiguracja Read-Only. Zapobiegnie to ustawieniu niektórych konfiguracji poprzez interfejs web. Ponadto plikowi muszą zostać nadane prawa zapisu ręcznie dla każdej aktualizacji.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Najwidoczniej PHP jest tak ustawione, aby wycinać bloki wklejonych dokumentów. Może to spowodować, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Twoja baza danych nie działa z poziomem izolacji transakcji \"READ COMMITTED\". Może to powodować problemy kiedy wiele akcji będzie wykonywanych równolegle.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "Zainstalowana wersja %2$s jest starsza niż %1$s. Ze względów stabilności i wydajności zalecamy aktualizację do nowszej wersji %1$s.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "Brak modułu PHP 'fileinfo'. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki przy rozpoznawaniu typów MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "Transakcyjne blokowanie plików jest wyłączone. Może to powodować problemy w działaniu. Włącz 'filelocking.enabled' w config.php, aby rozwiązać te problemy. Sprawdź dokumentację ↗, aby uzyskać więcej informacji.", "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.", "This means that there might be problems with certain characters in filenames." : "Oznacza to, że mogą być problemy z pewnymi znakami w nazwach plików.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "Mocno sugerujemy, aby doinstalować do systemu wymagane pakiety, wspierające następujące języki: %s.", "If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Twoja instancja nie jest zainstalowana w katalogu głównym dla domeny, a używasz systemowego Cron'a, zatem mogą wystąpić kłopoty w poprawnym generowaniu URL'a. Aby zapobiec problemów ustaw proszę opcję \"overwrite.cli.url\" w Twoim pliku config.php do katalogu głównego Twojej instalacji (sugerowany: \"%s\")", "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Nie było możliwe uruchomienie zadania cron przy pomocy CLI. Pojawił się następujący błąd techniczny: ", + "Please double check the installation guides ↗, and check for any errors or warnings in the log." : "Proszę sprawdzić dokładnie przewodniki instalacji ↗ oraz błędy i ostrzeżenia w logu.", "All checks passed." : "Wszystkie testy konfiguracji zakończyły się pomyślnie.", "Background jobs" : "Zadania w tle", "Last job ran %s." : "Ostatnie zadanie wykonano %s", @@ -297,6 +301,7 @@ OC.L10N.register( "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Dostępnych jest wiele funkcji i ustawień pozwalających na optymalne skonfigurowanie i używanie tej instancji. Tutaj uzyskasz więcej informacji.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite jest aktualnie używany jako baza danych. Dla większych instalacji zalecamy przełączenie na inną bazę danych.", "This is particularly recommended when using the desktop client for file synchronisation." : "Jest to szczególnie zalecane w przypadku korzystania z desktopowego klienta do synchronizacji plików.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Aby zmigrować do innej bazy danych użyj narzędzia z terminala: \"occ db:convert-type\" albo sprawdź dokumentację ↗.", "How to do backups" : "Jak zrobić kopie zapasowe", "Advanced monitoring" : "Zaawansowane monitorowanie", "Performance tuning" : "Podnoszenie wydajności", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index 7d3fd8d8eaf10..e2545883a85f5 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -70,6 +70,7 @@ "Your %s account was created" : "Twoje konto %s zostało stworzone", "Welcome aboard" : "Witamy na pokładzie", "Welcome aboard %s" : "Witamy na pokładzie %s", + "Welcome to your %s account, you can add, protect, and share your data." : "Masz teraz konto na %s, możesz edytować, chronić i współdzielić dane.", "Your username is: %s" : "Twoja nazwa użytkownika to: %s", "Set your password" : "Ustaw hasło", "Go to %s" : "Idź do: %s", @@ -249,17 +250,20 @@ "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji", "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information." : "Poprawna konfiguracja jest ważna dla bezpieczeństwa i wydajności Twojej instancji. W celach pomocniczych przeprowadzane są automatyczne kontrole. Więcej informacji można znaleźć w dziale Wskazówki i Porady oraz w dokumentacji.", "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP wydaje się być błędnie skonfigurowane odnośnie zapytania o zmienne środowiskowe systemu. Test gentenv(\"PATH\") zwraca pustą wartość.", + "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Sprawdź proszę dokumentację instalacji dla konfiguracji PHP Twojego serwera względem informacji konfiguracyjnych dokumentacji, zwłaszcza kiedy używasz php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Została włączona konfiguracja Read-Only. Zapobiegnie to ustawieniu niektórych konfiguracji poprzez interfejs web. Ponadto plikowi muszą zostać nadane prawa zapisu ręcznie dla każdej aktualizacji.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Najwidoczniej PHP jest tak ustawione, aby wycinać bloki wklejonych dokumentów. Może to spowodować, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Twoja baza danych nie działa z poziomem izolacji transakcji \"READ COMMITTED\". Może to powodować problemy kiedy wiele akcji będzie wykonywanych równolegle.", "%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version." : "Zainstalowana wersja %2$s jest starsza niż %1$s. Ze względów stabilności i wydajności zalecamy aktualizację do nowszej wersji %1$s.", "The PHP module 'fileinfo' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "Brak modułu PHP 'fileinfo'. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki przy rozpoznawaniu typów MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the documentation ↗ for more information." : "Transakcyjne blokowanie plików jest wyłączone. Może to powodować problemy w działaniu. Włącz 'filelocking.enabled' w config.php, aby rozwiązać te problemy. Sprawdź dokumentację ↗, aby uzyskać więcej informacji.", "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.", "This means that there might be problems with certain characters in filenames." : "Oznacza to, że mogą być problemy z pewnymi znakami w nazwach plików.", "It is strongly proposed to install the required packages on your system to support one of the following locales: %s." : "Mocno sugerujemy, aby doinstalować do systemu wymagane pakiety, wspierające następujące języki: %s.", "If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Twoja instancja nie jest zainstalowana w katalogu głównym dla domeny, a używasz systemowego Cron'a, zatem mogą wystąpić kłopoty w poprawnym generowaniu URL'a. Aby zapobiec problemów ustaw proszę opcję \"overwrite.cli.url\" w Twoim pliku config.php do katalogu głównego Twojej instalacji (sugerowany: \"%s\")", "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Nie było możliwe uruchomienie zadania cron przy pomocy CLI. Pojawił się następujący błąd techniczny: ", + "Please double check the installation guides ↗, and check for any errors or warnings in the log." : "Proszę sprawdzić dokładnie przewodniki instalacji ↗ oraz błędy i ostrzeżenia w logu.", "All checks passed." : "Wszystkie testy konfiguracji zakończyły się pomyślnie.", "Background jobs" : "Zadania w tle", "Last job ran %s." : "Ostatnie zadanie wykonano %s", @@ -295,6 +299,7 @@ "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Dostępnych jest wiele funkcji i ustawień pozwalających na optymalne skonfigurowanie i używanie tej instancji. Tutaj uzyskasz więcej informacji.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite jest aktualnie używany jako baza danych. Dla większych instalacji zalecamy przełączenie na inną bazę danych.", "This is particularly recommended when using the desktop client for file synchronisation." : "Jest to szczególnie zalecane w przypadku korzystania z desktopowego klienta do synchronizacji plików.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Aby zmigrować do innej bazy danych użyj narzędzia z terminala: \"occ db:convert-type\" albo sprawdź dokumentację ↗.", "How to do backups" : "Jak zrobić kopie zapasowe", "Advanced monitoring" : "Zaawansowane monitorowanie", "Performance tuning" : "Podnoszenie wydajności", diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index 2efecef4dc778..4549b05935c85 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -1945,10 +1945,30 @@ public function testGetWithFilter() { public function testAppstoreDisabled() { $this->config - ->expects($this->once()) ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(false); + ->will($this->returnCallback(function($var, $default) { + if ($var === 'appstoreenabled') { + return false; + } + return $default; + })); + $this->appData + ->expects($this->never()) + ->method('getFolder'); + + $this->assertEquals([], $this->fetcher->get()); + } + + + public function testNoInternet() { + $this->config + ->method('getSystemValue') + ->will($this->returnCallback(function($var, $default) { + if ($var === 'has_internet_connection') { + return false; + } + return $default; + })); $this->appData ->expects($this->never()) ->method('getFolder'); diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php index a1ce718520fa9..f4b8c320c514b 100644 --- a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php @@ -40,15 +40,33 @@ public function setUp() { public function testAppstoreDisabled() { $this->config - ->expects($this->once()) ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(false); + ->will($this->returnCallback(function($var, $default) { + if ($var === 'appstoreenabled') { + return false; + } + return $default; + })); $this->appData ->expects($this->never()) ->method('getFolder'); $this->assertEquals([], $this->fetcher->get()); + } + + public function testNoInternet() { + $this->config + ->method('getSystemValue') + ->will($this->returnCallback(function($var, $default) { + if ($var === 'has_internet_connection') { + return false; + } + return $default; + })); + $this->appData + ->expects($this->never()) + ->method('getFolder'); + $this->assertEquals([], $this->fetcher->get()); } } diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 2cfb34a096553..90b7523d85073 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -78,6 +78,11 @@ public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() { $this->config ->expects($this->at(1)) ->method('getSystemValue') + ->with('has_internet_connection', true) + ->willReturn(true); + $this->config + ->expects($this->at(2)) + ->method('getSystemValue') ->with( $this->equalTo('version'), $this->anything() @@ -121,11 +126,16 @@ public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion() { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('appstoreenabled', true) + ->with('has_internet_connection', true) ->willReturn(true); $this->config ->expects($this->at(2)) ->method('getSystemValue') + ->with('appstoreenabled', true) + ->willReturn(true); + $this->config + ->expects($this->at(3)) + ->method('getSystemValue') ->with( $this->equalTo('version'), $this->anything() @@ -277,11 +287,16 @@ public function testGetWithAlreadyExistingFileAndNoVersion() { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('appstoreenabled', true) + ->with('has_internet_connection', true) ->willReturn(true); $this->config ->expects($this->at(2)) ->method('getSystemValue') + ->with('appstoreenabled', true) + ->willReturn(true); + $this->config + ->expects($this->at(3)) + ->method('getSystemValue') ->with( $this->equalTo('version'), $this->anything() @@ -356,11 +371,16 @@ public function testGetWithAlreadyExistingFileAndOutdatedVersion() { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('appstoreenabled', true) + ->with('has_internet_connection', true) ->willReturn(true); $this->config ->expects($this->at(2)) ->method('getSystemValue') + ->with('appstoreenabled', true) + ->willReturn(true); + $this->config + ->expects($this->at(3)) + ->method('getSystemValue') ->with( $this->equalTo('version'), $this->anything()