diff options
Diffstat (limited to 'apps')
259 files changed, 1400 insertions, 592 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 00b1ded9b30..60afcf9b579 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -6,7 +6,11 @@ .actions { padding:5px; height:32px; display: inline-block; float: left; } .actions input, .actions button, .actions .button { margin:0; float:left; } .actions .button a { color: #555; } -.actions .button a:hover, .actions .button a:active { color: #333; } +.actions .button a:hover, +.actions .button a:focus, +.actions .button a:active { + color: #333; +} .actions.hidden { display: none; } #new { @@ -99,7 +103,9 @@ } #filestable tbody tr { background-color:#fff; height:40px; } -#filestable tbody tr:hover, tbody tr:active { +#filestable tbody tr:hover, +#filestable tbody tr:focus, +#filestable tbody tr:active { background-color: rgb(240,240,240); } #filestable tbody tr.selected { @@ -123,7 +129,8 @@ span.extension { transition: opacity 300ms; vertical-align: top; } -tr:hover span.extension { +tr:hover span.extension, +tr:focus span.extension { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; @@ -166,7 +173,8 @@ table th .sort-indicator { .sort-indicator.hidden { visibility: hidden; } -table th:hover .sort-indicator.hidden { +table th:hover .sort-indicator.hidden, +table th:focus .sort-indicator.hidden { visibility: visible; } @@ -236,7 +244,6 @@ table td.filename a.name { line-height: 50px; padding: 0; } -table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; } table td.filename input.filename { width: 70%; margin-top: 1px; @@ -253,8 +260,10 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi width: 90%; } /* ellipsize long modified dates to make room for showing delete button */ -#fileList tr:hover .modified, #fileList tr:hover .column-last>span:first-child, -#fileList tr:focus .modified, #fileList tr:focus .column-last>span:first-child { +#fileList tr:hover .modified, +#fileList tr:focus .modified, +#fileList tr:hover .column-last>span:first-child, +#fileList tr:focus .column-last>span:first-child { width: 75%; } @@ -281,7 +290,8 @@ table td.filename .nametext .innernametext { max-width: 760px; } - table tr:hover td.filename .nametext .innernametext { + table tr:hover td.filename .nametext .innernametext, + table tr:focus td.filename .nametext .innernametext { max-width: 480px; } } @@ -291,7 +301,8 @@ table td.filename .nametext .innernametext { max-width: 600px; } - table tr:hover td.filename .nametext .innernametext { + table tr:hover td.filename .nametext .innernametext, + table tr:focus td.filename .nametext .innernametext { max-width: 320px; } } @@ -301,7 +312,8 @@ table td.filename .nametext .innernametext { max-width: 400px; } - table tr:hover td.filename .nametext .innernametext { + table tr:hover td.filename .nametext .innernametext, + table tr:focus td.filename .nametext .innernametext { max-width: 120px; } } @@ -311,7 +323,8 @@ table td.filename .nametext .innernametext { max-width: 320px; } - table tr:hover td.filename .nametext .innernametext { + table tr:hover td.filename .nametext .innernametext, + table tr:focus td.filename .nametext .innernametext { max-width: 40px; } } @@ -345,11 +358,13 @@ table td.filename .uploadtext { } /* Show checkbox when hovering, checked, or selected */ #fileList tr:hover td.filename>input[type="checkbox"]:first-child, +#fileList tr:focus td.filename>input[type="checkbox"]:first-child, #fileList tr td.filename>input[type="checkbox"]:checked:first-child, #fileList tr.selected td.filename>input[type="checkbox"]:first-child { opacity: 1; } .lte9 #fileList tr:hover td.filename>input[type="checkbox"]:first-child, +.lte9 #fileList tr:focus td.filename>input[type="checkbox"]:first-child, .lte9 #fileList tr td.filename>input[type="checkbox"][checked=checked]:first-child, .lte9 #fileList tr.selected td.filename>input[type="checkbox"]:first-child { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; @@ -470,13 +485,15 @@ a.action>img { position: relative; top: -21px; } -#fileList tr:hover a.action, #fileList a.action.permanent { +#fileList tr:hover a.action, #fileList a.action.permanent +#fileList tr:focus a.action, #fileList a.action.permanent { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; display:inline; } -#fileList tr:hover a.action:hover { +#fileList tr:hover a.action:hover, +#fileList tr:focus a.action:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; @@ -490,7 +507,10 @@ a.action>img { height: 70px; } -.summary:hover, .summary, table tr.summary td { +.summary:hover, +.summary:focus, +.summary, +table tr.summary td { background-color: transparent; } diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index f15ad744b71..5bf1618b0b8 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -279,7 +279,7 @@ } var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">'; if (img) { - html += '<img class ="svg" src="' + img + '" />'; + html += '<img class ="svg" alt="" src="' + img + '" />'; } html += '<span> ' + actionText + '</span></a>'; diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index 24e148c9c63..1776e769251 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -92,6 +92,6 @@ OC.L10N.register( "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се сканирва." + "Currently scanning" : "В момента се търси" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index 451cc21ae7b..cd29da596db 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -90,6 +90,6 @@ "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се сканирва." + "Currently scanning" : "В момента се търси" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index bbf480b4660..58467d9c68f 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -63,7 +63,7 @@ OC.L10N.register( "Modified" : "Upraveno", "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"], "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"], - "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory", + "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory", "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"], "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.", "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index f427a6961e3..98cad1c70f5 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -61,7 +61,7 @@ "Modified" : "Upraveno", "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"], "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"], - "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory", + "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory", "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"], "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.", "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 967908eaca0..719d3355bca 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -23,7 +23,7 @@ OC.L10N.register( "Invalid Token" : "Jeton non valide", "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue", "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.", "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.", "No file was uploaded" : "Pas de fichier envoyé.", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 19c9154dc79..8501a8551b7 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -21,7 +21,7 @@ "Invalid Token" : "Jeton non valide", "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue", "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:", + "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.", "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.", "No file was uploaded" : "Pas de fichier envoyé.", diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js index 14caaa15140..d85523ba062 100644 --- a/apps/files/l10n/sq.js +++ b/apps/files/l10n/sq.js @@ -1,11 +1,24 @@ OC.L10N.register( "files", { + "Storage not available" : "Hapësira e memorizimit nuk është e disponueshme", + "Storage invalid" : "Hapësirë memorizimi e pavlefshme", "Unknown error" : "Gabim panjohur", "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer", "Could not move %s" : "Nuk mund të zhvendoset %s", + "Permission denied" : "Nuk ka të drejtë", "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.", + "\"%s\" is an invalid file name." : "\"%s\" është i pavlefshëm si emër skedari.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.", + "The target folder has been moved or deleted." : "Dosja e destinacionit është zhvendosur ose fshirë.", + "The name %s is already used in the folder %s. Please choose a different name." : "Emri %s është i përdorur në dosjen %s. Ju lutem zgjidhni një emër tjetër.", + "Not a valid source" : "Burim i pavlefshëm", + "Server is not allowed to open URLs, please check the server configuration" : "Serverit nuk i lejohet të hapë URL, ju lutem kontrolloni konfigurimin e serverit", + "The file exceeds your quota by %s" : "Ky skedar tejkalon kuotën tuaj me %s", + "Error while downloading %s to %s" : "Gabim gjatë shkarkimit të %s në %s", + "Error when creating the file" : "Gabim gjatë krijimit të skedarit", + "Folder name cannot be empty." : "Emri i dosjes nuk mund të jetë bosh.", + "Error when creating the folder" : "Gabim gjatë krijimit të dosjes", "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit", "Invalid Token" : "Shenjë e gabuar", "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur", @@ -17,38 +30,59 @@ OC.L10N.register( "Missing a temporary folder" : "Mungon dosja e përkohshme", "Failed to write to disk" : "Dështoi shkrimi në disk", "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme", + "Upload failed. Could not find uploaded file" : "Ngarkimi dështoi. Nuk mund të gjendet skedari i ngarkuar", + "Upload failed. Could not get file info." : "Ngarkimi dështoi. Nuk mund të gjej informacion mbi skedarin.", "Invalid directory." : "Dosje e pavlefshme", "Files" : "Skedarë", + "All files" : "Të gjithë", + "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte", + "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë", "Upload cancelled." : "Ngarkimi u anullua", + "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.", "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin", "URL cannot be empty" : "URL-i nuk mund të jetë bosh", "{new_name} already exists" : "{new_name} është ekzistues ", + "Could not create file" : "Skedari nuk mund të krijohet", "Could not create folder" : "I pamundur krijimi i kartelës", + "Error fetching URL" : "Gabim në ngarkimin e URL", "Share" : "Ndaj", "Delete" : "Fshi", + "Disconnect storage" : "Shkëput hapësirën e memorizimit", "Unshare" : "Hiq ndarjen", "Delete permanently" : "Fshi përfundimisht", "Rename" : "Riemëro", "Pending" : "Në vijim", + "Error moving file." : "Gabim në lëvizjen e skedarëve.", "Error moving file" : "Gabim lëvizjen dokumentave", "Error" : "Gabim", + "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur", + "Error deleting file." : "Gabim gjatë fshirjes së skedarit.", "Name" : "Emri", "Size" : "Madhësia", "Modified" : "Ndryshuar", "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"], "_%n file_::_%n files_" : ["%n skedar","%n skedarë"], + "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu", "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"], + "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.", "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!", "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund ({usedSpacePercent}%)", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem", + "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.", "{dirs} and {files}" : "{dirs} dhe {files}", + "%s could not be renamed as it has been deleted" : "%s nuk mund të riemërtohet sepse është fshirë", "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s", + "Upload (max. %s)" : "Ngarko (maks. %s)", "File handling" : "Trajtimi i Skedarëve", "Maximum upload size" : "Madhësia maksimale e nagarkimit", "max. possible: " : "maks i mundshëm", "Save" : "Ruaj", "WebDAV" : "WebDAV", + "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>", "New" : "E re", + "New text file" : "Skedar i ri tekst", "Text file" : "Skedar tekst", "New folder" : "Dosje e're", "Folder" : "Dosje", @@ -57,6 +91,7 @@ OC.L10N.register( "Download" : "Shkarko", "Upload too large" : "Ngarkimi shumë i madh", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.", - "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni." + "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.", + "Currently scanning" : "Duke skanuar" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json index ec666c96ee4..f15bc950d03 100644 --- a/apps/files/l10n/sq.json +++ b/apps/files/l10n/sq.json @@ -1,9 +1,22 @@ { "translations": { + "Storage not available" : "Hapësira e memorizimit nuk është e disponueshme", + "Storage invalid" : "Hapësirë memorizimi e pavlefshme", "Unknown error" : "Gabim panjohur", "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer", "Could not move %s" : "Nuk mund të zhvendoset %s", + "Permission denied" : "Nuk ka të drejtë", "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.", + "\"%s\" is an invalid file name." : "\"%s\" është i pavlefshëm si emër skedari.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.", + "The target folder has been moved or deleted." : "Dosja e destinacionit është zhvendosur ose fshirë.", + "The name %s is already used in the folder %s. Please choose a different name." : "Emri %s është i përdorur në dosjen %s. Ju lutem zgjidhni një emër tjetër.", + "Not a valid source" : "Burim i pavlefshëm", + "Server is not allowed to open URLs, please check the server configuration" : "Serverit nuk i lejohet të hapë URL, ju lutem kontrolloni konfigurimin e serverit", + "The file exceeds your quota by %s" : "Ky skedar tejkalon kuotën tuaj me %s", + "Error while downloading %s to %s" : "Gabim gjatë shkarkimit të %s në %s", + "Error when creating the file" : "Gabim gjatë krijimit të skedarit", + "Folder name cannot be empty." : "Emri i dosjes nuk mund të jetë bosh.", + "Error when creating the folder" : "Gabim gjatë krijimit të dosjes", "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit", "Invalid Token" : "Shenjë e gabuar", "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur", @@ -15,38 +28,59 @@ "Missing a temporary folder" : "Mungon dosja e përkohshme", "Failed to write to disk" : "Dështoi shkrimi në disk", "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme", + "Upload failed. Could not find uploaded file" : "Ngarkimi dështoi. Nuk mund të gjendet skedari i ngarkuar", + "Upload failed. Could not get file info." : "Ngarkimi dështoi. Nuk mund të gjej informacion mbi skedarin.", "Invalid directory." : "Dosje e pavlefshme", "Files" : "Skedarë", + "All files" : "Të gjithë", + "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte", + "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë", "Upload cancelled." : "Ngarkimi u anullua", + "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.", "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin", "URL cannot be empty" : "URL-i nuk mund të jetë bosh", "{new_name} already exists" : "{new_name} është ekzistues ", + "Could not create file" : "Skedari nuk mund të krijohet", "Could not create folder" : "I pamundur krijimi i kartelës", + "Error fetching URL" : "Gabim në ngarkimin e URL", "Share" : "Ndaj", "Delete" : "Fshi", + "Disconnect storage" : "Shkëput hapësirën e memorizimit", "Unshare" : "Hiq ndarjen", "Delete permanently" : "Fshi përfundimisht", "Rename" : "Riemëro", "Pending" : "Në vijim", + "Error moving file." : "Gabim në lëvizjen e skedarëve.", "Error moving file" : "Gabim lëvizjen dokumentave", "Error" : "Gabim", + "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur", + "Error deleting file." : "Gabim gjatë fshirjes së skedarit.", "Name" : "Emri", "Size" : "Madhësia", "Modified" : "Ndryshuar", "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"], "_%n file_::_%n files_" : ["%n skedar","%n skedarë"], + "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu", "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"], + "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.", "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!", "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund ({usedSpacePercent}%)", + "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem", + "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.", "{dirs} and {files}" : "{dirs} dhe {files}", + "%s could not be renamed as it has been deleted" : "%s nuk mund të riemërtohet sepse është fshirë", "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s", + "Upload (max. %s)" : "Ngarko (maks. %s)", "File handling" : "Trajtimi i Skedarëve", "Maximum upload size" : "Madhësia maksimale e nagarkimit", "max. possible: " : "maks i mundshëm", "Save" : "Ruaj", "WebDAV" : "WebDAV", + "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>", "New" : "E re", + "New text file" : "Skedar i ri tekst", "Text file" : "Skedar tekst", "New folder" : "Dosje e're", "Folder" : "Dosje", @@ -55,6 +89,7 @@ "Download" : "Shkarko", "Upload too large" : "Ngarkimi shumë i madh", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.", - "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni." + "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.", + "Currently scanning" : "Duke skanuar" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 83cf1f428b2..a7fa14eb14a 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -219,13 +219,13 @@ describe('OCA.Files.FileList tests', function() { expect($tr).toBeDefined(); expect($tr[0].tagName.toLowerCase()).toEqual('tr'); - expect($tr.attr('data-id')).toEqual(null); + expect($tr.attr('data-id')).toBeUndefined(); expect($tr.attr('data-type')).toEqual('file'); expect($tr.attr('data-file')).toEqual('testFile.txt'); - expect($tr.attr('data-size')).toEqual(null); - expect($tr.attr('data-etag')).toEqual(null); + expect($tr.attr('data-size')).toBeUndefined(); + expect($tr.attr('data-etag')).toBeUndefined(); expect($tr.attr('data-permissions')).toEqual('31'); - expect($tr.attr('data-mime')).toEqual(null); + expect($tr.attr('data-mime')).toBeUndefined(); expect($tr.attr('data-mtime')).toEqual('123456'); expect($tr.find('.filesize').text()).toEqual('Pending'); @@ -240,11 +240,11 @@ describe('OCA.Files.FileList tests', function() { expect($tr).toBeDefined(); expect($tr[0].tagName.toLowerCase()).toEqual('tr'); - expect($tr.attr('data-id')).toEqual(null); + expect($tr.attr('data-id')).toBeUndefined(); expect($tr.attr('data-type')).toEqual('dir'); expect($tr.attr('data-file')).toEqual('testFolder'); - expect($tr.attr('data-size')).toEqual(null); - expect($tr.attr('data-etag')).toEqual(null); + expect($tr.attr('data-size')).toBeUndefined(); + expect($tr.attr('data-etag')).toBeUndefined(); expect($tr.attr('data-permissions')).toEqual('31'); expect($tr.attr('data-mime')).toEqual('httpd/unix-directory'); expect($tr.attr('data-mtime')).toEqual('123456'); diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php index f88e9c64dfd..0f182e93831 100644 --- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php +++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php @@ -18,6 +18,7 @@ use OCA\Encryption; $l = \OC::$server->getL10N('core'); $return = false; +$errorMessage = $l->t('Could not update the private key password.'); $oldPassword = $_POST['oldPassword']; $newPassword = $_POST['newPassword']; @@ -26,6 +27,11 @@ $view = new \OC\Files\View('/'); $session = new \OCA\Encryption\Session($view); $user = \OCP\User::getUser(); +// check new password +$passwordCorrect = \OCP\User::checkPassword($user, $newPassword); + +if ($passwordCorrect !== false) { + $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -42,14 +48,22 @@ if ($decryptedKey) { $session->setPrivateKey($decryptedKey); $return = true; } +} else { + $result = false; + $errorMessage = $l->t('The old password was not correct, please try again.'); } \OC_FileProxy::$enabled = $proxyStatus; +} else { + $result = false; + $errorMessage = $l->t('The current log-in password was not correct, please try again.'); +} + // success or failure if ($return) { $session->setInitialized(\OCA\Encryption\Session::INIT_SUCCESSFUL); \OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.')))); } else { - \OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.')))); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); } diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index aa709fbac65..8bf422a612e 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -11,8 +11,9 @@ OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabiliti OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php'; // Exceptions -OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyEncryptException'] = 'files_encryption/lib/exceptions.php'; -OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyDecryptException'] = 'files_encryption/lib/exceptions.php'; +OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyEncryptException'] = 'files_encryption/exception/multiKeyEncryptException.php'; +OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyDecryptException'] = 'files_encryption/exception/multiKeyDecryptException.php'; +OC::$CLASSPATH['OCA\Encryption\Exception\EncryptionException'] = 'files_encryption/exception/encryptionException.php'; \OCP\Util::addTranslations('files_encryption'); \OCP\Util::addscript('files_encryption', 'encryption'); diff --git a/apps/files_encryption/exception/encryptionException.php b/apps/files_encryption/exception/encryptionException.php new file mode 100644 index 00000000000..c51a3b3439f --- /dev/null +++ b/apps/files_encryption/exception/encryptionException.php @@ -0,0 +1,50 @@ +<?php +/** + * ownCloud + * + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Encryption\Exception; + +/** + * Base class for all encryption exception + * + * Possible Error Codes: + * 10 - unknown error + * 20 - unexpected end of encryption header + * 30 - unexpected blog size + * 40 - encryption header to large + * 50 - unknown cipher + * 60 - encryption failed + * 70 - decryption failed + * 80 - empty data + * 90 - private key missing + */ +class EncryptionException extends \Exception { + const UNKNOWN = 10; + const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20; + const UNEXPECTED_BLOG_SIZE = 30; + const ENCRYPTION_HEADER_TO_LARGE = 40; + const UNKNOWN_CIPHER = 50; + const ENCRYPTION_FAILED = 60; + const DECRYPTION_FAILED = 70; + const EMPTY_DATA = 80; + const PRIVATE_KEY_MISSING = 90; +} diff --git a/apps/files_encryption/lib/exceptions.php b/apps/files_encryption/exception/multiKeyDecryptException.php index 3ea27faf406..c1e40e045e0 100644 --- a/apps/files_encryption/lib/exceptions.php +++ b/apps/files_encryption/exception/multiKeyDecryptException.php @@ -2,8 +2,9 @@ /** * ownCloud * - * @author Bjoern Schiessle - * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com> + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -20,36 +21,14 @@ * */ -namespace OCA\Encryption\Exceptions; - -/** - * General encryption exception - * Possible Error Codes: - * 10 - unexpected end of encryption header - * 20 - unexpected blog size - * 30 - encryption header to large - * 40 - unknown cipher - * 50 - encryption failed - */ -class EncryptionException extends \Exception { -} - -/** - * Throw this exception if multi key encrytion fails - * - * Possible error codes: - * 10 - empty plain content was given - * 20 - openssl_seal failed - */ -class MultiKeyEncryptException extends EncryptionException { -} +namespace OCA\Encryption\Exception; /** * Throw this encryption if multi key decryption failed * * Possible error codes: - * 10 - empty encrypted content was given - * 20 - openssl_open failed + * 110 - openssl_open failed */ class MultiKeyDecryptException extends EncryptionException { + const OPENSSL_OPEN_FAILED = 110; } diff --git a/apps/files_encryption/exception/multiKeyEncryptException.php b/apps/files_encryption/exception/multiKeyEncryptException.php new file mode 100644 index 00000000000..e3aa7de591f --- /dev/null +++ b/apps/files_encryption/exception/multiKeyEncryptException.php @@ -0,0 +1,34 @@ +<?php +/** + * ownCloud + * + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Encryption\Exception; + +/** + * Throw this exception if multi key encrytion fails + * + * Possible error codes: + * 110 - openssl_seal failed + */ +class MultiKeyEncryptException extends EncryptionException { + const OPENSSL_SEAL_FAILED = 110; +} diff --git a/apps/files_encryption/l10n/ar.js b/apps/files_encryption/l10n/ar.js index b1af4358241..9f51322cf92 100644 --- a/apps/files_encryption/l10n/ar.js +++ b/apps/files_encryption/l10n/ar.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.", "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.", "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.", - "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.", "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه", "Could not update file recovery" : "تعذر تحديث ملف الاستعادة", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.", diff --git a/apps/files_encryption/l10n/ar.json b/apps/files_encryption/l10n/ar.json index f65d0c7b327..d7caa1b31d0 100644 --- a/apps/files_encryption/l10n/ar.json +++ b/apps/files_encryption/l10n/ar.json @@ -6,7 +6,6 @@ "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.", "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.", "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.", - "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.", "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه", "Could not update file recovery" : "تعذر تحديث ملف الاستعادة", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.", diff --git a/apps/files_encryption/l10n/ast.js b/apps/files_encryption/l10n/ast.js index 2252f302aaa..c909d4ee021 100644 --- a/apps/files_encryption/l10n/ast.js +++ b/apps/files_encryption/l10n/ast.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Camudóse la contraseña", "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.", "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.", "File recovery settings updated" : "Opciones de recuperación de ficheros anovada", "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.", diff --git a/apps/files_encryption/l10n/ast.json b/apps/files_encryption/l10n/ast.json index 4c1edefea97..d34a727863d 100644 --- a/apps/files_encryption/l10n/ast.json +++ b/apps/files_encryption/l10n/ast.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Camudóse la contraseña", "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.", "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.", "File recovery settings updated" : "Opciones de recuperación de ficheros anovada", "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.", diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js index a117818ba84..87ffacc697d 100644 --- a/apps/files_encryption/l10n/bg_BG.js +++ b/apps/files_encryption/l10n/bg_BG.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване", "Password successfully changed." : "Паролата е успешно променена.", "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.", + "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ", + "The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.", + "The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.", "Private key password successfully updated." : "Успешно променена тайната парола за ключа.", - "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.", "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.", "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.", diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json index 74ac2593091..6e0ac83b494 100644 --- a/apps/files_encryption/l10n/bg_BG.json +++ b/apps/files_encryption/l10n/bg_BG.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване", "Password successfully changed." : "Паролата е успешно променена.", "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.", + "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ", + "The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.", + "The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.", "Private key password successfully updated." : "Успешно променена тайната парола за ключа.", - "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.", "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.", "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.", diff --git a/apps/files_encryption/l10n/ca.js b/apps/files_encryption/l10n/ca.js index e443d384ac2..2cc924a7523 100644 --- a/apps/files_encryption/l10n/ca.js +++ b/apps/files_encryption/l10n/ca.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "La contrasenya s'ha canviat.", "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.", "Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.", - "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.", "File recovery settings updated" : "S'han actualitzat els arranjaments de recuperació de fitxers", "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.", diff --git a/apps/files_encryption/l10n/ca.json b/apps/files_encryption/l10n/ca.json index a65fbf9c88e..378af112cf2 100644 --- a/apps/files_encryption/l10n/ca.json +++ b/apps/files_encryption/l10n/ca.json @@ -6,7 +6,6 @@ "Password successfully changed." : "La contrasenya s'ha canviat.", "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.", "Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.", - "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.", "File recovery settings updated" : "S'han actualitzat els arranjaments de recuperació de fitxers", "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.", diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js index 3c3b54e67f3..5d4d36557b7 100644 --- a/apps/files_encryption/l10n/cs_CZ.js +++ b/apps/files_encryption/l10n/cs_CZ.js @@ -8,13 +8,15 @@ OC.L10N.register( "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen", "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!", "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán", - "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu", - "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu", + "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu", + "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu", "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu", "Password successfully changed." : "Heslo bylo úspěšně změněno.", "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.", + "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.", + "The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.", + "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.", "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.", - "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.", "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány", "Could not update file recovery" : "Nelze nastavit záchranu souborů", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.", diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json index 5bd5bb54f01..3f25a78695e 100644 --- a/apps/files_encryption/l10n/cs_CZ.json +++ b/apps/files_encryption/l10n/cs_CZ.json @@ -6,13 +6,15 @@ "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen", "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!", "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán", - "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu", - "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu", + "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu", + "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu", "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu", "Password successfully changed." : "Heslo bylo úspěšně změněno.", "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.", + "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.", + "The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.", + "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.", "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.", - "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.", "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány", "Could not update file recovery" : "Nelze nastavit záchranu souborů", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.", diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js index 9c12271be0b..95e3a115cd7 100644 --- a/apps/files_encryption/l10n/da.js +++ b/apps/files_encryption/l10n/da.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse", "Password successfully changed." : "Kodeordet blev ændret succesfuldt", "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.", + "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.", + "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.", + "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.", "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.", - "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.", "File recovery settings updated" : "Filgendannelsesindstillinger opdateret", "Could not update file recovery" : "Kunne ikke opdatere filgendannelse", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ", diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json index 65a64a95d33..141d6998d47 100644 --- a/apps/files_encryption/l10n/da.json +++ b/apps/files_encryption/l10n/da.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse", "Password successfully changed." : "Kodeordet blev ændret succesfuldt", "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.", + "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.", + "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.", + "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.", "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.", - "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.", "File recovery settings updated" : "Filgendannelsesindstillinger opdateret", "Could not update file recovery" : "Kunne ikke opdatere filgendannelse", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ", diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js index 2c680836cb5..e02b6cd473c 100644 --- a/apps/files_encryption/l10n/de.js +++ b/apps/files_encryption/l10n/de.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen", "Password successfully changed." : "Dein Passwort wurde geändert.", "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.", + "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.", + "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.", + "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.", "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.", "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert", "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.", diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json index ce5b6e81af1..c3077fc61a9 100644 --- a/apps/files_encryption/l10n/de.json +++ b/apps/files_encryption/l10n/de.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen", "Password successfully changed." : "Dein Passwort wurde geändert.", "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.", + "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.", + "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.", + "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.", "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.", "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert", "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.", diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js index f24b4a74358..84dd13df2a9 100644 --- a/apps/files_encryption/l10n/de_DE.js +++ b/apps/files_encryption/l10n/de_DE.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen", "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.", "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", + "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.", + "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.", + "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.", "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.", "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.", diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json index 0bbba2a50df..0e9ee5084c4 100644 --- a/apps/files_encryption/l10n/de_DE.json +++ b/apps/files_encryption/l10n/de_DE.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen", "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.", "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", + "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.", + "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.", + "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.", "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.", "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.", diff --git a/apps/files_encryption/l10n/el.js b/apps/files_encryption/l10n/el.js index a39a0c867f3..03a94c2a85e 100644 --- a/apps/files_encryption/l10n/el.js +++ b/apps/files_encryption/l10n/el.js @@ -13,8 +13,8 @@ OC.L10N.register( "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς", "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.", "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.", + "The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.", "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς", - "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.", "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν", "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.", diff --git a/apps/files_encryption/l10n/el.json b/apps/files_encryption/l10n/el.json index 0ebf52e3f88..13ed5ab7755 100644 --- a/apps/files_encryption/l10n/el.json +++ b/apps/files_encryption/l10n/el.json @@ -11,8 +11,8 @@ "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς", "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.", "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.", + "The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.", "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς", - "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.", "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν", "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.", diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js index 126d901b24f..cae7d2c9679 100644 --- a/apps/files_encryption/l10n/en_GB.js +++ b/apps/files_encryption/l10n/en_GB.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Please repeat the new recovery password", "Password successfully changed." : "Password changed successfully.", "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.", + "Could not update the private key password." : "Could not update the private key password.", + "The old password was not correct, please try again." : "The old password was not correct, please try again.", + "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.", "Private key password successfully updated." : "Private key password updated successfully.", - "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.", "File recovery settings updated" : "File recovery settings updated", "Could not update file recovery" : "Could not update file recovery", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.", diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json index e81b4088055..d0b9ece1781 100644 --- a/apps/files_encryption/l10n/en_GB.json +++ b/apps/files_encryption/l10n/en_GB.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Please repeat the new recovery password", "Password successfully changed." : "Password changed successfully.", "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.", + "Could not update the private key password." : "Could not update the private key password.", + "The old password was not correct, please try again." : "The old password was not correct, please try again.", + "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.", "Private key password successfully updated." : "Private key password updated successfully.", - "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.", "File recovery settings updated" : "File recovery settings updated", "Could not update file recovery" : "Could not update file recovery", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.", diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js index 8101c9f4663..28f52666d45 100644 --- a/apps/files_encryption/l10n/es.js +++ b/apps/files_encryption/l10n/es.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion", "Password successfully changed." : "Su contraseña ha sido cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", + "Could not update the private key password." : "No se pudo actualizar la contraseña de clave privada.", + "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.", + "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json index 16cdc6b40a0..8bed1ad1aba 100644 --- a/apps/files_encryption/l10n/es.json +++ b/apps/files_encryption/l10n/es.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion", "Password successfully changed." : "Su contraseña ha sido cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", + "Could not update the private key password." : "No se pudo actualizar la contraseña de clave privada.", + "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.", + "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/es_AR.js b/apps/files_encryption/l10n/es_AR.js index 86ac5977f7f..bde0e920689 100644 --- a/apps/files_encryption/l10n/es_AR.js +++ b/apps/files_encryption/l10n/es_AR.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Tu contraseña fue cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.", "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas", "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.", diff --git a/apps/files_encryption/l10n/es_AR.json b/apps/files_encryption/l10n/es_AR.json index 07dab2694bd..6251abd7ec6 100644 --- a/apps/files_encryption/l10n/es_AR.json +++ b/apps/files_encryption/l10n/es_AR.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Tu contraseña fue cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.", "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas", "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.", diff --git a/apps/files_encryption/l10n/es_MX.js b/apps/files_encryption/l10n/es_MX.js index 02af0608ab1..99a633c6e43 100644 --- a/apps/files_encryption/l10n/es_MX.js +++ b/apps/files_encryption/l10n/es_MX.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Su contraseña ha sido cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/es_MX.json b/apps/files_encryption/l10n/es_MX.json index 1ff89da3d8f..fe257ee670a 100644 --- a/apps/files_encryption/l10n/es_MX.json +++ b/apps/files_encryption/l10n/es_MX.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Su contraseña ha sido cambiada", "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.", - "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "File recovery settings updated" : "Opciones de recuperación de archivos actualizada", "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/et_EE.js b/apps/files_encryption/l10n/et_EE.js index a4edf9950a6..93fa8084ff9 100644 --- a/apps/files_encryption/l10n/et_EE.js +++ b/apps/files_encryption/l10n/et_EE.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli", "Password successfully changed." : "Parool edukalt vahetatud.", "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.", + "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.", + "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.", + "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.", "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.", - "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.", "File recovery settings updated" : "Faili taaste seaded uuendatud", "Could not update file recovery" : "Ei suuda uuendada taastefaili", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.", diff --git a/apps/files_encryption/l10n/et_EE.json b/apps/files_encryption/l10n/et_EE.json index df58c8f11fb..873bc8945d7 100644 --- a/apps/files_encryption/l10n/et_EE.json +++ b/apps/files_encryption/l10n/et_EE.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli", "Password successfully changed." : "Parool edukalt vahetatud.", "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.", + "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.", + "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.", + "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.", "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.", - "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.", "File recovery settings updated" : "Faili taaste seaded uuendatud", "Could not update file recovery" : "Ei suuda uuendada taastefaili", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.", diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js index 84d446313a1..d5c23d016f0 100644 --- a/apps/files_encryption/l10n/eu.js +++ b/apps/files_encryption/l10n/eu.js @@ -14,7 +14,6 @@ OC.L10N.register( "Password successfully changed." : "Pasahitza behar bezala aldatu da.", "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.", "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.", - "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.", "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak", "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.", diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json index c18cebad99d..3b932fd769e 100644 --- a/apps/files_encryption/l10n/eu.json +++ b/apps/files_encryption/l10n/eu.json @@ -12,7 +12,6 @@ "Password successfully changed." : "Pasahitza behar bezala aldatu da.", "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.", "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.", - "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.", "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak", "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.", diff --git a/apps/files_encryption/l10n/fa.js b/apps/files_encryption/l10n/fa.js index 541b19c695c..037dc26e681 100644 --- a/apps/files_encryption/l10n/fa.js +++ b/apps/files_encryption/l10n/fa.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.", "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.", "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.", - "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.", "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.", "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.", "Missing requirements." : "نیازمندی های گمشده", diff --git a/apps/files_encryption/l10n/fa.json b/apps/files_encryption/l10n/fa.json index 30b0faa5ec8..0c89886d412 100644 --- a/apps/files_encryption/l10n/fa.json +++ b/apps/files_encryption/l10n/fa.json @@ -6,7 +6,6 @@ "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.", "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.", "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.", - "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.", "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.", "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.", "Missing requirements." : "نیازمندی های گمشده", diff --git a/apps/files_encryption/l10n/fi_FI.js b/apps/files_encryption/l10n/fi_FI.js index bf1afbb1129..aff16f1fcdd 100644 --- a/apps/files_encryption/l10n/fi_FI.js +++ b/apps/files_encryption/l10n/fi_FI.js @@ -5,9 +5,11 @@ OC.L10N.register( "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti", "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.", "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.", + "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.", "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.", "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty", "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.", + "Missing requirements." : "Puuttuvat vaatimukset.", "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.", "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.", @@ -25,8 +27,8 @@ OC.L10N.register( "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana", "Change Password" : "Vaihda salasana", " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.", - "Old log-in password" : "Vanha kirjautumis-salasana", - "Current log-in password" : "Nykyinen kirjautumis-salasana", + "Old log-in password" : "Vanha kirjautumissalasana", + "Current log-in password" : "Nykyinen kirjautumissalasana", "Update Private Key Password" : "Päivitä yksityisen avaimen salasana", "Enable password recovery:" : "Ota salasanan palautus käyttöön:" }, diff --git a/apps/files_encryption/l10n/fi_FI.json b/apps/files_encryption/l10n/fi_FI.json index 2b91a4388d0..348f8aeb1fe 100644 --- a/apps/files_encryption/l10n/fi_FI.json +++ b/apps/files_encryption/l10n/fi_FI.json @@ -3,9 +3,11 @@ "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti", "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.", "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.", + "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.", "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.", "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty", "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.", + "Missing requirements." : "Puuttuvat vaatimukset.", "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.", "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.", @@ -23,8 +25,8 @@ "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana", "Change Password" : "Vaihda salasana", " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.", - "Old log-in password" : "Vanha kirjautumis-salasana", - "Current log-in password" : "Nykyinen kirjautumis-salasana", + "Old log-in password" : "Vanha kirjautumissalasana", + "Current log-in password" : "Nykyinen kirjautumissalasana", "Update Private Key Password" : "Päivitä yksityisen avaimen salasana", "Enable password recovery:" : "Ota salasanan palautus käyttöön:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js index 68d07143f73..b5bcaff19c2 100644 --- a/apps/files_encryption/l10n/fr.js +++ b/apps/files_encryption/l10n/fr.js @@ -11,10 +11,12 @@ OC.L10N.register( "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération", "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération", "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération", - "Password successfully changed." : "Mot de passe changé avec succès ", - "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.", + "Password successfully changed." : "Mot de passe changé avec succès.", + "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.", + "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.", + "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.", + "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.", "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.", - "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.", "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour", "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.", @@ -32,8 +34,8 @@ OC.L10N.register( "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" : "Mot de passe de la clef de récupération", "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération", - "Enabled" : "Activer", - "Disabled" : "Désactiver", + "Enabled" : "Activé", + "Disabled" : "Désactivé", "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :", "Old Recovery key password" : "Ancien mot de passe de la clef de récupération", "New Recovery key password" : "Nouveau mot de passe de la clef de récupération", diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json index 707583f7c80..24de660bb3c 100644 --- a/apps/files_encryption/l10n/fr.json +++ b/apps/files_encryption/l10n/fr.json @@ -9,10 +9,12 @@ "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération", "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération", "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération", - "Password successfully changed." : "Mot de passe changé avec succès ", - "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.", + "Password successfully changed." : "Mot de passe changé avec succès.", + "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.", + "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.", + "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.", + "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.", "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.", - "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.", "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour", "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.", @@ -30,8 +32,8 @@ "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" : "Mot de passe de la clef de récupération", "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération", - "Enabled" : "Activer", - "Disabled" : "Désactiver", + "Enabled" : "Activé", + "Disabled" : "Désactivé", "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :", "Old Recovery key password" : "Ancien mot de passe de la clef de récupération", "New Recovery key password" : "Nouveau mot de passe de la clef de récupération", diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js index 72f27a9c5a9..d32e9f600fb 100644 --- a/apps/files_encryption/l10n/gl.js +++ b/apps/files_encryption/l10n/gl.js @@ -2,13 +2,18 @@ OC.L10N.register( "files_encryption", { "Unknown error" : "Produciuse un erro descoñecido", + "Missing recovery key password" : "Falta a chave de recuperación", + "Please repeat the recovery key password" : "Por favor repita a chave de recuperación", + "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación establecida", "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación", "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!", "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación", + "Please provide the old recovery password" : "Por favor introduza a chave de recuperación anterior", + "Please provide a new recovery password" : "Por favor introduza a nova chave de recuperación", + "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación", "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente", "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.", "Private key password successfully updated." : "A chave privada foi actualizada correctamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.", "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación", "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json index 05e17509c46..8ffcafe8e88 100644 --- a/apps/files_encryption/l10n/gl.json +++ b/apps/files_encryption/l10n/gl.json @@ -1,12 +1,17 @@ { "translations": { "Unknown error" : "Produciuse un erro descoñecido", + "Missing recovery key password" : "Falta a chave de recuperación", + "Please repeat the recovery key password" : "Por favor repita a chave de recuperación", + "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación establecida", "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación", "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!", "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación", + "Please provide the old recovery password" : "Por favor introduza a chave de recuperación anterior", + "Please provide a new recovery password" : "Por favor introduza a nova chave de recuperación", + "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación", "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente", "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.", "Private key password successfully updated." : "A chave privada foi actualizada correctamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.", "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación", "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.", diff --git a/apps/files_encryption/l10n/hr.js b/apps/files_encryption/l10n/hr.js index 7160e72ac23..f20ce757c05 100644 --- a/apps/files_encryption/l10n/hr.js +++ b/apps/files_encryption/l10n/hr.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Lozinka uspješno promijenjena.", "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.", "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.", - "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.", "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke", "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.", diff --git a/apps/files_encryption/l10n/hr.json b/apps/files_encryption/l10n/hr.json index e375f3f6314..04e664336d3 100644 --- a/apps/files_encryption/l10n/hr.json +++ b/apps/files_encryption/l10n/hr.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Lozinka uspješno promijenjena.", "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.", "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.", - "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.", "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke", "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.", diff --git a/apps/files_encryption/l10n/hu_HU.js b/apps/files_encryption/l10n/hu_HU.js index 349d7cf6e3e..f30194e0578 100644 --- a/apps/files_encryption/l10n/hu_HU.js +++ b/apps/files_encryption/l10n/hu_HU.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.", "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.", "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.", - "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.", "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek", "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!", diff --git a/apps/files_encryption/l10n/hu_HU.json b/apps/files_encryption/l10n/hu_HU.json index e94c192180a..510bf199284 100644 --- a/apps/files_encryption/l10n/hu_HU.json +++ b/apps/files_encryption/l10n/hu_HU.json @@ -6,7 +6,6 @@ "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.", "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.", "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.", - "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.", "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek", "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!", diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js index 7137d13cb9f..805d7878436 100644 --- a/apps/files_encryption/l10n/id.js +++ b/apps/files_encryption/l10n/id.js @@ -14,7 +14,6 @@ OC.L10N.register( "Password successfully changed." : "Sandi berhasil diubah", "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.", "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.", - "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.", "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui", "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.", diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json index eb5361d4b66..826ebdba373 100644 --- a/apps/files_encryption/l10n/id.json +++ b/apps/files_encryption/l10n/id.json @@ -12,7 +12,6 @@ "Password successfully changed." : "Sandi berhasil diubah", "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.", "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.", - "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.", "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui", "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.", diff --git a/apps/files_encryption/l10n/it.js b/apps/files_encryption/l10n/it.js index e71abc94675..d253dae8f68 100644 --- a/apps/files_encryption/l10n/it.js +++ b/apps/files_encryption/l10n/it.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Ripeti la nuova password di recupero", "Password successfully changed." : "Password modificata correttamente.", "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.", + "Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.", + "The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.", + "The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.", "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.", "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate", "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.", diff --git a/apps/files_encryption/l10n/it.json b/apps/files_encryption/l10n/it.json index d051a2cfc98..d5257715faa 100644 --- a/apps/files_encryption/l10n/it.json +++ b/apps/files_encryption/l10n/it.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Ripeti la nuova password di recupero", "Password successfully changed." : "Password modificata correttamente.", "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.", + "Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.", + "The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.", + "The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.", "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.", - "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.", "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate", "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.", diff --git a/apps/files_encryption/l10n/ja.js b/apps/files_encryption/l10n/ja.js index e4ca38f822b..a21870de7c2 100644 --- a/apps/files_encryption/l10n/ja.js +++ b/apps/files_encryption/l10n/ja.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力", "Password successfully changed." : "パスワードを変更できました。", "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。", + "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。", + "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。", + "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。", "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。", - "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。", "File recovery settings updated" : "ファイルリカバリ設定を更新しました", "Could not update file recovery" : "ファイルリカバリを更新できませんでした", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。", diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json index 471bf314442..d689ca954d0 100644 --- a/apps/files_encryption/l10n/ja.json +++ b/apps/files_encryption/l10n/ja.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力", "Password successfully changed." : "パスワードを変更できました。", "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。", + "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。", + "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。", + "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。", "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。", - "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。", "File recovery settings updated" : "ファイルリカバリ設定を更新しました", "Could not update file recovery" : "ファイルリカバリを更新できませんでした", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。", diff --git a/apps/files_encryption/l10n/ko.js b/apps/files_encryption/l10n/ko.js index a994dc7d339..223fe99f990 100644 --- a/apps/files_encryption/l10n/ko.js +++ b/apps/files_encryption/l10n/ko.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "암호가 성공적으로 변경되었습니다", "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.", "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.", - "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.", "File recovery settings updated" : "파일 복구 설정 업데이트됨", "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.", diff --git a/apps/files_encryption/l10n/ko.json b/apps/files_encryption/l10n/ko.json index 3cc8ec06b06..bb5ff7df70c 100644 --- a/apps/files_encryption/l10n/ko.json +++ b/apps/files_encryption/l10n/ko.json @@ -6,7 +6,6 @@ "Password successfully changed." : "암호가 성공적으로 변경되었습니다", "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.", "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.", - "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.", "File recovery settings updated" : "파일 복구 설정 업데이트됨", "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.", diff --git a/apps/files_encryption/l10n/lt_LT.js b/apps/files_encryption/l10n/lt_LT.js index eebfcedaf0b..afcc478e34c 100644 --- a/apps/files_encryption/l10n/lt_LT.js +++ b/apps/files_encryption/l10n/lt_LT.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Slaptažodis sėkmingai pakeistas", "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.", "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.", - "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.", "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti", "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.", diff --git a/apps/files_encryption/l10n/lt_LT.json b/apps/files_encryption/l10n/lt_LT.json index c642bfd7528..c2ffc891638 100644 --- a/apps/files_encryption/l10n/lt_LT.json +++ b/apps/files_encryption/l10n/lt_LT.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Slaptažodis sėkmingai pakeistas", "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.", "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.", - "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.", "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti", "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.", diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js index 3e018cd76f2..f690a78e5f8 100644 --- a/apps/files_encryption/l10n/nb_NO.js +++ b/apps/files_encryption/l10n/nb_NO.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Passordet ble endret.", "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.", "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.", - "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.", "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert", "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.", diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json index ba3e2210a96..f525462cd74 100644 --- a/apps/files_encryption/l10n/nb_NO.json +++ b/apps/files_encryption/l10n/nb_NO.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Passordet ble endret.", "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.", "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.", - "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.", "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert", "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.", diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js index 04b2c9e8175..4587f707f0a 100644 --- a/apps/files_encryption/l10n/nl.js +++ b/apps/files_encryption/l10n/nl.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord", "Password successfully changed." : "Wachtwoord succesvol gewijzigd.", "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.", + "Could not update the private key password." : "Kon het wachtwoord van de privésleutel niet bijwerken.", + "The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.", + "The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.", "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.", - "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.", "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt", "Could not update file recovery" : "Kon bestandsherstel niet bijwerken", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.", diff --git a/apps/files_encryption/l10n/nl.json b/apps/files_encryption/l10n/nl.json index 67f0d2e4c89..cd456faa614 100644 --- a/apps/files_encryption/l10n/nl.json +++ b/apps/files_encryption/l10n/nl.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord", "Password successfully changed." : "Wachtwoord succesvol gewijzigd.", "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.", + "Could not update the private key password." : "Kon het wachtwoord van de privésleutel niet bijwerken.", + "The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.", + "The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.", "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.", - "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.", "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt", "Could not update file recovery" : "Kon bestandsherstel niet bijwerken", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.", diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js index a0bccc8c9f2..e4532cb0604 100644 --- a/apps/files_encryption/l10n/pl.js +++ b/apps/files_encryption/l10n/pl.js @@ -9,7 +9,6 @@ OC.L10N.register( "Password successfully changed." : "Zmiana hasła udana.", "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.", "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.", - "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.", "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione", "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.", diff --git a/apps/files_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json index dd817a40542..8ef5297d191 100644 --- a/apps/files_encryption/l10n/pl.json +++ b/apps/files_encryption/l10n/pl.json @@ -7,7 +7,6 @@ "Password successfully changed." : "Zmiana hasła udana.", "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.", "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.", - "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.", "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione", "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.", diff --git a/apps/files_encryption/l10n/pt_BR.js b/apps/files_encryption/l10n/pt_BR.js index 3849876d602..bd0c47ce98e 100644 --- a/apps/files_encryption/l10n/pt_BR.js +++ b/apps/files_encryption/l10n/pt_BR.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação", "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.", + "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", + "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.", + "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.", "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.", - "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.", "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado", "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.", diff --git a/apps/files_encryption/l10n/pt_BR.json b/apps/files_encryption/l10n/pt_BR.json index 6627951f8f0..aa9404beb68 100644 --- a/apps/files_encryption/l10n/pt_BR.json +++ b/apps/files_encryption/l10n/pt_BR.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação", "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.", + "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", + "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.", + "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.", "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.", - "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.", "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado", "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.", diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js index 3f785d9d29e..3a642a27cc4 100644 --- a/apps/files_encryption/l10n/pt_PT.js +++ b/apps/files_encryption/l10n/pt_PT.js @@ -1,9 +1,9 @@ OC.L10N.register( "files_encryption", { - "Unknown error" : "Erro Desconhecido", - "Missing recovery key password" : "Palavra-passe de recuperação em falta", - "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação", + "Unknown error" : "Erro desconhecido", + "Missing recovery key password" : "Senha da chave de recuperação em falta", + "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação", "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida", "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso", "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.", @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.", + "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", + "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.", + "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.", "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ", - "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.", "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas", "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.", diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json index 40af81afcb4..f90e10625cc 100644 --- a/apps/files_encryption/l10n/pt_PT.json +++ b/apps/files_encryption/l10n/pt_PT.json @@ -1,7 +1,7 @@ { "translations": { - "Unknown error" : "Erro Desconhecido", - "Missing recovery key password" : "Palavra-passe de recuperação em falta", - "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação", + "Unknown error" : "Erro desconhecido", + "Missing recovery key password" : "Senha da chave de recuperação em falta", + "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação", "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida", "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso", "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.", @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.", + "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.", + "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.", + "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.", "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ", - "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.", "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas", "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.", diff --git a/apps/files_encryption/l10n/ro.js b/apps/files_encryption/l10n/ro.js index 822cc4be58d..91f657d18f0 100644 --- a/apps/files_encryption/l10n/ro.js +++ b/apps/files_encryption/l10n/ro.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Parola a fost modificată cu succes.", "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.", "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes", - "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.", "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate", "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere", "Encryption" : "Încriptare", diff --git a/apps/files_encryption/l10n/ro.json b/apps/files_encryption/l10n/ro.json index 3ac528a60ce..3c32f040aec 100644 --- a/apps/files_encryption/l10n/ro.json +++ b/apps/files_encryption/l10n/ro.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Parola a fost modificată cu succes.", "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.", "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes", - "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.", "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate", "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere", "Encryption" : "Încriptare", diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js index 2d035d75f5e..6d4cfe371e3 100644 --- a/apps/files_encryption/l10n/ru.js +++ b/apps/files_encryption/l10n/ru.js @@ -14,7 +14,6 @@ OC.L10N.register( "Password successfully changed." : "Пароль изменен удачно.", "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.", "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.", - "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.", "File recovery settings updated" : "Настройки файла восстановления обновлены", "Could not update file recovery" : "Невозможно обновить файл восстановления", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.", diff --git a/apps/files_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json index ce66622d6be..8de97d847cd 100644 --- a/apps/files_encryption/l10n/ru.json +++ b/apps/files_encryption/l10n/ru.json @@ -12,7 +12,6 @@ "Password successfully changed." : "Пароль изменен удачно.", "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.", "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.", - "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.", "File recovery settings updated" : "Настройки файла восстановления обновлены", "Could not update file recovery" : "Невозможно обновить файл восстановления", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.", diff --git a/apps/files_encryption/l10n/sk_SK.js b/apps/files_encryption/l10n/sk_SK.js index ac61753f09d..cf7606bb1ad 100644 --- a/apps/files_encryption/l10n/sk_SK.js +++ b/apps/files_encryption/l10n/sk_SK.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Heslo úspešne zmenené.", "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", - "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.", "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované", "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.", diff --git a/apps/files_encryption/l10n/sk_SK.json b/apps/files_encryption/l10n/sk_SK.json index e1887527634..6229150b737 100644 --- a/apps/files_encryption/l10n/sk_SK.json +++ b/apps/files_encryption/l10n/sk_SK.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Heslo úspešne zmenené.", "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.", "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", - "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.", "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované", "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.", diff --git a/apps/files_encryption/l10n/sl.js b/apps/files_encryption/l10n/sl.js index f0623de697f..3bb41a62f22 100644 --- a/apps/files_encryption/l10n/sl.js +++ b/apps/files_encryption/l10n/sl.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev", "Password successfully changed." : "Geslo je uspešno spremenjeno.", "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.", + "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.", + "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.", + "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", - "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.", "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene", "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.", diff --git a/apps/files_encryption/l10n/sl.json b/apps/files_encryption/l10n/sl.json index 4a692bfebae..a9909c6551a 100644 --- a/apps/files_encryption/l10n/sl.json +++ b/apps/files_encryption/l10n/sl.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev", "Password successfully changed." : "Geslo je uspešno spremenjeno.", "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.", + "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.", + "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.", + "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", - "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.", "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene", "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.", diff --git a/apps/files_encryption/l10n/sv.js b/apps/files_encryption/l10n/sv.js index f8ef7040926..44d58564ba7 100644 --- a/apps/files_encryption/l10n/sv.js +++ b/apps/files_encryption/l10n/sv.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Ändringen av lösenordet lyckades.", "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.", "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.", - "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.", "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats", "Could not update file recovery" : "Kunde inte uppdatera filåterställning", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.", diff --git a/apps/files_encryption/l10n/sv.json b/apps/files_encryption/l10n/sv.json index f94da503843..5ee6606b665 100644 --- a/apps/files_encryption/l10n/sv.json +++ b/apps/files_encryption/l10n/sv.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Ändringen av lösenordet lyckades.", "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.", "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.", - "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.", "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats", "Could not update file recovery" : "Kunde inte uppdatera filåterställning", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.", diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js index 3a50eeb2081..41240bf5ed6 100644 --- a/apps/files_encryption/l10n/tr.js +++ b/apps/files_encryption/l10n/tr.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin", "Password successfully changed." : "Parola başarıyla değiştirildi.", "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.", + "Could not update the private key password." : "Özel anahtar parolası güncellenemedi", + "The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.", + "The current log-in password was not correct, please try again." : "Geçerli oturum parolası doğru değil, lütfen yeniden deneyin.", "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.", - "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.", "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi", "Could not update file recovery" : "Dosya kurtarma güncellenemedi", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.", diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json index 4998865f3bd..d951321dd82 100644 --- a/apps/files_encryption/l10n/tr.json +++ b/apps/files_encryption/l10n/tr.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin", "Password successfully changed." : "Parola başarıyla değiştirildi.", "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.", + "Could not update the private key password." : "Özel anahtar parolası güncellenemedi", + "The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.", + "The current log-in password was not correct, please try again." : "Geçerli oturum parolası doğru değil, lütfen yeniden deneyin.", "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.", - "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.", "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi", "Could not update file recovery" : "Dosya kurtarma güncellenemedi", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.", diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js index 169f6c3f92e..db740bc45e6 100644 --- a/apps/files_encryption/l10n/uk.js +++ b/apps/files_encryption/l10n/uk.js @@ -13,8 +13,10 @@ OC.L10N.register( "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз", "Password successfully changed." : "Пароль змінено.", "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.", + "Could not update the private key password." : "Не вдалося оновити пароль секретного ключа.", + "The old password was not correct, please try again." : "Старий пароль введено не вірно, спробуйте ще раз.", + "The current log-in password was not correct, please try again." : "Невірний пароль входу, будь ласка, спробуйте ще раз.", "Private key password successfully updated." : "Пароль секретного ключа оновлено.", - "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.", "File recovery settings updated" : "Налаштування файла відновлення оновлено", "Could not update file recovery" : "Не вдалося оновити файл відновлення ", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.", diff --git a/apps/files_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json index 454de34d9c0..b2953e5e53c 100644 --- a/apps/files_encryption/l10n/uk.json +++ b/apps/files_encryption/l10n/uk.json @@ -11,8 +11,10 @@ "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз", "Password successfully changed." : "Пароль змінено.", "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.", + "Could not update the private key password." : "Не вдалося оновити пароль секретного ключа.", + "The old password was not correct, please try again." : "Старий пароль введено не вірно, спробуйте ще раз.", + "The current log-in password was not correct, please try again." : "Невірний пароль входу, будь ласка, спробуйте ще раз.", "Private key password successfully updated." : "Пароль секретного ключа оновлено.", - "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.", "File recovery settings updated" : "Налаштування файла відновлення оновлено", "Could not update file recovery" : "Не вдалося оновити файл відновлення ", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.", diff --git a/apps/files_encryption/l10n/vi.js b/apps/files_encryption/l10n/vi.js index 8fc542510da..b853fb76162 100644 --- a/apps/files_encryption/l10n/vi.js +++ b/apps/files_encryption/l10n/vi.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "Đã đổi mật khẩu.", "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.", "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân", - "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng", "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ", "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin", "Encryption" : "Mã hóa", diff --git a/apps/files_encryption/l10n/vi.json b/apps/files_encryption/l10n/vi.json index f1a1ff4c6da..4800a4bc21f 100644 --- a/apps/files_encryption/l10n/vi.json +++ b/apps/files_encryption/l10n/vi.json @@ -6,7 +6,6 @@ "Password successfully changed." : "Đã đổi mật khẩu.", "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.", "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân", - "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng", "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ", "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin", "Encryption" : "Mã hóa", diff --git a/apps/files_encryption/l10n/zh_CN.js b/apps/files_encryption/l10n/zh_CN.js index 82051423baf..17995f4597e 100644 --- a/apps/files_encryption/l10n/zh_CN.js +++ b/apps/files_encryption/l10n/zh_CN.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "密码修改成功。", "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", "Private key password successfully updated." : "私钥密码成功更新。", - "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。", "File recovery settings updated" : "文件恢复设置已更新", "Could not update file recovery" : "不能更新文件恢复", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。", diff --git a/apps/files_encryption/l10n/zh_CN.json b/apps/files_encryption/l10n/zh_CN.json index 9c9a6adc7cb..fa6de35d12a 100644 --- a/apps/files_encryption/l10n/zh_CN.json +++ b/apps/files_encryption/l10n/zh_CN.json @@ -6,7 +6,6 @@ "Password successfully changed." : "密码修改成功。", "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", "Private key password successfully updated." : "私钥密码成功更新。", - "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。", "File recovery settings updated" : "文件恢复设置已更新", "Could not update file recovery" : "不能更新文件恢复", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。", diff --git a/apps/files_encryption/l10n/zh_TW.js b/apps/files_encryption/l10n/zh_TW.js index c68028a7aad..e344178a333 100644 --- a/apps/files_encryption/l10n/zh_TW.js +++ b/apps/files_encryption/l10n/zh_TW.js @@ -8,7 +8,6 @@ OC.L10N.register( "Password successfully changed." : "成功變更密碼。", "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。", "Private key password successfully updated." : "私人金鑰密碼已成功更新。", - "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。", "File recovery settings updated" : "檔案還原設定已更新", "Could not update file recovery" : "無法更新檔案還原設定", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。", diff --git a/apps/files_encryption/l10n/zh_TW.json b/apps/files_encryption/l10n/zh_TW.json index c6560dc3738..44b48c9ccc3 100644 --- a/apps/files_encryption/l10n/zh_TW.json +++ b/apps/files_encryption/l10n/zh_TW.json @@ -6,7 +6,6 @@ "Password successfully changed." : "成功變更密碼。", "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。", "Private key password successfully updated." : "私人金鑰密碼已成功更新。", - "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。", "File recovery settings updated" : "檔案還原設定已更新", "Could not update file recovery" : "無法更新檔案還原設定", "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。", diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 59b191097af..cf915ae27b2 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -3,10 +3,12 @@ /**
* ownCloud
*
- * @author Sam Tuke, Frank Karlitschek, Robin Appelman
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Robin Appelman icewind@owncloud.com, Frank Karlitschek
- * frank@owncloud.org
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * @author Sam Tuke <samtuke@owncloud.com>
+ * @author Frank Karlitschek <frank@owncloud.com>
+ * @author Robin Appelman <icewind@owncloud.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -24,7 +26,6 @@ */
namespace OCA\Encryption;
-use OCA\Encryption\Exceptions\EncryptionException;
/**
* Class for common cryptography functionality
@@ -189,7 +190,7 @@ class Crypt { * @param string $passphrase
* @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB
* @return string encrypted file content
- * @throws \OCA\Encryption\Exceptions\EncryptionException
+ * @throws \OCA\Encryption\Exception\EncryptionException
*/
private static function encrypt($plainContent, $iv, $passphrase = '', $cipher = Crypt::DEFAULT_CIPHER) {
@@ -198,7 +199,7 @@ class Crypt { if (!$encryptedContent) {
$error = "Encryption (symmetric) of content failed: " . openssl_error_string();
\OCP\Util::writeLog('Encryption library', $error, \OCP\Util::ERROR);
- throw new Exceptions\EncryptionException($error, 50);
+ throw new Exception\EncryptionException($error, Exception\EncryptionException::ENCRYPTION_FAILED);
}
return $encryptedContent;
@@ -290,7 +291,7 @@ class Crypt { $padded = self::addPadding($catfile);
return $padded;
- } catch (EncryptionException $e) {
+ } catch (Exception\EncryptionException $e) {
$message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
\OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
return false;
@@ -378,7 +379,7 @@ class Crypt { * @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
* @return array keys: keys (array, key = userId), data
- * @throws \OCA\Encryption\Exceptions\\MultiKeyEncryptException if encryption failed
+ * @throws \OCA\Encryption\Exception\MultiKeyEncryptException if encryption failed
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -386,7 +387,7 @@ class Crypt { // openssl_seal returns false without errors if $plainContent
// is empty, so trigger our own error
if (empty($plainContent)) {
- throw new Exceptions\MultiKeyEncryptException('Cannot multiKeyEncrypt empty plain content', 10);
+ throw new Exception\MultiKeyEncryptException('Cannot multiKeyEncrypt empty plain content', Exception\MultiKeyEncryptException::EMPTY_DATA);
}
// Set empty vars to be set by openssl by reference
@@ -413,7 +414,8 @@ class Crypt { );
} else {
- throw new Exceptions\MultiKeyEncryptException('multi key encryption failed: ' . openssl_error_string(), 20);
+ throw new Exception\MultiKeyEncryptException('multi key encryption failed: ' . openssl_error_string(),
+ Exception\MultiKeyEncryptException::OPENSSL_SEAL_FAILED);
}
}
@@ -423,7 +425,7 @@ class Crypt { * @param string $encryptedContent
* @param string $shareKey
* @param mixed $privateKey
- * @throws \OCA\Encryption\Exceptions\\MultiKeyDecryptException if decryption failed
+ * @throws \OCA\Encryption\Exception\MultiKeyDecryptException if decryption failed
* @internal param string $plainContent contains decrypted content
* @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
@@ -433,7 +435,8 @@ class Crypt { public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey) {
if (!$encryptedContent) {
- throw new Exceptions\MultiKeyDecryptException('Cannot mutliKeyDecrypt empty plain content', 10);
+ throw new Exception\MultiKeyDecryptException('Cannot mutliKeyDecrypt empty plain content',
+ Exception\MultiKeyDecryptException::EMPTY_DATA);
}
if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
@@ -441,7 +444,8 @@ class Crypt { return $plainContent;
} else {
- throw new Exceptions\MultiKeyDecryptException('multiKeyDecrypt with share-key' . $shareKey . 'failed: ' . openssl_error_string(), 20);
+ throw new Exception\MultiKeyDecryptException('multiKeyDecrypt with share-key' . $shareKey . 'failed: ' . openssl_error_string(),
+ Exception\MultiKeyDecryptException::OPENSSL_OPEN_FAILED);
}
}
@@ -550,14 +554,15 @@ class Crypt { * get chiper from header
*
* @param array $header
- * @throws \OCA\Encryption\Exceptions\EncryptionException
+ * @throws \OCA\Encryption\Exception\EncryptionException
*/
public static function getCipher($header) {
$cipher = isset($header['cipher']) ? $header['cipher'] : 'AES-128-CFB';
if ($cipher !== 'AES-256-CFB' && $cipher !== 'AES-128-CFB') {
- throw new \OCA\Encryption\Exceptions\EncryptionException('file header broken, no supported cipher defined', 40);
+ throw new Exception\EncryptionException('file header broken, no supported cipher defined',
+ Exception\EncryptionException::UNKNOWN_CIPHER);
}
return $cipher;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 3b9dcbe7767..55f2df783c4 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -95,8 +95,7 @@ class Proxy extends \OC_FileProxy { // don't call the crypt stream wrapper, if... if ( - $session->getInitialized() !== Session::INIT_SUCCESSFUL // encryption successful initialized - || Crypt::mode() !== 'server' // we are not in server-side-encryption mode + Crypt::mode() !== 'server' // we are not in server-side-encryption mode || $this->isExcludedPath($path, $userId) // if path is excluded from encryption || substr($path, 0, 8) === 'crypt://' // we are already in crypt mode ) { @@ -346,8 +345,8 @@ class Proxy extends \OC_FileProxy { return $size; } - // get file info from database/cache if not .part file - if (empty($fileInfo) && !Helper::isPartialFilePath($path)) { + // get file info from database/cache + if (empty($fileInfo)) { $proxyState = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; $fileInfo = $view->getFileInfo($path); diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index f74812a7253..672a5878a24 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -2,10 +2,11 @@ /** * ownCloud * - * @author Bjoern Schiessle, Robin Appelman - * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com> - * 2012 Sam Tuke <samtuke@owncloud.com>, - * 2011 Robin Appelman <icewind1991@gmail.com> + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle <schiessle@owncloud.com> + * @author Robin Appelman <icewind@owncloud.com> + * @author Sam Tuke <samtuke@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -30,6 +31,7 @@ */ namespace OCA\Encryption; +use OCA\Encryption\Exception\EncryptionException; /** * Provides 'crypt://' stream wrapper protocol. @@ -90,6 +92,7 @@ class Stream { * @param int $options * @param string $opened_path * @return bool + * @throw \OCA\Encryption\Exception\EncryptionException */ public function stream_open($path, $mode, $options, &$opened_path) { @@ -106,6 +109,10 @@ class Stream { $this->session = new \OCA\Encryption\Session($this->rootView); $this->privateKey = $this->session->getPrivateKey(); + if ($this->privateKey === false) { + throw new EncryptionException('Session does not contain a private key, maybe your login password changed?', + EncryptionException::PRIVATE_KEY_MISSING); + } $normalizedPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path)); if ($originalFile = Helper::getPathFromTmpFile($normalizedPath)) { @@ -244,7 +251,7 @@ class Stream { /** * @param int $count * @return bool|string - * @throws \OCA\Encryption\Exceptions\EncryptionException + * @throws \OCA\Encryption\Exception\EncryptionException */ public function stream_read($count) { @@ -252,7 +259,7 @@ class Stream { if ($count !== Crypt::BLOCKSIZE) { \OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL); - throw new \OCA\Encryption\Exceptions\EncryptionException('expected a blog size of 8192 byte', 20); + throw new EncryptionException('expected a blog size of 8192 byte', EncryptionException::UNEXPECTED_BLOG_SIZE); } // Get the data from the file handle @@ -360,14 +367,14 @@ class Stream { /** * write header at beginning of encrypted file * - * @throws Exceptions\EncryptionException + * @throws Exception\EncryptionException */ private function writeHeader() { $header = Crypt::generateHeader(); if (strlen($header) > Crypt::BLOCKSIZE) { - throw new Exceptions\EncryptionException('max header size exceeded', 30); + throw new EncryptionException('max header size exceeded', EncryptionException::ENCRYPTION_HEADER_TO_LARGE); } $paddedHeader = str_pad($header, Crypt::BLOCKSIZE, self::PADDING_CHAR, STR_PAD_RIGHT); @@ -632,13 +639,17 @@ class Stream { $path = Helper::stripPartialFileExtension($this->rawPath); $fileInfo = array( + 'mimetype' => $this->rootView->getMimeType($this->rawPath), 'encrypted' => true, - 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize, ); - // set fileinfo - $this->rootView->putFileInfo($path, $fileInfo); + // if we write a part file we also store the unencrypted size for + // the part file so that it can be re-used later + $this->rootView->putFileInfo($this->rawPath, $fileInfo); + if ($path !== $this->rawPath) { + $this->rootView->putFileInfo($path, $fileInfo); + } } diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index ce5e8c8b54c..c8697ae7c80 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -960,7 +960,7 @@ class Util { $plainKeyfile = $this->decryptKeyfile($filePath, $privateKey); // Re-enc keyfile to (additional) sharekeys $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys); - } catch (Exceptions\EncryptionException $e) { + } catch (Exception\EncryptionException $e) { $msg = 'set shareFileKeyFailed (code: ' . $e->getCode() . '): ' . $e->getMessage(); \OCP\Util::writeLog('files_encryption', $msg, \OCP\Util::FATAL); return false; diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 65ca0ac02d6..7f827ec6fd4 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -4,8 +4,8 @@ OC.L10N.register( "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.", "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.", "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", - "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s", - "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s", + "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s", + "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s", "External storage" : "Stockage externe", "Local" : "Local", "Location" : "Emplacement", @@ -27,7 +27,7 @@ OC.L10N.register( "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", "Root" : "Root", - "Secure ftps://" : "Sécuriser via ftps://", + "Secure ftps://" : "Sécurisation ftps://", "Client ID" : "ID Client", "Client secret" : "Secret client", "OpenStack Object Storage" : "Object de Stockage OpenStack", @@ -39,7 +39,7 @@ OC.L10N.register( "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)", "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde", "Share" : "Partager", - "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC", + "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC", "Username as share" : "Nom d'utilisateur du partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", @@ -55,8 +55,8 @@ OC.L10N.register( "Saved" : "Sauvegarder", "<b>Note:</b> " : "<b>Attention :</b>", " and " : "et", - "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", - "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "You don't have any external storages" : "Vous n'avez pas de support de stockage externe", "Name" : "Nom", @@ -68,7 +68,7 @@ OC.L10N.register( "Available for" : "Disponible pour", "Add storage" : "Ajouter un support de stockage", "Delete" : "Supprimer", - "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs", + "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes", "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 02abcba6dde..e8a9e299c24 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -2,8 +2,8 @@ "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.", "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.", "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", - "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s", - "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s", + "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s", + "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s", "External storage" : "Stockage externe", "Local" : "Local", "Location" : "Emplacement", @@ -25,7 +25,7 @@ "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", "Root" : "Root", - "Secure ftps://" : "Sécuriser via ftps://", + "Secure ftps://" : "Sécurisation ftps://", "Client ID" : "ID Client", "Client secret" : "Secret client", "OpenStack Object Storage" : "Object de Stockage OpenStack", @@ -37,7 +37,7 @@ "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)", "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde", "Share" : "Partager", - "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC", + "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC", "Username as share" : "Nom d'utilisateur du partage", "URL" : "URL", "Secure https://" : "Sécurisation https://", @@ -53,8 +53,8 @@ "Saved" : "Sauvegarder", "<b>Note:</b> " : "<b>Attention :</b>", " and " : "et", - "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", - "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "You don't have any external storages" : "Vous n'avez pas de support de stockage externe", "Name" : "Nom", @@ -66,7 +66,7 @@ "Available for" : "Disponible pour", "Add storage" : "Ajouter un support de stockage", "Delete" : "Supprimer", - "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs", + "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes", "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 9e2ec2535b6..0ff342e958d 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -16,6 +16,7 @@ OC.L10N.register( "Amazon S3 and compliant" : "Amazon S3 e compatíbeis", "Access Key" : "Clave de acceso", "Secret Key" : "Clave secreta", + "Hostname" : "Nome de máquina", "Port" : "Porto", "Region" : "Autonomía", "Enable SSL" : "Activar SSL", @@ -36,6 +37,7 @@ OC.L10N.register( "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)", "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)", + "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP", "Share" : "Compartir", "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC", "Username as share" : "Nome de usuario como compartición", @@ -48,6 +50,8 @@ OC.L10N.register( "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive", "Personal" : "Persoal", "System" : "Sistema", + "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.", + "(group)" : "(grupo)", "Saved" : "Gardado", "<b>Note:</b> " : "<b>Nota:</b> ", " and " : "e", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index e04afd7f5bd..549de28f928 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -14,6 +14,7 @@ "Amazon S3 and compliant" : "Amazon S3 e compatíbeis", "Access Key" : "Clave de acceso", "Secret Key" : "Clave secreta", + "Hostname" : "Nome de máquina", "Port" : "Porto", "Region" : "Autonomía", "Enable SSL" : "Activar SSL", @@ -34,6 +35,7 @@ "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)", "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)", "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)", + "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP", "Share" : "Compartir", "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC", "Username as share" : "Nome de usuario como compartición", @@ -46,6 +48,8 @@ "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive", "Personal" : "Persoal", "System" : "Sistema", + "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.", + "(group)" : "(grupo)", "Saved" : "Gardado", "<b>Note:</b> " : "<b>Nota:</b> ", " and " : "e", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index 4673da66543..8b0f4f28fbc 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -1,32 +1,67 @@ OC.L10N.register( "files_external", { - "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.", + "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.", + "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s", + "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s", "External storage" : "Penyimpanan eksternal", "Local" : "Lokal", "Location" : "lokasi", "Amazon S3" : "Amazon S3", - "Port" : "port", - "Region" : "daerah", + "Key" : "Kunci", + "Secret" : "Rahasia", + "Bucket" : "Keranjang", + "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai", + "Access Key" : "Kunci Akses", + "Secret Key" : "Kunci Rahasia", + "Hostname" : "Nama Host", + "Port" : "Port", + "Region" : "Daerah", "Enable SSL" : "Aktifkan SSL", + "Enable Path Style" : "Aktifkan Gaya Path", + "App key" : "Kunci Apl", + "App secret" : "Rahasia Apl", "Host" : "Host", "Username" : "Nama Pengguna", "Password" : "Sandi", "Root" : "Root", + "Secure ftps://" : "Secure ftps://", + "Client ID" : "ID Klien", + "Client secret" : "Rahasia klien", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)", + "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)", + "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)", + "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)", + "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)", + "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)", + "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik", "Share" : "Bagikan", - "URL" : "tautan", + "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login", + "Username as share" : "Nama pengguna berbagi", + "URL" : "URL", + "Secure https://" : "Secure https://", + "Remote subfolder" : "Subfolder remote", "Access granted" : "Akses diberikan", "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox", "Grant access" : "Berikan hak akses", "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive", "Personal" : "Pribadi", + "System" : "Sistem", + "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.", + "(group)" : "(grup)", "Saved" : "Disimpan", "<b>Note:</b> " : "<b>Catatan:</b> ", " and " : "dan", - "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", - "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", - "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "You don't have any external storages" : "Anda tidak memiliki penyimpanan eksternal", "Name" : "Nama", + "Storage type" : "Tipe penyimpanan", + "Scope" : "Skop", "External Storage" : "Penyimpanan Eksternal", "Folder name" : "Nama folder", "Configuration" : "Konfigurasi", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index 067f79b2a20..8f8179d7627 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -1,30 +1,65 @@ { "translations": { - "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.", + "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.", + "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s", + "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s", "External storage" : "Penyimpanan eksternal", "Local" : "Lokal", "Location" : "lokasi", "Amazon S3" : "Amazon S3", - "Port" : "port", - "Region" : "daerah", + "Key" : "Kunci", + "Secret" : "Rahasia", + "Bucket" : "Keranjang", + "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai", + "Access Key" : "Kunci Akses", + "Secret Key" : "Kunci Rahasia", + "Hostname" : "Nama Host", + "Port" : "Port", + "Region" : "Daerah", "Enable SSL" : "Aktifkan SSL", + "Enable Path Style" : "Aktifkan Gaya Path", + "App key" : "Kunci Apl", + "App secret" : "Rahasia Apl", "Host" : "Host", "Username" : "Nama Pengguna", "Password" : "Sandi", "Root" : "Root", + "Secure ftps://" : "Secure ftps://", + "Client ID" : "ID Klien", + "Client secret" : "Rahasia klien", + "OpenStack Object Storage" : "OpenStack Object Storage", + "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)", + "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)", + "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)", + "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)", + "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)", + "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)", + "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik", "Share" : "Bagikan", - "URL" : "tautan", + "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login", + "Username as share" : "Nama pengguna berbagi", + "URL" : "URL", + "Secure https://" : "Secure https://", + "Remote subfolder" : "Subfolder remote", "Access granted" : "Akses diberikan", "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox", "Grant access" : "Berikan hak akses", "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive", "Personal" : "Pribadi", + "System" : "Sistem", + "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.", + "(group)" : "(grup)", "Saved" : "Disimpan", "<b>Note:</b> " : "<b>Catatan:</b> ", " and " : "dan", - "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", - "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", - "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.", + "You don't have any external storages" : "Anda tidak memiliki penyimpanan eksternal", "Name" : "Nama", + "Storage type" : "Tipe penyimpanan", + "Scope" : "Skop", "External Storage" : "Penyimpanan Eksternal", "Folder name" : "Nama folder", "Configuration" : "Konfigurasi", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 1869f1b15c2..53adb929e29 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -123,11 +123,28 @@ class AmazonS3 extends \OC\Files\Storage\Common { * @param array $params */ public function updateLegacyId (array $params) { + $oldId = 'amazon::' . $params['key'] . md5($params['secret']); + + // find by old id or bucket $stmt = \OC::$server->getDatabaseConnection()->prepare( - 'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?' + 'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)' ); - $oldId = 'amazon::' . $params['key'] . md5($params['secret']); - $stmt->execute(array($this->id, $oldId)); + $stmt->execute(array($oldId, $this->id)); + while ($row = $stmt->fetch()) { + $storages[$row['id']] = $row['numeric_id']; + } + + if (isset($storages[$this->id]) && isset($storages[$oldId])) { + // if both ids exist, delete the old storage and corresponding filecache entries + \OC\Files\Cache\Storage::remove($oldId); + } else if (isset($storages[$oldId])) { + // if only the old id exists do an update + $stmt = \OC::$server->getDatabaseConnection()->prepare( + 'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?' + ); + $stmt->execute(array($this->id, $oldId)); + } + // only the bucket based id may exist, do nothing } /** diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 62b0f182e98..a4337bc937b 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -496,7 +496,10 @@ class Google extends \OC\Files\Storage\Common { $result = false; if ($file) { if (isset($mtime)) { - $file->setModifiedDate($mtime); + // This is just RFC3339, but frustratingly, GDrive's API *requires* + // the fractions portion be present, while no handy PHP constant + // for RFC3339 or ISO8601 includes it. So we do it ourselves. + $file->setModifiedDate(date('Y-m-d\TH:i:s.uP', $mtime)); $result = $this->service->files->patch($file->getId(), $file, array( 'setModifiedDate' => true, )); diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index e49eba06731..dec329e82a2 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -25,8 +25,8 @@ OC_Util::checkAdminUser(); OCP\Util::addScript('files_external', 'settings'); OCP\Util::addStyle('files_external', 'settings'); -OCP\Util::addScript('core', 'select2/select2'); -OCP\Util::addStyle('core', 'select2/select2'); +\OC_Util::addVendorScript('select2/select2'); +\OC_Util::addVendorStyle('select2/select2'); $backends = OC_Mount_Config::getBackends(); $personal_backends = array(); diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php new file mode 100644 index 00000000000..629cf5cfa3c --- /dev/null +++ b/apps/files_external/tests/amazons3migration.php @@ -0,0 +1,117 @@ +<?php + +/** + * ownCloud + * + * @author Jörn Friedrich Dreyer + * @copyright 2012 Jörn Friedrich Dreyer jfd@owncloud.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + + +namespace Test\Files\Storage; + +class AmazonS3Migration extends \PHPUnit_Framework_TestCase { + + /** + * @var \OC\Files\Storage\Storage instance + */ + protected $instance; + + public function setUp () { + $uuid = uniqid(); + + $this->params['key'] = 'key'.$uuid; + $this->params['secret'] = 'secret'.$uuid; + $this->params['bucket'] = 'bucket'.$uuid; + + $this->oldId = 'amazon::' . $this->params['key'] . md5($this->params['secret']); + $this->newId = 'amazon::' . $this->params['bucket']; + } + + public function tearDown () { + $this->deleteStorage($this->oldId); + $this->deleteStorage($this->newId); + } + + public function testUpdateLegacyOnlyId () { + // add storage ids + $oldCache = new \OC\Files\Cache\Cache($this->oldId); + + // add file to old cache + $fileId = $oldCache->put('/', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory')); + + try { + $this->instance = new \OC\Files\Storage\AmazonS3($this->params); + } catch (\Exception $e) { + //ignore + } + $storages = $this->getStorages(); + + $this->assertTrue(isset($storages[$this->newId])); + $this->assertFalse(isset($storages[$this->oldId])); + $this->assertSame((int)$oldCache->getNumericStorageId(), (int)$storages[$this->newId]); + + list($storageId, $path) = \OC\Files\Cache\Cache::getById($fileId); + + $this->assertSame($this->newId, $storageId); + $this->assertSame('/', $path); + } + + public function testUpdateLegacyAndNewId () { + // add storage ids + + $oldCache = new \OC\Files\Cache\Cache($this->oldId); + new \OC\Files\Cache\Cache($this->newId); + + // add file to old cache + $fileId = $oldCache->put('/', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory')); + + try { + $this->instance = new \OC\Files\Storage\AmazonS3($this->params); + } catch (\Exception $e) { + //ignore + } + $storages = $this->getStorages(); + + $this->assertTrue(isset($storages[$this->newId])); + $this->assertFalse(isset($storages[$this->oldId])); + + $this->assertNull(\OC\Files\Cache\Cache::getById($fileId), 'old filecache has not been cleared'); + } + + /** + * @param $storages + * @return array + */ + public function getStorages() { + $storages = array(); + $stmt = \OC::$server->getDatabaseConnection()->prepare( + 'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)' + ); + $stmt->execute(array($this->oldId, $this->newId)); + while ($row = $stmt->fetch()) { + $storages[$row['id']] = $row['numeric_id']; + } + return $storages; + } + + public function deleteStorage($id) { + $stmt = \OC::$server->getDatabaseConnection()->prepare( + 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?' + ); + $stmt->execute(array($id)); + } +}
\ No newline at end of file diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 36ae878008d..8474c66d4b8 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -31,6 +31,11 @@ OCA.Files.FileList.prototype._createRow = function(fileData) { var tr = oldCreateRow.apply(this, arguments); var sharePermissions = fileData.permissions; + if (fileData.mountType && fileData.mountType === "external-root"){ + // for external storages we cant use the permissions of the mountpoint + // instead we show all permissions and only use the share permissions from the mountpoint to handle resharing + sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE); + } if (fileData.type === 'file') { // files can't be shared with delete permissions sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE; diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js index bd4aa1faf9c..7273f0fec5b 100644 --- a/apps/files_sharing/l10n/ast.js +++ b/apps/files_sharing/l10n/ast.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Amestar al to ownCloud", "Download" : "Baxar", "Download %s" : "Descargar %s", - "Direct link" : "Enllaz direutu", - "Remote Shares" : "Comparticiones remotes", - "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor", - "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos" + "Direct link" : "Enllaz direutu" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json index c86d16aa90d..fd9d2479cc7 100644 --- a/apps/files_sharing/l10n/ast.json +++ b/apps/files_sharing/l10n/ast.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Amestar al to ownCloud", "Download" : "Baxar", "Download %s" : "Descargar %s", - "Direct link" : "Enllaz direutu", - "Remote Shares" : "Comparticiones remotes", - "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor", - "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos" + "Direct link" : "Enllaz direutu" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js index fe7c4ecdb9b..3b23a76e0f3 100644 --- a/apps/files_sharing/l10n/bg_BG.js +++ b/apps/files_sharing/l10n/bg_BG.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Изтегли", "Download %s" : "Изтегли %s", "Direct link" : "Директна връзка", - "Remote Shares" : "Прикачени Папки", - "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.", - "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки." + "Server-to-Server Sharing" : "Споделяне между Сървъри", + "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", + "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json index 7fcea7ddfef..c116c4c69ca 100644 --- a/apps/files_sharing/l10n/bg_BG.json +++ b/apps/files_sharing/l10n/bg_BG.json @@ -32,8 +32,8 @@ "Download" : "Изтегли", "Download %s" : "Изтегли %s", "Direct link" : "Директна връзка", - "Remote Shares" : "Прикачени Папки", - "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.", - "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки." + "Server-to-Server Sharing" : "Споделяне между Сървъри", + "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", + "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js index 8df349c3c77..9f345965aee 100644 --- a/apps/files_sharing/l10n/bn_BD.js +++ b/apps/files_sharing/l10n/bn_BD.js @@ -24,7 +24,6 @@ OC.L10N.register( "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।", "Download" : "ডাউনলোড", "Download %s" : "ডাউনলোড %s", - "Direct link" : "সরাসরি লিঙ্ক", - "Remote Shares" : "দুরবর্তী ভাগাভাগি" + "Direct link" : "সরাসরি লিঙ্ক" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json index 9eafda60df9..0511dc3d939 100644 --- a/apps/files_sharing/l10n/bn_BD.json +++ b/apps/files_sharing/l10n/bn_BD.json @@ -22,7 +22,6 @@ "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।", "Download" : "ডাউনলোড", "Download %s" : "ডাউনলোড %s", - "Direct link" : "সরাসরি লিঙ্ক", - "Remote Shares" : "দুরবর্তী ভাগাভাগি" + "Direct link" : "সরাসরি লিঙ্ক" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js index 3397d85f140..51153252cba 100644 --- a/apps/files_sharing/l10n/ca.js +++ b/apps/files_sharing/l10n/ca.js @@ -32,9 +32,6 @@ OC.L10N.register( "Add to your ownCloud" : "Afegiu a ownCloud", "Download" : "Baixa", "Download %s" : "Baixa %s", - "Direct link" : "Enllaç directe", - "Remote Shares" : "Compartició remota", - "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor", - "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics" + "Direct link" : "Enllaç directe" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json index 861dd589bce..88d2fa70811 100644 --- a/apps/files_sharing/l10n/ca.json +++ b/apps/files_sharing/l10n/ca.json @@ -30,9 +30,6 @@ "Add to your ownCloud" : "Afegiu a ownCloud", "Download" : "Baixa", "Download %s" : "Baixa %s", - "Direct link" : "Enllaç directe", - "Remote Shares" : "Compartició remota", - "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor", - "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics" + "Direct link" : "Enllaç directe" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index dc0d1e92c41..6b2c05b4dfb 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", "Direct link" : "Přímý odkaz", - "Remote Shares" : "Vzdálená úložiště", - "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru", - "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy" + "Server-to-Server Sharing" : "Sdílení mezi servery", + "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 6b2dffa63fe..276887c770f 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -32,8 +32,8 @@ "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", "Direct link" : "Přímý odkaz", - "Remote Shares" : "Vzdálená úložiště", - "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru", - "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy" + "Server-to-Server Sharing" : "Sdílení mezi servery", + "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index a706bfbf15f..de8c6102993 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direkte link", - "Remote Shares" : "Eksterne delinger", - "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server", - "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger" + "Server-to-Server Sharing" : "Deling via server-til-server", + "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 7046e3eeeed..996d45436c6 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -32,8 +32,8 @@ "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direkte link", - "Remote Shares" : "Eksterne delinger", - "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server", - "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger" + "Server-to-Server Sharing" : "Deling via server-til-server", + "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 36858c89095..c3160792e1c 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkter Link", - "Remote Shares" : "Entfernte Freigaben", - "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben", - "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links" + "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index db6ebf3b8a6..62a74cf445b 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -32,8 +32,8 @@ "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkter Link", - "Remote Shares" : "Entfernte Freigaben", - "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben", - "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links" + "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index d028d22413d..e50a15dd29e 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", - "Remote Shares" : "Entfernte Freigaben", - "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben", - "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben" + "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 546add68233..129769939e5 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -32,8 +32,8 @@ "Download" : "Herunterladen", "Download %s" : "Download %s", "Direct link" : "Direkte Verlinkung", - "Remote Shares" : "Entfernte Freigaben", - "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben", - "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben" + "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch", + "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 04be4353062..1acfa0240fe 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -34,8 +34,6 @@ OC.L10N.register( "Download" : "Λήψη", "Download %s" : "Λήψη %s", "Direct link" : "Άμεσος σύνδεσμος", - "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι", - "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή", - "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 04a86c27619..27152556e10 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -32,8 +32,6 @@ "Download" : "Λήψη", "Download %s" : "Λήψη %s", "Direct link" : "Άμεσος σύνδεσμος", - "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι", - "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή", - "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 16e0ff1433b..07cc91c6621 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direct link", - "Remote Shares" : "Remote Shares", - "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server", - "Allow users to mount public link shares" : "Allow users to mount public link shares" + "Server-to-Server Sharing" : "Server-to-Server Sharing", + "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index ddee5ae0535..f0e6f5b5bed 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -32,8 +32,8 @@ "Download" : "Download", "Download %s" : "Download %s", "Direct link" : "Direct link", - "Remote Shares" : "Remote Shares", - "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server", - "Allow users to mount public link shares" : "Allow users to mount public link shares" + "Server-to-Server Sharing" : "Server-to-Server Sharing", + "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 2d0ba1b32ec..922c52aeaa0 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Enlace directo", - "Remote Shares" : "Almacenamiento compartido remoto", - "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor", - "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos" + "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor", + "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 3821c00cd73..8339a435be0 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -32,8 +32,8 @@ "Download" : "Descargar", "Download %s" : "Descargar %s", "Direct link" : "Enlace directo", - "Remote Shares" : "Almacenamiento compartido remoto", - "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor", - "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos" + "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor", + "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index 51389730f0f..e8158129527 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", - "Remote Shares" : "Eemalolevad jagamised", - "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke", - "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke" + "Server-to-Server Sharing" : "Serverist-serverisse jagamine", + "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index 9b54f73f88d..bb17d22b99f 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -32,8 +32,8 @@ "Download" : "Lae alla", "Download %s" : "Laadi alla %s", "Direct link" : "Otsene link", - "Remote Shares" : "Eemalolevad jagamised", - "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke", - "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke" + "Server-to-Server Sharing" : "Serverist-serverisse jagamine", + "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index 753ca778ef1..9e492649eee 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena", - "Remote Shares" : "Urrutiko parte hartzeak", - "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen", - "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen" + "Direct link" : "Lotura zuzena" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index 7b12f0c4303..0d04b0c2f9a 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena", - "Remote Shares" : "Urrutiko parte hartzeak", - "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen", - "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen" + "Direct link" : "Lotura zuzena" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js index 7bf3b3b6654..3c78846ed44 100644 --- a/apps/files_sharing/l10n/fa.js +++ b/apps/files_sharing/l10n/fa.js @@ -32,9 +32,6 @@ OC.L10N.register( "Add to your ownCloud" : "افزودن به ownCloud شما", "Download" : "دانلود", "Download %s" : "دانلود %s", - "Direct link" : "پیوند مستقیم", - "Remote Shares" : "اشتراک های از راه دور", - "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور", - "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری" + "Direct link" : "پیوند مستقیم" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json index 8b1cc8a85bb..8e5fd724927 100644 --- a/apps/files_sharing/l10n/fa.json +++ b/apps/files_sharing/l10n/fa.json @@ -30,9 +30,6 @@ "Add to your ownCloud" : "افزودن به ownCloud شما", "Download" : "دانلود", "Download %s" : "دانلود %s", - "Direct link" : "پیوند مستقیم", - "Remote Shares" : "اشتراک های از راه دور", - "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور", - "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری" + "Direct link" : "پیوند مستقیم" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index ffa5e25dd4f..bb02376e115 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Lataa", "Download %s" : "Lataa %s", "Direct link" : "Suora linkki", - "Remote Shares" : "Etäjaot", - "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä", - "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja" + "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen", + "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index eba4df5b7b9..84b681252dc 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -32,8 +32,8 @@ "Download" : "Lataa", "Download %s" : "Lataa %s", "Direct link" : "Suora linkki", - "Remote Shares" : "Etäjaot", - "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä", - "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja" + "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen", + "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index bce80d457e0..98f1a46627d 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Télécharger", "Download %s" : "Télécharger %s", "Direct link" : "Lien direct", - "Remote Shares" : "Partages distants", - "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur", - "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics" + "Server-to-Server Sharing" : "Partage de serveur à serveur", + "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 58c5eaab637..c7145f92e98 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -32,8 +32,8 @@ "Download" : "Télécharger", "Download %s" : "Télécharger %s", "Direct link" : "Lien direct", - "Remote Shares" : "Partages distants", - "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur", - "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics" + "Server-to-Server Sharing" : "Partage de serveur à serveur", + "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 2a5d70aeb87..45d20914ee8 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -32,9 +32,6 @@ OC.L10N.register( "Add to your ownCloud" : "Engadir ao seu ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Ligazón directa", - "Remote Shares" : "Comparticións remotas", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor", - "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas" + "Direct link" : "Ligazón directa" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index ff980ea0a61..5ddd5b02155 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -30,9 +30,6 @@ "Add to your ownCloud" : "Engadir ao seu ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Ligazón directa", - "Remote Shares" : "Comparticións remotas", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor", - "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas" + "Direct link" : "Ligazón directa" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js index 75d82342e78..3c409ea159c 100644 --- a/apps/files_sharing/l10n/hr.js +++ b/apps/files_sharing/l10n/hr.js @@ -32,9 +32,6 @@ OC.L10N.register( "Add to your ownCloud" : "Dodajte svome ownCloud", "Download" : "Preuzmite", "Download %s" : "Preuzmite %s", - "Direct link" : "Izravna veza", - "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)", - "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.", - "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza" + "Direct link" : "Izravna veza" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/hr.json b/apps/files_sharing/l10n/hr.json index 79064c575b9..cb37f803501 100644 --- a/apps/files_sharing/l10n/hr.json +++ b/apps/files_sharing/l10n/hr.json @@ -30,9 +30,6 @@ "Add to your ownCloud" : "Dodajte svome ownCloud", "Download" : "Preuzmite", "Download %s" : "Preuzmite %s", - "Direct link" : "Izravna veza", - "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)", - "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.", - "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza" + "Direct link" : "Izravna veza" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js index 488ad61bab2..9472f88a992 100644 --- a/apps/files_sharing/l10n/hu_HU.js +++ b/apps/files_sharing/l10n/hu_HU.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz", "Download" : "Letöltés", "Download %s" : "%s letöltése", - "Direct link" : "Közvetlen link", - "Remote Shares" : "Távoli megosztások", - "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait", - "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait" + "Direct link" : "Közvetlen link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json index f267a5a8ae7..735228feaac 100644 --- a/apps/files_sharing/l10n/hu_HU.json +++ b/apps/files_sharing/l10n/hu_HU.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz", "Download" : "Letöltés", "Download %s" : "%s letöltése", - "Direct link" : "Közvetlen link", - "Remote Shares" : "Távoli megosztások", - "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait", - "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait" + "Direct link" : "Közvetlen link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js index 0f8d5a1a3eb..bc61073311b 100644 --- a/apps/files_sharing/l10n/id.js +++ b/apps/files_sharing/l10n/id.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung", - "Remote Shares" : "Berbagi Remote", - "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini", - "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik" + "Direct link" : "Tautan langsung" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json index beb4f4f34f9..a4b0a984969 100644 --- a/apps/files_sharing/l10n/id.json +++ b/apps/files_sharing/l10n/id.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung", - "Remote Shares" : "Berbagi Remote", - "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini", - "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik" + "Direct link" : "Tautan langsung" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 5e604ec199d..64ee7b18f6f 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Scarica", "Download %s" : "Scarica %s", "Direct link" : "Collegamento diretto", - "Remote Shares" : "Condivisioni remote", - "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server", - "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico" + "Server-to-Server Sharing" : "Condivisione server-a-server", + "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 3477bb1909a..241c24febed 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -32,8 +32,8 @@ "Download" : "Scarica", "Download %s" : "Scarica %s", "Direct link" : "Collegamento diretto", - "Remote Shares" : "Condivisioni remote", - "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server", - "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico" + "Server-to-Server Sharing" : "Condivisione server-a-server", + "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index ed0ee4fd3a1..c0626abb222 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", "Direct link" : "リンク", - "Remote Shares" : "リモート共有", - "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする", - "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする" + "Server-to-Server Sharing" : "サーバー間共有", + "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", + "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 8500f6b2f2f..1a199b9e6dc 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -32,8 +32,8 @@ "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", "Direct link" : "リンク", - "Remote Shares" : "リモート共有", - "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする", - "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする" + "Server-to-Server Sharing" : "サーバー間共有", + "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", + "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 1038d9e1beb..cd98a9c396d 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Legg til i din ownCloud", "Download" : "Last ned", "Download %s" : "Last ned %s", - "Direct link" : "Direkte lenke", - "Remote Shares" : "Ekstern deling", - "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren", - "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger" + "Direct link" : "Direkte lenke" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index a511465b997..fe2df9e9307 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Legg til i din ownCloud", "Download" : "Last ned", "Download %s" : "Last ned %s", - "Direct link" : "Direkte lenke", - "Remote Shares" : "Ekstern deling", - "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren", - "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger" + "Direct link" : "Direkte lenke" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index ae691afda9b..e997a1167f4 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Downloaden", "Download %s" : "Download %s", "Direct link" : "Directe link", - "Remote Shares" : "Externe shares", - "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server", - "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten" + "Server-to-Server Sharing" : "Server-naar-Server delen", + "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index eb53e0da936..9d6fd9c37ca 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -32,8 +32,8 @@ "Download" : "Downloaden", "Download %s" : "Download %s", "Direct link" : "Directe link", - "Remote Shares" : "Externe shares", - "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server", - "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten" + "Server-to-Server Sharing" : "Server-naar-Server delen", + "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index 65a4de92265..9fc08f64bbc 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Dodaj do twojego ownCloud", "Download" : "Pobierz", "Download %s" : "Pobierz %s", - "Direct link" : "Bezpośredni link", - "Remote Shares" : "Udziały zdalne", - "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera", - "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków" + "Direct link" : "Bezpośredni link" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 89ad199602e..a6c06ef01fc 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Dodaj do twojego ownCloud", "Download" : "Pobierz", "Download %s" : "Pobierz %s", - "Direct link" : "Bezpośredni link", - "Remote Shares" : "Udziały zdalne", - "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera", - "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków" + "Direct link" : "Bezpośredni link" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 498f423e69a..57d2018282c 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Remote Shares" : "Compartilhamentos Remoto", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor", - "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos" + "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor", + "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 4739bc9a24a..1587aca9832 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -32,8 +32,8 @@ "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Remote Shares" : "Compartilhamentos Remoto", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor", - "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos" + "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor", + "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index 218d4608ab6..5f287489876 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -1,10 +1,10 @@ OC.L10N.register( "files_sharing", { - "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível", - "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.", + "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", + "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", - "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota", + "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", @@ -13,11 +13,11 @@ OC.L10N.register( "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", - "Remote share password" : "Password da partilha remota", + "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", - "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}", - "Invalid ownCloud url" : "Endereço errado", + "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação ownCloud em {remote}", + "Invalid ownCloud url" : "Url ownCloud inválido", "Shared by" : "Partilhado por", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", @@ -30,12 +30,12 @@ OC.L10N.register( "the link expired" : "A hiperligação expirou", "sharing is disabled" : "a partilha está desativada", "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.", - "Add to your ownCloud" : "Adicionar á sua ownCloud", + "Add to your ownCloud" : "Adicionar à sua ownCloud", "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Remote Shares" : "Partilhas Remotas", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor", - "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores" + "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha", + "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index 1de211bebc3..5a14b7a3a1b 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -1,8 +1,8 @@ { "translations": { - "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível", - "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.", + "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", + "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", - "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota", + "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", @@ -11,11 +11,11 @@ "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", - "Remote share password" : "Password da partilha remota", + "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", - "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}", - "Invalid ownCloud url" : "Endereço errado", + "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação ownCloud em {remote}", + "Invalid ownCloud url" : "Url ownCloud inválido", "Shared by" : "Partilhado por", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", @@ -28,12 +28,12 @@ "the link expired" : "A hiperligação expirou", "sharing is disabled" : "a partilha está desativada", "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.", - "Add to your ownCloud" : "Adicionar á sua ownCloud", + "Add to your ownCloud" : "Adicionar à sua ownCloud", "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Remote Shares" : "Partilhas Remotas", - "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor", - "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores" + "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha", + "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js index a359e6f284c..48957ec9fbc 100644 --- a/apps/files_sharing/l10n/ro.js +++ b/apps/files_sharing/l10n/ro.js @@ -17,7 +17,6 @@ OC.L10N.register( "sharing is disabled" : "Partajare este oprită", "Add to your ownCloud" : "Adaugă propriul tău ownCloud", "Download" : "Descarcă", - "Download %s" : "Descarcă %s", - "Remote Shares" : "Partajări de la distanță" + "Download %s" : "Descarcă %s" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json index 31b883d8193..c0ab9e366e2 100644 --- a/apps/files_sharing/l10n/ro.json +++ b/apps/files_sharing/l10n/ro.json @@ -15,7 +15,6 @@ "sharing is disabled" : "Partajare este oprită", "Add to your ownCloud" : "Adaugă propriul tău ownCloud", "Download" : "Descarcă", - "Download %s" : "Descarcă %s", - "Remote Shares" : "Partajări de la distanță" + "Download %s" : "Descarcă %s" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index eb788b1c36f..f6a24253590 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Добавить в свой ownCloud", "Download" : "Скачать", "Download %s" : "Скачать %s", - "Direct link" : "Прямая ссылка", - "Remote Shares" : "Удалённые общие папки", - "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере", - "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки" + "Direct link" : "Прямая ссылка" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index a31468bf36f..9eaf51586d4 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Добавить в свой ownCloud", "Download" : "Скачать", "Download %s" : "Скачать %s", - "Direct link" : "Прямая ссылка", - "Remote Shares" : "Удалённые общие папки", - "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере", - "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки" + "Direct link" : "Прямая ссылка" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index 42d7259df4f..a68ce01a721 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -32,9 +32,6 @@ OC.L10N.register( "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka", - "Remote Shares" : "Vzdialené úložiská", - "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera", - "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy" + "Direct link" : "Priama linka" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index 03853efa980..29470388f0f 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -30,9 +30,6 @@ "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka", - "Remote Shares" : "Vzdialené úložiská", - "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera", - "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy" + "Direct link" : "Priama linka" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 9466ea37f89..b9a3a00585c 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "Prejmi", "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", - "Remote Shares" : "Oddaljena souporaba", - "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika", - "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo" + "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik", + "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 2619904b50a..5e9290df487 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -32,8 +32,8 @@ "Download" : "Prejmi", "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", - "Remote Shares" : "Oddaljena souporaba", - "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika", - "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo" + "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik", + "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index f9e595f3406..ba1ecda864f 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -27,9 +27,6 @@ OC.L10N.register( "Add to your ownCloud" : "Lägg till i din ownCloud", "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", - "Direct link" : "Direkt länk", - "Remote Shares" : "Fjärrutdelningar Server-Server", - "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern", - "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar" + "Direct link" : "Direkt länk" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index c0763d3f384..fecdfd2bed8 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -25,9 +25,6 @@ "Add to your ownCloud" : "Lägg till i din ownCloud", "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", - "Direct link" : "Direkt länk", - "Remote Shares" : "Fjärrutdelningar Server-Server", - "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern", - "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar" + "Direct link" : "Direkt länk" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 919b615d239..7bbeefc9622 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -34,8 +34,8 @@ OC.L10N.register( "Download" : "İndir", "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", - "Remote Shares" : "Uzak Paylaşımlar", - "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver", - "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver" + "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı", + "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunucularda paylaşım almalarına izin ver" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index d7c4b7c7b7c..f91ab02288b 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -32,8 +32,8 @@ "Download" : "İndir", "Download %s" : "İndir: %s", "Direct link" : "Doğrudan bağlantı", - "Remote Shares" : "Uzak Paylaşımlar", - "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver", - "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver" + "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı", + "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunucularda paylaşım almalarına izin ver" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index fd5dacb564e..a41afdceb71 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -33,9 +33,6 @@ OC.L10N.register( "Add to your ownCloud" : "Додати до вашого ownCloud", "Download" : "Завантажити", "Download %s" : "Завантажити %s", - "Direct link" : "Пряме посилання", - "Remote Shares" : "Віддалені загальні теки", - "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері", - "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки" + "Direct link" : "Пряме посилання" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index 5ec57cdad12..a8d66aae2e9 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -31,9 +31,6 @@ "Add to your ownCloud" : "Додати до вашого ownCloud", "Download" : "Завантажити", "Download %s" : "Завантажити %s", - "Direct link" : "Пряме посилання", - "Remote Shares" : "Віддалені загальні теки", - "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері", - "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки" + "Direct link" : "Пряме посилання" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index b5cb43f6ce2..66c400d0cf0 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -31,9 +31,6 @@ OC.L10N.register( "Add to your ownCloud" : "添加到您的 ownCloud", "Download" : "下载", "Download %s" : "下载 %s", - "Direct link" : "直接链接", - "Remote Shares" : "远程分享", - "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接", - "Allow users to mount public link shares" : "允许用户挂载公共链接分享" + "Direct link" : "直接链接" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index 760a2807f5b..9169b33998b 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -29,9 +29,6 @@ "Add to your ownCloud" : "添加到您的 ownCloud", "Download" : "下载", "Download %s" : "下载 %s", - "Direct link" : "直接链接", - "Remote Shares" : "远程分享", - "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接", - "Allow users to mount public link shares" : "允许用户挂载公共链接分享" + "Direct link" : "直接链接" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js index 1ed3dc6aa47..9512b0ab87e 100644 --- a/apps/files_sharing/l10n/zh_TW.js +++ b/apps/files_sharing/l10n/zh_TW.js @@ -31,9 +31,6 @@ OC.L10N.register( "Add to your ownCloud" : "加入到你的 ownCloud", "Download" : "下載", "Download %s" : "下載 %s", - "Direct link" : "直接連結", - "Remote Shares" : "遠端分享", - "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享", - "Allow users to mount public link shares" : "允許使用者掛載公開分享" + "Direct link" : "直接連結" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json index 1dabacfdfd2..2065c00ff6d 100644 --- a/apps/files_sharing/l10n/zh_TW.json +++ b/apps/files_sharing/l10n/zh_TW.json @@ -29,9 +29,6 @@ "Add to your ownCloud" : "加入到你的 ownCloud", "Download" : "下載", "Download %s" : "下載 %s", - "Direct link" : "直接連結", - "Remote Shares" : "遠端分享", - "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享", - "Allow users to mount public link shares" : "允許使用者掛載公開分享" + "Direct link" : "直接連結" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 92d8f92b380..3f1d631a35f 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -198,12 +198,19 @@ class Storage extends DAV implements ISharedStorage { curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); - curl_setopt($ch, CURLOPT_CAINFO, $this->certificateManager->getCertificateBundle()); + $path = $this->certificateManager->getCertificateBundle(); + if (is_readable($path)) { + curl_setopt($ch, CURLOPT_CAINFO, $path); + } $result = curl_exec($ch); $status = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $errorMessage = curl_error($ch); curl_close($ch); + if (!empty($errorMessage)) { + throw new \Exception($errorMessage); + } switch ($status) { case 401: diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php index 4ad2d4e6b3e..a93ecfb3b1b 100644 --- a/apps/files_sharing/lib/sharedmount.php +++ b/apps/files_sharing/lib/sharedmount.php @@ -22,15 +22,15 @@ class SharedMount extends Mount implements MoveableMount { public function __construct($storage, $mountpoint, $arguments = null, $loader = null) { // first update the mount point before creating the parent - $newMountPoint = self::verifyMountPoint($arguments['share']); - $absMountPoint = '/' . \OCP\User::getUser() . '/files' . $newMountPoint; + $newMountPoint = $this->verifyMountPoint($arguments['share'], $arguments['user']); + $absMountPoint = '/' . $arguments['user'] . '/files' . $newMountPoint; parent::__construct($storage, $absMountPoint, $arguments, $loader); } /** * check if the parent folder exists otherwise move the mount point up */ - private static function verifyMountPoint(&$share) { + private function verifyMountPoint(&$share, $user) { $mountPoint = basename($share['file_target']); $parent = dirname($share['file_target']); @@ -42,7 +42,7 @@ class SharedMount extends Mount implements MoveableMount { $newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget( \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint), array(), - new \OC\Files\View('/' . \OCP\User::getUser() . '/files') + new \OC\Files\View('/' . $user . '/files') ); if($newMountPoint !== $share['file_target']) { diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 5ce15d9a012..19ee6085e47 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -397,7 +397,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { } public static function setup($options) { - $shares = \OCP\Share::getItemsSharedWith('file'); + $shares = \OCP\Share::getItemsSharedWithUser('file', $options['user']); $manager = Filesystem::getMountManager(); $loader = Filesystem::getLoader(); if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] @@ -411,7 +411,8 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage { $options['user_dir'] . '/' . $share['file_target'], array( 'share' => $share, - ), + 'user' => $options['user'] + ), $loader ); $manager->addMount($mount); diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php index 7c84f770fa6..c71ef31b21c 100644 --- a/apps/files_sharing/templates/settings-admin.php +++ b/apps/files_sharing/templates/settings-admin.php @@ -1,13 +1,21 @@ +<?php +/** @var OC_L10N $l */ +/** @var array $_ */ +?> <div class="section" id="fileSharingSettings" > - <h2><?php p($l->t('Remote Shares'));?></h2> + <h2><?php p($l->t('Server-to-Server Sharing'));?></h2> <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> - <label for="outgoingServer2serverShareEnabled"><?php p($l->t('Allow other instances to mount public links shared from this server'));?></label><br/> + <label for="outgoingServer2serverShareEnabled"> + <?php p($l->t('Allow users on this server to send shares to other servers'));?> + </label><br/> <input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> - <label for="incomingServer2serverShareEnabled"><?php p($l->t('Allow users to mount public link shares'));?></label><br/> + <label for="incomingServer2serverShareEnabled"> + <?php p($l->t('Allow users on this server to receive shares from other servers'));?> + </label><br/> </div> diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 88acbd8e775..453133fee31 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -35,6 +35,9 @@ class Test_Files_Sharing_Api extends TestCase { function setUp() { parent::setUp(); + \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no'); + \OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '7'); + $this->folder = self::TEST_FOLDER_NAME; $this->subfolder = '/subfolder_share_api_test'; $this->subsubfolder = '/subsubfolder_share_api_test'; diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js index 41c8a1f05d8..812f30d75db 100644 --- a/apps/files_sharing/tests/js/sharedfilelistSpec.js +++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js @@ -551,4 +551,89 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.find('.nametext').text().trim()).toEqual('local name.txt'); }); }); + describe('setting share permissions for files', function () { + beforeEach(function () { + + var $content = $('<div id="content"></div>'); + $('#testArea').append($content); + // dummy file list + var $div = $( + '<div>' + + '<table id="filestable">' + + '<thead></thead>' + + '<tbody id="fileList"></tbody>' + + '</table>' + + '</div>'); + $('#content').append($div); + + fileList = new OCA.Files.FileList( + $div, { + fileActions: fileActions + } + ); + }); + + it('external storage root folder', function () { + var $tr; + OC.Share.statuses = {1: {link: false, path: '/subdir'}}; + fileList.setFiles([{ + id: 1, + type: 'dir', + name: 'One.txt', + path: '/subdir', + mimetype: 'text/plain', + size: 12, + permissions: OC.PERMISSION_READ, + etag: 'abc', + shareOwner: 'User One', + recipients: 'User Two', + mountType: 'external-root' + }]); + $tr = fileList.$el.find('tr:first'); + + expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE); + }); + + it('external storage root folder reshare', function () { + var $tr; + OC.Share.statuses = {1: {link: false, path: '/subdir'}}; + fileList.setFiles([{ + id: 1, + type: 'dir', + name: 'One.txt', + path: '/subdir', + mimetype: 'text/plain', + size: 12, + permissions: OC.PERMISSION_READ + OC.PERMISSION_SHARE, + etag: 'abc', + shareOwner: 'User One', + recipients: 'User Two', + mountType: 'external-root' + }]); + $tr = fileList.$el.find('tr:first'); + + expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL); + }); + + it('external storage root folder file', function () { + var $tr; + OC.Share.statuses = {1: {link: false, path: '/subdir'}}; + fileList.setFiles([{ + id: 1, + type: 'file', + name: 'One.txt', + path: '/subdir', + mimetype: 'text/plain', + size: 12, + permissions: OC.PERMISSION_READ, + etag: 'abc', + shareOwner: 'User One', + recipients: 'User Two', + mountType: 'external-root' + }]); + $tr = fileList.$el.find('tr:first'); + + expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE); + }); + }); }); diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index e991d381e14..6d155f174ba 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -226,6 +226,10 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { } class DummyTestClassSharedMount extends \OCA\Files_Sharing\SharedMount { + public function __construct($storage, $mountpoint, $arguments = null, $loader = null){ + // noop + } + public function stripUserFilesPathDummy($path) { return $this->stripUserFilesPath($path); } diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index b106add1300..ab15e8fe3ba 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -197,4 +197,30 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { $this->assertTrue($result); } + function testMountSharesOtherUser() { + $folderInfo = $this->view->getFileInfo($this->folder); + $fileInfo = $this->view->getFileInfo($this->filename); + $rootView = new \OC\Files\View(''); + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + + // share 2 different files with 2 different users + \OCP\Share::shareItem('folder', $folderInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER2, 31); + \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER3, 31); + + self::loginHelper(self::TEST_FILES_SHARING_API_USER2); + $this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->folder)); + OC_Hook::emit('OC_Filesystem', 'setup', array('user' => self::TEST_FILES_SHARING_API_USER3, 'user_dir' => \OC_User::getHome(self::TEST_FILES_SHARING_API_USER3))); + + $this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER3 . '/files/' . $this->filename)); + + // make sure we didn't double setup shares for user 2 or mounted the shares for user 3 in user's 2 home + $this->assertFalse($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->folder .' (2)')); + $this->assertFalse($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->filename)); + + //cleanup + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $this->view->unlink($this->folder); + } } diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index a098feb550d..78277dc907f 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -65,13 +65,21 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); // create users - self::loginHelper(self::TEST_FILES_SHARING_API_USER1, true); - self::loginHelper(self::TEST_FILES_SHARING_API_USER2, true); - self::loginHelper(self::TEST_FILES_SHARING_API_USER3, true); + $backend = new \OC_User_Dummy(); + \OC_User::useBackend($backend); + $backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1); + $backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2); + $backend->createUser(self::TEST_FILES_SHARING_API_USER3, self::TEST_FILES_SHARING_API_USER3); // create group - \OC_Group::createGroup(self::TEST_FILES_SHARING_API_GROUP1); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1); + $groupBackend = new \OC_Group_Dummy(); + $groupBackend->createGroup(self::TEST_FILES_SHARING_API_GROUP1); + $groupBackend->createGroup('group'); + $groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER1, 'group'); + $groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, 'group'); + $groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER3, 'group'); + $groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1); + \OC_Group::useBackend($groupBackend); } diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index a2302802649..72553fa0ee0 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -2,6 +2,8 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +\OC::$server->getSession()->close(); + $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; // "empty trash" command diff --git a/apps/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php index 2e54c7e77b9..897ee262895 100644 --- a/apps/files_trashbin/ajax/isEmpty.php +++ b/apps/files_trashbin/ajax/isEmpty.php @@ -6,6 +6,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +\OC::$server->getSession()->close(); $trashStatus = OCA\Files_Trashbin\Trashbin::isEmpty(OCP\User::getUser()); diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php index 6cad101d34a..e25301a26cb 100644 --- a/apps/files_trashbin/ajax/list.php +++ b/apps/files_trashbin/ajax/list.php @@ -1,6 +1,7 @@ <?php OCP\JSON::checkLoggedIn(); +\OC::$server->getSession()->close(); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index 32905b2a71c..1401e3b7a7d 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -6,6 +6,7 @@ * See the COPYING-README file. */ \OC_Util::checkLoggedIn(); +\OC::$server->getSession()->close(); if(!\OC_App::isEnabled('files_trashbin')){ exit; diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 02d651925ca..ab7d57f5a7f 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -2,6 +2,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +\OC::$server->getSession()->close(); $files = $_POST['files']; $dir = '/'; diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 3d90791108e..52d24143902 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -933,7 +933,7 @@ class Trashbin { //force rescan of versions, local storage may not have updated the cache /** @var \OC\Files\Storage\Storage $storage */ list($storage, ) = $view->resolvePath('/'); - $storage->getScanner()->scan(''); + $storage->getScanner()->scan('files_trashbin'); if ($timestamp) { // fetch for old versions diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 1a584232ba7..53980463120 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -16,12 +16,14 @@ class Hooks { public static function connectHooks() { // Listen to write signals - \OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook"); + \OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook'); // Listen to delete and rename signals - \OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook"); - \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Versions\Hooks", "pre_remove_hook"); - \OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook"); - \OCP\Util::connectHook('OC_Filesystem', 'copy', "OCA\Files_Versions\Hooks", "copy_hook"); + \OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook'); + \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook'); + \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook'); + \OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook'); + \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook'); + \OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook'); } /** @@ -102,4 +104,35 @@ class Hooks { } } + /** + * Remember owner and the owner path of the source file. + * If the file already exists, then it was a upload of a existing file + * over the web interface and we call Storage::store() directly + * + * @param array $params array with oldpath and newpath + * + */ + public static function pre_renameOrCopy_hook($params) { + if (\OCP\App::isEnabled('files_versions')) { + + // if we rename a movable mount point, then the versions don't have + // to be renamed + $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']); + $manager = \OC\Files\Filesystem::getMountManager(); + $mount = $manager->find($absOldPath); + $internalPath = $mount->getInternalPath($absOldPath); + if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) { + return; + } + + $view = new \OC\Files\View(\OCP\User::getUser() . '/files'); + if ($view->file_exists($params['newpath'])) { + Storage::store($params['newpath']); + } else { + Storage::setSourcePathAndUser($params['oldpath']); + } + + } + } + } diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index bdb26896948..82e0ecc3e2f 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -24,6 +24,8 @@ class Storage { // files for which we can remove the versions after the delete operation was successful private static $deletedFiles = array(); + private static $sourcePathAndUser = array(); + private static $max_versions_per_interval = array( //first 10sec, one version every 2sec 1 => array('intervalEndsAfter' => 10, 'step' => 2), @@ -51,6 +53,34 @@ class Storage { } /** + * Remember the owner and the owner path of the source file + * + * @param string $source source path + */ + public static function setSourcePathAndUser($source) { + list($uid, $path) = self::getUidAndFilename($source); + self::$sourcePathAndUser[$source] = array('uid' => $uid, 'path' => $path); + } + + /** + * Gets the owner and the owner path from the source path + * + * @param string $source source path + * @return array with user id and path + */ + public static function getSourcePathAndUser($source) { + + if (isset(self::$sourcePathAndUser[$source])) { + $uid = self::$sourcePathAndUser[$source]['uid']; + $path = self::$sourcePathAndUser[$source]['path']; + unset(self::$sourcePathAndUser[$source]); + } else { + $uid = $path = false; + } + return array($uid, $path); + } + + /** * get current size of all versions from a given user * * @param string $user user who owns the versions @@ -180,16 +210,20 @@ class Storage { * @param string $operation can be 'copy' or 'rename' */ public static function renameOrCopy($old_path, $new_path, $operation) { - list($uid, $oldpath) = self::getUidAndFilename($old_path); + list($uid, $oldpath) = self::getSourcePathAndUser($old_path); + + // it was a upload of a existing file if no old path exists + // in this case the pre-hook already called the store method and we can + // stop here + if ($oldpath === false) { + return true; + } + list($uidn, $newpath) = self::getUidAndFilename($new_path); $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); $files_view = new \OC\Files\View('/'.$uid .'/files'); - // if the file already exists than it was a upload of a existing file - // over the web interface -> store() is the right function we need here - if ($files_view->file_exists($newpath)) { - return self::store($new_path); - } + if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->$operation($oldpath, $newpath); diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index 4909d0606b1..a3b8595a34b 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -30,6 +30,7 @@ require_once __DIR__ . '/../lib/versions.php'; class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { const TEST_VERSIONS_USER = 'test-versions-user'; + const TEST_VERSIONS_USER2 = 'test-versions-user2'; const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions'; /** @@ -38,13 +39,22 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { private $rootView; public static function setUpBeforeClass() { + + // clear share hooks + \OC_Hook::clear('OCP\\Share'); + \OC::registerShareHooks(); + \OCA\Files_Versions\Hooks::connectHooks(); + \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); + // create test user + self::loginHelper(self::TEST_VERSIONS_USER2, true); self::loginHelper(self::TEST_VERSIONS_USER, true); } public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(self::TEST_VERSIONS_USER); + \OC_User::deleteUser(self::TEST_VERSIONS_USER2); } function setUp() { @@ -225,7 +235,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { $this->rootView->file_put_contents($v2, 'version2'); // execute rename hook of versions app - \OCA\Files_Versions\Storage::renameOrCopy("test.txt", "test2.txt", 'rename'); + \OC\Files\Filesystem::rename("test.txt", "test2.txt"); $this->assertFalse($this->rootView->file_exists($v1)); $this->assertFalse($this->rootView->file_exists($v2)); @@ -237,6 +247,93 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('test2.txt'); } + function testRenameInSharedFolder() { + + \OC\Files\Filesystem::mkdir('folder1'); + \OC\Files\Filesystem::mkdir('folder1/folder2'); + \OC\Files\Filesystem::file_put_contents("folder1/test.txt", "test file"); + + $fileInfo = \OC\Files\Filesystem::getFileInfo('folder1'); + + $t1 = time(); + // second version is two weeks older, this way we make sure that no + // version will be expired + $t2 = $t1 - 60 * 60 * 24 * 14; + + $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1'); + // create some versions + $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1; + $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2; + $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1; + $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2; + + $this->rootView->file_put_contents($v1, 'version1'); + $this->rootView->file_put_contents($v2, 'version2'); + + \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL); + + self::loginHelper(self::TEST_VERSIONS_USER2); + + $this->assertTrue(\OC\Files\Filesystem::file_exists('folder1/test.txt')); + + // execute rename hook of versions app + \OC\Files\Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt'); + + self::loginHelper(self::TEST_VERSIONS_USER2); + + $this->assertFalse($this->rootView->file_exists($v1)); + $this->assertFalse($this->rootView->file_exists($v2)); + + $this->assertTrue($this->rootView->file_exists($v1Renamed)); + $this->assertTrue($this->rootView->file_exists($v2Renamed)); + + //cleanup + \OC\Files\Filesystem::unlink('/folder1/folder2/test.txt'); + } + + function testRenameSharedFile() { + + \OC\Files\Filesystem::file_put_contents("test.txt", "test file"); + + $fileInfo = \OC\Files\Filesystem::getFileInfo('test.txt'); + + $t1 = time(); + // second version is two weeks older, this way we make sure that no + // version will be expired + $t2 = $t1 - 60 * 60 * 24 * 14; + + $this->rootView->mkdir(self::USERS_VERSIONS_ROOT); + // create some versions + $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1; + $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2; + // the renamed versions should not exist! Because we only moved the mount point! + $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1; + $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2; + + $this->rootView->file_put_contents($v1, 'version1'); + $this->rootView->file_put_contents($v2, 'version2'); + + \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL); + + self::loginHelper(self::TEST_VERSIONS_USER2); + + $this->assertTrue(\OC\Files\Filesystem::file_exists('test.txt')); + + // execute rename hook of versions app + \OC\Files\Filesystem::rename('test.txt', 'test2.txt'); + + self::loginHelper(self::TEST_VERSIONS_USER); + + $this->assertTrue($this->rootView->file_exists($v1)); + $this->assertTrue($this->rootView->file_exists($v2)); + + $this->assertFalse($this->rootView->file_exists($v1Renamed)); + $this->assertFalse($this->rootView->file_exists($v2Renamed)); + + //cleanup + \OC\Files\Filesystem::unlink('/test.txt'); + } + function testCopy() { \OC\Files\Filesystem::file_put_contents("test.txt", "test file"); @@ -256,7 +353,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { $this->rootView->file_put_contents($v2, 'version2'); // execute copy hook of versions app - \OCA\Files_Versions\Storage::renameOrCopy("test.txt", "test2.txt", 'copy'); + \OC\Files\Filesystem::copy("test.txt", "test2.txt"); $this->assertTrue($this->rootView->file_exists($v1)); $this->assertTrue($this->rootView->file_exists($v2)); diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index 639597fdb83..f65b9773388 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -10,3 +10,4 @@ $application->add(new OCA\user_ldap\Command\ShowConfig()); $application->add(new OCA\user_ldap\Command\SetConfig()); $application->add(new OCA\user_ldap\Command\TestConfig()); $application->add(new OCA\user_ldap\Command\CreateEmptyConfig()); +$application->add(new OCA\user_ldap\Command\DeleteConfig()); diff --git a/apps/user_ldap/command/deleteconfig.php b/apps/user_ldap/command/deleteconfig.php new file mode 100644 index 00000000000..f8b834a6465 --- /dev/null +++ b/apps/user_ldap/command/deleteconfig.php @@ -0,0 +1,44 @@ +<?php +/** + * Copyright (c) 2014 Martin Konrad <info@martin-konrad.net> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCA\user_ldap\Command; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; +use \OCA\user_ldap\lib\Helper; + +class DeleteConfig extends Command { + + protected function configure() { + $this + ->setName('ldap:delete-config') + ->setDescription('deletes an existing LDAP configuration') + ->addArgument( + 'configID', + InputArgument::REQUIRED, + 'the configuration ID' + ) + ; + } + + + protected function execute(InputInterface $input, OutputInterface $output) { + $configPrefix = $input->getArgument('configID');; + + $success = Helper::deleteServerConfiguration($configPrefix); + + if($success) { + $output->writeln("Deleted configuration with configID '{$configPrefix}'"); + } else { + $output->writeln("Cannot delete configuration with configID '{$configPrefix}'"); + } + } +} diff --git a/apps/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js index e6f45803985..91e48905138 100644 --- a/apps/user_ldap/l10n/bg_BG.js +++ b/apps/user_ldap/l10n/bg_BG.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Записване", "Back" : "Назад", "Continue" : "Продължи", + "LDAP" : "LDAP", "Expert" : "Експерт", "Advanced" : "Допълнителни", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.", diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json index f29aff72266..19ee8da4b33 100644 --- a/apps/user_ldap/l10n/bg_BG.json +++ b/apps/user_ldap/l10n/bg_BG.json @@ -74,6 +74,7 @@ "Saving" : "Записване", "Back" : "Назад", "Continue" : "Продължи", + "LDAP" : "LDAP", "Expert" : "Експерт", "Advanced" : "Допълнителни", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.", diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js index abfa8433593..017b4f37e39 100644 --- a/apps/user_ldap/l10n/cs_CZ.js +++ b/apps/user_ldap/l10n/cs_CZ.js @@ -69,13 +69,14 @@ OC.L10N.register( "One Base DN per line" : "Jedna základní DN na řádku", "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", - "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)", + "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "users found" : "nalezení uživatelé", "Saving" : "Ukládá se", "Back" : "Zpět", "Continue" : "Pokračovat", + "LDAP" : "LDAP", "Expert" : "Expertní", "Advanced" : "Pokročilé", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.", diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json index f8e76205cae..b63a3fb11ff 100644 --- a/apps/user_ldap/l10n/cs_CZ.json +++ b/apps/user_ldap/l10n/cs_CZ.json @@ -67,13 +67,14 @@ "One Base DN per line" : "Jedna základní DN na řádku", "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", - "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)", + "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "users found" : "nalezení uživatelé", "Saving" : "Ukládá se", "Back" : "Zpět", "Continue" : "Pokračovat", + "LDAP" : "LDAP", "Expert" : "Expertní", "Advanced" : "Pokročilé", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.", diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js index 53af1a4fc2b..91bce8c777e 100644 --- a/apps/user_ldap/l10n/da.js +++ b/apps/user_ldap/l10n/da.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Gemmer", "Back" : "Tilbage", "Continue" : "Videre", + "LDAP" : "LDAP", "Expert" : "Ekspert", "Advanced" : "Avanceret", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.", diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json index c4076aa148c..97d0c0ca403 100644 --- a/apps/user_ldap/l10n/da.json +++ b/apps/user_ldap/l10n/da.json @@ -74,6 +74,7 @@ "Saving" : "Gemmer", "Back" : "Tilbage", "Continue" : "Videre", + "LDAP" : "LDAP", "Expert" : "Ekspert", "Advanced" : "Avanceret", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 6dc30ad80d3..94f388b0df4 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Speichern", "Back" : "Zurück", "Continue" : "Fortsetzen", + "LDAP" : "LDAP", "Expert" : "Experte", "Advanced" : "Fortgeschritten", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index 4603f75f6f8..f3524664fc1 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -74,6 +74,7 @@ "Saving" : "Speichern", "Back" : "Zurück", "Continue" : "Fortsetzen", + "LDAP" : "LDAP", "Expert" : "Experte", "Advanced" : "Fortgeschritten", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index 3340511770e..3cefc2ec625 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Speichern", "Back" : "Zurück", "Continue" : "Fortsetzen", + "LDAP" : "LDAP", "Expert" : "Experte", "Advanced" : "Fortgeschritten", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 94be87f17ee..cf823ca29d4 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -74,6 +74,7 @@ "Saving" : "Speichern", "Back" : "Zurück", "Continue" : "Fortsetzen", + "LDAP" : "LDAP", "Expert" : "Experte", "Advanced" : "Fortgeschritten", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js index 8018ea00766..daa557ac2f2 100644 --- a/apps/user_ldap/l10n/el.js +++ b/apps/user_ldap/l10n/el.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Αποθήκευση", "Back" : "Επιστροφή", "Continue" : "Συνέχεια", + "LDAP" : "LDAP", "Expert" : "Ειδικός", "Advanced" : "Για προχωρημένους", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json index bd8b6aa6170..717e2a686b7 100644 --- a/apps/user_ldap/l10n/el.json +++ b/apps/user_ldap/l10n/el.json @@ -74,6 +74,7 @@ "Saving" : "Αποθήκευση", "Back" : "Επιστροφή", "Continue" : "Συνέχεια", + "LDAP" : "LDAP", "Expert" : "Ειδικός", "Advanced" : "Για προχωρημένους", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 851beced763..d87ce836807 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Saving", "Back" : "Back", "Continue" : "Continue", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Advanced", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index d97bd5aea25..8fd6ed30d4f 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -74,6 +74,7 @@ "Saving" : "Saving", "Back" : "Back", "Continue" : "Continue", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Advanced", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index a222523d43f..172d32c9092 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Guardando", "Back" : "Atrás", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Experto", "Advanced" : "Avanzado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index fc418992bd2..b0308c4cbaf 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -74,6 +74,7 @@ "Saving" : "Guardando", "Back" : "Atrás", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Experto", "Advanced" : "Avanzado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js index 7ff4b4564b3..6208c0fa697 100644 --- a/apps/user_ldap/l10n/et_EE.js +++ b/apps/user_ldap/l10n/et_EE.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Salvestamine", "Back" : "Tagasi", "Continue" : "Jätka", + "LDAP" : "LDAP", "Expert" : "Ekspert", "Advanced" : "Täpsem", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.", diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json index 41b5f73f575..81286459007 100644 --- a/apps/user_ldap/l10n/et_EE.json +++ b/apps/user_ldap/l10n/et_EE.json @@ -74,6 +74,7 @@ "Saving" : "Salvestamine", "Back" : "Tagasi", "Continue" : "Jätka", + "LDAP" : "LDAP", "Expert" : "Ekspert", "Advanced" : "Täpsem", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.", diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js index a77da009fc8..037708dc637 100644 --- a/apps/user_ldap/l10n/fi_FI.js +++ b/apps/user_ldap/l10n/fi_FI.js @@ -43,6 +43,7 @@ OC.L10N.register( "users found" : "käyttäjää löytynyt", "Back" : "Takaisin", "Continue" : "Jatka", + "LDAP" : "LDAP", "Advanced" : "Lisäasetukset", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.", "Connection Settings" : "Yhteysasetukset", diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json index a8bf945741e..335f13bd093 100644 --- a/apps/user_ldap/l10n/fi_FI.json +++ b/apps/user_ldap/l10n/fi_FI.json @@ -41,6 +41,7 @@ "users found" : "käyttäjää löytynyt", "Back" : "Takaisin", "Continue" : "Jatka", + "LDAP" : "LDAP", "Advanced" : "Lisäasetukset", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.", "Connection Settings" : "Yhteysasetukset", diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js index 2433d051d83..3736ade73ce 100644 --- a/apps/user_ldap/l10n/fr.js +++ b/apps/user_ldap/l10n/fr.js @@ -56,7 +56,7 @@ OC.L10N.register( "Other Attributes:" : "Autres attributs :", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"", "1. Server" : "1. Serveur", - "%s. Server:" : "%s. Serveur:", + "%s. Server:" : "%s. Serveur :", "Add Server Configuration" : "Ajouter une configuration du serveur", "Delete Configuration" : "Suppression de la configuration", "Host" : "Hôte", @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Enregistrement...", "Back" : "Retour", "Continue" : "Poursuivre", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Avancé", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.", @@ -107,7 +108,7 @@ OC.L10N.register( "Group Search Attributes" : "Recherche des attributs du groupe", "Group-Member association" : "Association groupe-membre", "Nested Groups" : "Groupes imbriqués", - "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", + "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", "Paging chunksize" : "Dimensionnement des paginations", "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)", "Special Attributes" : "Attributs spéciaux", @@ -119,7 +120,7 @@ OC.L10N.register( "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ", "Internal Username" : "Nom d'utilisateur interne", "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.", - "Internal Username Attribute:" : "Nom d'utilisateur interne:", + "Internal Username Attribute:" : "Nom d'utilisateur interne :", "Override UUID detection" : "Surcharger la détection d'UUID", "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.", "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :", diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json index 11a4844add6..58ac6f3d248 100644 --- a/apps/user_ldap/l10n/fr.json +++ b/apps/user_ldap/l10n/fr.json @@ -54,7 +54,7 @@ "Other Attributes:" : "Autres attributs :", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"", "1. Server" : "1. Serveur", - "%s. Server:" : "%s. Serveur:", + "%s. Server:" : "%s. Serveur :", "Add Server Configuration" : "Ajouter une configuration du serveur", "Delete Configuration" : "Suppression de la configuration", "Host" : "Hôte", @@ -74,6 +74,7 @@ "Saving" : "Enregistrement...", "Back" : "Retour", "Continue" : "Poursuivre", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Avancé", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.", @@ -105,7 +106,7 @@ "Group Search Attributes" : "Recherche des attributs du groupe", "Group-Member association" : "Association groupe-membre", "Nested Groups" : "Groupes imbriqués", - "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", + "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).", "Paging chunksize" : "Dimensionnement des paginations", "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)", "Special Attributes" : "Attributs spéciaux", @@ -117,7 +118,7 @@ "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ", "Internal Username" : "Nom d'utilisateur interne", "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.", - "Internal Username Attribute:" : "Nom d'utilisateur interne:", + "Internal Username Attribute:" : "Nom d'utilisateur interne :", "Override UUID detection" : "Surcharger la détection d'UUID", "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.", "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :", diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js index cf5f37c5efb..26ca061c71a 100644 --- a/apps/user_ldap/l10n/id.js +++ b/apps/user_ldap/l10n/id.js @@ -72,6 +72,7 @@ OC.L10N.register( "Saving" : "Menyimpan", "Back" : "Kembali", "Continue" : "Lanjutkan", + "LDAP" : "LDAP", "Expert" : "Lanjutan", "Advanced" : "Lanjutan", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.", @@ -87,11 +88,13 @@ OC.L10N.register( "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache", "Directory Settings" : "Pengaturan Direktori", "User Display Name Field" : "Bidang Tampilan Nama Pengguna", + "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan pengguna.", "Base User Tree" : "Pohon Pengguna Dasar", "One User Base DN per line" : "Satu Pengguna Base DN per baris", "User Search Attributes" : "Atribut Pencarian Pengguna", "Optional; one attribute per line" : "Pilihan; satu atribut per baris", "Group Display Name Field" : "Bidang Tampilan Nama Grup", + "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan grup.", "Base Group Tree" : "Pohon Grup Dasar", "One Group Base DN per line" : "Satu Grup Base DN per baris", "Group Search Attributes" : "Atribut Pencarian Grup", @@ -102,6 +105,11 @@ OC.L10N.register( "in bytes" : "dalam bytes", "Email Field" : "Bidang Email", "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna", - "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD." + "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", + "Internal Username" : "Nama Pengguna Internal", + "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:", + "Override UUID detection" : "Timpa deteksi UUID", + "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:", + "UUID Attribute for Groups:" : "Atribut UUID untuk Grup:" }, "nplurals=1; plural=0;"); diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json index 2395e7f2a55..ad650fc0fb9 100644 --- a/apps/user_ldap/l10n/id.json +++ b/apps/user_ldap/l10n/id.json @@ -70,6 +70,7 @@ "Saving" : "Menyimpan", "Back" : "Kembali", "Continue" : "Lanjutkan", + "LDAP" : "LDAP", "Expert" : "Lanjutan", "Advanced" : "Lanjutan", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.", @@ -85,11 +86,13 @@ "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache", "Directory Settings" : "Pengaturan Direktori", "User Display Name Field" : "Bidang Tampilan Nama Pengguna", + "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan pengguna.", "Base User Tree" : "Pohon Pengguna Dasar", "One User Base DN per line" : "Satu Pengguna Base DN per baris", "User Search Attributes" : "Atribut Pencarian Pengguna", "Optional; one attribute per line" : "Pilihan; satu atribut per baris", "Group Display Name Field" : "Bidang Tampilan Nama Grup", + "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan grup.", "Base Group Tree" : "Pohon Grup Dasar", "One Group Base DN per line" : "Satu Grup Base DN per baris", "Group Search Attributes" : "Atribut Pencarian Grup", @@ -100,6 +103,11 @@ "in bytes" : "dalam bytes", "Email Field" : "Bidang Email", "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna", - "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD." + "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", + "Internal Username" : "Nama Pengguna Internal", + "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:", + "Override UUID detection" : "Timpa deteksi UUID", + "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:", + "UUID Attribute for Groups:" : "Atribut UUID untuk Grup:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js index 1ec979a1fee..92bab544984 100644 --- a/apps/user_ldap/l10n/it.js +++ b/apps/user_ldap/l10n/it.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Salvataggio", "Back" : "Indietro", "Continue" : "Continua", + "LDAP" : "LDAP", "Expert" : "Esperto", "Advanced" : "Avanzate", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.", diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json index f99c2c86185..31a694a4b1c 100644 --- a/apps/user_ldap/l10n/it.json +++ b/apps/user_ldap/l10n/it.json @@ -74,6 +74,7 @@ "Saving" : "Salvataggio", "Back" : "Indietro", "Continue" : "Continua", + "LDAP" : "LDAP", "Expert" : "Esperto", "Advanced" : "Avanzate", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.", diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js index e48417ca85c..6494fbb5142 100644 --- a/apps/user_ldap/l10n/ja.js +++ b/apps/user_ldap/l10n/ja.js @@ -48,6 +48,7 @@ OC.L10N.register( "Edit raw filter instead" : "フィルタを編集", "Raw LDAP filter" : "LDAP フィルタ", "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。", + "Test Filter" : "フィルターをテスト", "groups found" : "グループが見つかりました", "Users login with this attribute:" : "この属性でユーザーログイン:", "LDAP Username:" : "LDAPユーザー名:", @@ -67,11 +68,15 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。", "One Base DN per line" : "1行に1つのベースDN", "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。", + "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:", "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。", "users found" : "ユーザーが見つかりました", + "Saving" : "保存中", "Back" : "戻る", "Continue" : "続ける", + "LDAP" : "LDAP", "Expert" : "エキスパート設定", "Advanced" : "詳細設定", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。", diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json index 0f8538d333f..2e714112f19 100644 --- a/apps/user_ldap/l10n/ja.json +++ b/apps/user_ldap/l10n/ja.json @@ -46,6 +46,7 @@ "Edit raw filter instead" : "フィルタを編集", "Raw LDAP filter" : "LDAP フィルタ", "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。", + "Test Filter" : "フィルターをテスト", "groups found" : "グループが見つかりました", "Users login with this attribute:" : "この属性でユーザーログイン:", "LDAP Username:" : "LDAPユーザー名:", @@ -65,11 +66,15 @@ "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。", "One Base DN per line" : "1行に1つのベースDN", "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。", + "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:", "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。", "users found" : "ユーザーが見つかりました", + "Saving" : "保存中", "Back" : "戻る", "Continue" : "続ける", + "LDAP" : "LDAP", "Expert" : "エキスパート設定", "Advanced" : "詳細設定", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。", diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index c74584f7512..e448b161f00 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Opslaan", "Back" : "Terug", "Continue" : "Verder", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Geavanceerd", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.", @@ -94,7 +95,7 @@ OC.L10N.register( "Cache Time-To-Live" : "Cache time-to-live", "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.", "Directory Settings" : "Mapinstellingen", - "User Display Name Field" : "Gebruikers Schermnaam Veld", + "User Display Name Field" : "Veld gebruikers weergavenaam", "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.", "Base User Tree" : "Basis Gebruikers Structuur", "One User Base DN per line" : "Een User Base DN per regel", @@ -102,7 +103,7 @@ OC.L10N.register( "Optional; one attribute per line" : "Optioneel; één attribuut per regel", "Group Display Name Field" : "Groep Schermnaam Veld", "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.", - "Base Group Tree" : "Basis Groupen Structuur", + "Base Group Tree" : "Basis groepsstructuur", "One Group Base DN per line" : "Een Group Base DN per regel", "Group Search Attributes" : "Attributen voor groepszoekopdrachten", "Group-Member association" : "Groepslid associatie", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index af6246ba39d..eb1eecf8201 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -74,6 +74,7 @@ "Saving" : "Opslaan", "Back" : "Terug", "Continue" : "Verder", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Geavanceerd", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.", @@ -92,7 +93,7 @@ "Cache Time-To-Live" : "Cache time-to-live", "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.", "Directory Settings" : "Mapinstellingen", - "User Display Name Field" : "Gebruikers Schermnaam Veld", + "User Display Name Field" : "Veld gebruikers weergavenaam", "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.", "Base User Tree" : "Basis Gebruikers Structuur", "One User Base DN per line" : "Een User Base DN per regel", @@ -100,7 +101,7 @@ "Optional; one attribute per line" : "Optioneel; één attribuut per regel", "Group Display Name Field" : "Groep Schermnaam Veld", "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.", - "Base Group Tree" : "Basis Groupen Structuur", + "Base Group Tree" : "Basis groepsstructuur", "One Group Base DN per line" : "Een Group Base DN per regel", "Group Search Attributes" : "Attributen voor groepszoekopdrachten", "Group-Member association" : "Groepslid associatie", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index dfd1981390c..32b7697df3e 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Salvando", "Back" : "Voltar", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Especialista", "Advanced" : "Avançado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.", diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index 694d350feba..ea59ed7b4d8 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -74,6 +74,7 @@ "Saving" : "Salvando", "Back" : "Voltar", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Especialista", "Advanced" : "Avançado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 98fe1d16e00..0f4b3d11bed 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Guardando", "Back" : "Voltar", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Perito", "Advanced" : "Avançado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 1bcbfe018bf..9c753884160 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -74,6 +74,7 @@ "Saving" : "Guardando", "Back" : "Voltar", "Continue" : "Continuar", + "LDAP" : "LDAP", "Expert" : "Perito", "Advanced" : "Avançado", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.", diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index dd60f9c9907..e6a7b32d003 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -48,6 +48,7 @@ OC.L10N.register( "Edit raw filter instead" : "Редактировать исходный фильтр", "Raw LDAP filter" : "Исходный LDAP фильтр", "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.", + "Test Filter" : "Проверить фильтр", "groups found" : "групп найдено", "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:", "LDAP Username:" : "Имя пользователя LDAP", @@ -67,11 +68,15 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.", "One Base DN per line" : "По одной базе поиска (Base DN) в строке.", "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.", + "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.", "users found" : "пользователей найдено", + "Saving" : "Сохраняется", "Back" : "Назад", "Continue" : "Продолжить", + "LDAP" : "LDAP", "Expert" : "Эксперт", "Advanced" : "Дополнительно", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index 065ea2f2d05..fe160aa035d 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -46,6 +46,7 @@ "Edit raw filter instead" : "Редактировать исходный фильтр", "Raw LDAP filter" : "Исходный LDAP фильтр", "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.", + "Test Filter" : "Проверить фильтр", "groups found" : "групп найдено", "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:", "LDAP Username:" : "Имя пользователя LDAP", @@ -65,11 +66,15 @@ "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.", "One Base DN per line" : "По одной базе поиска (Base DN) в строке.", "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.", + "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.", "users found" : "пользователей найдено", + "Saving" : "Сохраняется", "Back" : "Назад", "Continue" : "Продолжить", + "LDAP" : "LDAP", "Expert" : "Эксперт", "Advanced" : "Дополнительно", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js index 9a15db6bb81..3c3f9a0cc83 100644 --- a/apps/user_ldap/l10n/sk_SK.js +++ b/apps/user_ldap/l10n/sk_SK.js @@ -48,6 +48,7 @@ OC.L10N.register( "Edit raw filter instead" : "Miesto pre úpravu raw filtra", "Raw LDAP filter" : "Raw LDAP filter", "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.", + "Test Filter" : "Otestovať filter", "groups found" : "nájdené skupiny", "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:", "LDAP Username:" : "LDAP používateľské meno:", @@ -67,11 +68,15 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.", "One Base DN per line" : "Jedno základné DN na riadok", "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.", + "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)", "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:", "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.", "users found" : "nájdení používatelia", + "Saving" : "Ukladá sa", "Back" : "Späť", "Continue" : "Pokračovať", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Rozšírené", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.", diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json index 2baab6b88b1..ff881a68803 100644 --- a/apps/user_ldap/l10n/sk_SK.json +++ b/apps/user_ldap/l10n/sk_SK.json @@ -46,6 +46,7 @@ "Edit raw filter instead" : "Miesto pre úpravu raw filtra", "Raw LDAP filter" : "Raw LDAP filter", "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.", + "Test Filter" : "Otestovať filter", "groups found" : "nájdené skupiny", "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:", "LDAP Username:" : "LDAP používateľské meno:", @@ -65,11 +66,15 @@ "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.", "One Base DN per line" : "Jedno základné DN na riadok", "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny", + "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.", + "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)", "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:", "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.", "users found" : "nájdení používatelia", + "Saving" : "Ukladá sa", "Back" : "Späť", "Continue" : "Pokračovať", + "LDAP" : "LDAP", "Expert" : "Expert", "Advanced" : "Rozšírené", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index f7fd2772fe8..1437afcf5ba 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", + "LDAP" : "LDAP", "Expert" : "Napredno", "Advanced" : "Napredne možnosti", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Opozorilo:</b> določili user_ldap in user_webdavauth sta neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index aa1c9444651..56bf65210c3 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -74,6 +74,7 @@ "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", + "LDAP" : "LDAP", "Expert" : "Napredno", "Advanced" : "Napredne možnosti", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Opozorilo:</b> določili user_ldap in user_webdavauth sta neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.", diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index 8e38ca3cdd8..75f3678fdd9 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Kaydediliyor", "Back" : "Geri", "Continue" : "Devam et", + "LDAP" : "LDAP", "Expert" : "Uzman", "Advanced" : "Gelişmiş", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.", diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index 10418f995f6..9b6f3a37ade 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -74,6 +74,7 @@ "Saving" : "Kaydediliyor", "Back" : "Geri", "Continue" : "Devam et", + "LDAP" : "LDAP", "Expert" : "Uzman", "Advanced" : "Gelişmiş", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.", diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js index 538061db520..0b8e8946e0f 100644 --- a/apps/user_ldap/l10n/uk.js +++ b/apps/user_ldap/l10n/uk.js @@ -76,6 +76,7 @@ OC.L10N.register( "Saving" : "Збереження", "Back" : "Назад", "Continue" : "Продовжити", + "LDAP" : "LDAP", "Expert" : "Експерт", "Advanced" : "Додатково", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.", diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json index f0b439ac979..9fb1ce119fb 100644 --- a/apps/user_ldap/l10n/uk.json +++ b/apps/user_ldap/l10n/uk.json @@ -74,6 +74,7 @@ "Saving" : "Збереження", "Back" : "Назад", "Continue" : "Продовжити", + "LDAP" : "LDAP", "Expert" : "Експерт", "Advanced" : "Додатково", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 44162e32d47..d89029abf17 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -928,7 +928,7 @@ class Access extends LDAPUtility implements user\IUserTools { foreach($searchResults as $res) { $count = intval($this->ldap->countEntries($cr, $res)); $counter += $count; - if($count === $limit) { + if($count > 0 && $count === $limit) { $hasHitLimit = true; } } @@ -1316,32 +1316,38 @@ class Access extends LDAPUtility implements user\IUserTools { * converts a binary SID into a string representation * @param string $sid * @return string - * @link http://blogs.freebsdish.org/tmclaugh/2010/07/21/finding-a-users-primary-group-in-ad/#comment-2855 */ public function convertSID2Str($sid) { - try { - if(!function_exists('bcadd')) { - \OCP\Util::writeLog('user_ldap', - 'You need to install bcmath module for PHP to have support ' . - 'for AD primary groups', \OCP\Util::WARN); - throw new \Exception('missing bcmath module'); - } - $srl = ord($sid[0]); - $numberSubID = ord($sid[1]); - $x = substr($sid, 2, 6); - $h = unpack('N', "\x0\x0" . substr($x,0,2)); - $l = unpack('N', substr($x,2,6)); - $iav = bcadd(bcmul($h[1], bcpow(2,32)), $l[1]); - $subIDs = array(); - for ($i=0; $i<$numberSubID; $i++) { - $subID = unpack('V', substr($sid, 8+4*$i, 4)); - $subIDs[] = $subID[1]; - } - } catch (\Exception $e) { + // The format of a SID binary string is as follows: + // 1 byte for the revision level + // 1 byte for the number n of variable sub-ids + // 6 bytes for identifier authority value + // n*4 bytes for n sub-ids + // + // Example: 010400000000000515000000a681e50e4d6c6c2bca32055f + // Legend: RRNNAAAAAAAAAAAA11111111222222223333333344444444 + $revision = ord($sid[0]); + $numberSubID = ord($sid[1]); + + $subIdStart = 8; // 1 + 1 + 6 + $subIdLength = 4; + if (strlen($sid) !== $subIdStart + $subIdLength * $numberSubID) { + // Incorrect number of bytes present. return ''; } - return sprintf('S-%d-%d-%s', $srl, $iav, implode('-', $subIDs)); + // 6 bytes = 48 bits can be represented using floats without loss of + // precision (see https://gist.github.com/bantu/886ac680b0aef5812f71) + $iav = number_format(hexdec(bin2hex(substr($sid, 2, 6))), 0, '', ''); + + $subIDs = array(); + for ($i = 0; $i < $numberSubID; $i++) { + $subID = unpack('V', substr($sid, $subIdStart + $subIdLength * $i, $subIdLength)); + $subIDs[] = sprintf('%u', $subID[1]); + } + + // Result for example above: S-1-5-21-249921958-728525901-1594176202 + return sprintf('S-%d-%s-%s', $revision, $iav, implode('-', $subIDs)); } /** diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index ecda49f73fc..282f4549e3b 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -111,9 +111,6 @@ class Helper { * @return bool true on success, false otherwise */ static public function deleteServerConfiguration($prefix) { - //just to be on the safe side - \OCP\User::checkAdminUser(); - if(!in_array($prefix, self::getServerConfigurationPrefixes())) { return false; } diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index f436784675d..8ff39800808 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -78,55 +78,52 @@ class Test_Access extends \PHPUnit_Framework_TestCase { $this->assertTrue($expected === $access->escapeFilterPart($input)); } - public function testConvertSID2StrSuccess() { + /** @dataProvider convertSID2StrSuccessData */ + public function testConvertSID2StrSuccess(array $sidArray, $sidExpected) { list($lw, $con, $um) = $this->getConnecterAndLdapMock(); $access = new Access($con, $lw, $um); - if(!function_exists('\bcadd')) { - $this->markTestSkipped('bcmath not available'); - } - - $sidBinary = file_get_contents(__DIR__ . '/data/sid.dat'); - $sidExpected = 'S-1-5-21-249921958-728525901-1594176202'; - + $sidBinary = implode('', $sidArray); $this->assertSame($sidExpected, $access->convertSID2Str($sidBinary)); } + public function convertSID2StrSuccessData() { + return array( + array( + array( + "\x01", + "\x04", + "\x00\x00\x00\x00\x00\x05", + "\x15\x00\x00\x00", + "\xa6\x81\xe5\x0e", + "\x4d\x6c\x6c\x2b", + "\xca\x32\x05\x5f", + ), + 'S-1-5-21-249921958-728525901-1594176202', + ), + array( + array( + "\x01", + "\x02", + "\xFF\xFF\xFF\xFF\xFF\xFF", + "\xFF\xFF\xFF\xFF", + "\xFF\xFF\xFF\xFF", + ), + 'S-1-281474976710655-4294967295-4294967295', + ), + ); + } + public function testConvertSID2StrInputError() { list($lw, $con, $um) = $this->getConnecterAndLdapMock(); $access = new Access($con, $lw, $um); - if(!function_exists('\bcadd')) { - $this->markTestSkipped('bcmath not available'); - } - $sidIllegal = 'foobar'; $sidExpected = ''; $this->assertSame($sidExpected, $access->convertSID2Str($sidIllegal)); } - public function testConvertSID2StrNoBCMath() { - if(function_exists('\bcadd')) { - $removed = false; - if(function_exists('runkit_function_remove')) { - $removed = !runkit_function_remove('\bcadd'); - } - if(!$removed) { - $this->markTestSkipped('bcadd could not be removed for ' . - 'testing without bcmath'); - } - } - - list($lw, $con, $um) = $this->getConnecterAndLdapMock(); - $access = new Access($con, $lw, $um); - - $sidBinary = file_get_contents(__DIR__ . '/data/sid.dat'); - $sidExpected = ''; - - $this->assertSame($sidExpected, $access->convertSID2Str($sidBinary)); - } - public function testGetDomainDNFromDNSuccess() { list($lw, $con, $um) = $this->getConnecterAndLdapMock(); $access = new Access($con, $lw, $um); diff --git a/apps/user_ldap/tests/data/sid.dat b/apps/user_ldap/tests/data/sid.dat Binary files differdeleted file mode 100644 index 3d500c6a872..00000000000 --- a/apps/user_ldap/tests/data/sid.dat +++ /dev/null diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index e51f6cb5bb9..c89edc33fa9 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -98,9 +98,10 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { /** * Prepares the Access mock for checkPassword tests * @param \OCA\user_ldap\lib\Access $access mock + * @param bool noDisplayName * @return void */ - private function prepareAccessForCheckPassword(&$access) { + private function prepareAccessForCheckPassword(&$access, $noDisplayName = false) { $access->expects($this->once()) ->method('escapeFilterPart') ->will($this->returnCallback(function($uid) { @@ -125,10 +126,14 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { return array(); })); + $retVal = 'gunslinger'; + if($noDisplayName === true) { + $retVal = false; + } $access->expects($this->any()) ->method('dn2username') ->with($this->equalTo('dnOfRoland,dc=test')) - ->will($this->returnValue('gunslinger')); + ->will($this->returnValue($retVal)); $access->expects($this->any()) ->method('stringResemblesDN') @@ -178,6 +183,21 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { $this->assertFalse($result); } + public function testCheckPasswordNoDisplayName() { + $access = $this->getAccessMock(); + + $this->prepareAccessForCheckPassword($access, true); + $access->expects($this->once()) + ->method('username2dn') + ->will($this->returnValue(false)); + + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); + + $result = $backend->checkPassword('roland', 'dt19'); + $this->assertFalse($result); + } + public function testCheckPasswordPublicAPI() { $access = $this->getAccessMock(); $this->prepareAccessForCheckPassword($access); diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index ae4dfec5118..6e244311d4a 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -64,8 +64,14 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface { return false; } $dn = $ldap_users[0]; - $user = $this->access->userManager->get($dn); + if(is_null($user)) { + \OCP\Util::writeLog('user_ldap', + 'LDAP Login: Could not get user object for DN ' . $dn . + '. Maybe the LDAP entry has no set display name attribute?', + \OCP\Util::WARN); + return false; + } if($user->getUsername() !== false) { //are the credentials OK? if(!$this->access->areCredentialsValid($dn, $password)) { diff --git a/apps/user_webdavauth/l10n/hy.js b/apps/user_webdavauth/l10n/hy.js index 97e5a7316c6..5d509b1c664 100644 --- a/apps/user_webdavauth/l10n/hy.js +++ b/apps/user_webdavauth/l10n/hy.js @@ -1,6 +1,7 @@ OC.L10N.register( "user_webdavauth", { + "Address:" : "Հասցե՝", "Save" : "Պահպանել" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/user_webdavauth/l10n/hy.json b/apps/user_webdavauth/l10n/hy.json index cb94f4404a5..ac0399d5cf8 100644 --- a/apps/user_webdavauth/l10n/hy.json +++ b/apps/user_webdavauth/l10n/hy.json @@ -1,4 +1,5 @@ { "translations": { + "Address:" : "Հասցե՝", "Save" : "Պահպանել" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/id.js b/apps/user_webdavauth/l10n/id.js index a7902dbf3b2..d71da240e27 100644 --- a/apps/user_webdavauth/l10n/id.js +++ b/apps/user_webdavauth/l10n/id.js @@ -2,7 +2,8 @@ OC.L10N.register( "user_webdavauth", { "WebDAV Authentication" : "Otentikasi WebDAV", + "Address:" : "Alamat:", "Save" : "Simpan", - "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid." + "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid." }, "nplurals=1; plural=0;"); diff --git a/apps/user_webdavauth/l10n/id.json b/apps/user_webdavauth/l10n/id.json index 88638eb47c6..ba327c72dda 100644 --- a/apps/user_webdavauth/l10n/id.json +++ b/apps/user_webdavauth/l10n/id.json @@ -1,6 +1,7 @@ { "translations": { "WebDAV Authentication" : "Otentikasi WebDAV", + "Address:" : "Alamat:", "Save" : "Simpan", - "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid." + "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file |