diff options
Diffstat (limited to 'apps')
27 files changed, 141 insertions, 39 deletions
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js index c0d42e17f74..9f94b409f57 100644 --- a/apps/encryption/l10n/it.js +++ b/apps/encryption/l10n/it.js @@ -1,17 +1,17 @@ OC.L10N.register( "encryption", { - "Missing recovery key password" : "Manca la password della chiave di recupero", - "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero", - "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita", - "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente", + "Missing recovery key password" : "Manca la password della chiave di ripristino", + "Please repeat the recovery key password" : "Ripeti la password della chiave di ripristino", + "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di ripristino ripetuta non corrisponde alla password della chiave di ripristino fornita", + "Recovery key successfully enabled" : "Chiave di ripristino abilitata correttamente", "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.", - "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente", - "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.", + "Recovery key successfully disabled" : "Chiave di ripristino disabilitata correttamente", + "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.", "Missing parameters" : "Parametri mancanti", - "Please provide the old recovery password" : "Fornisci la vecchia password di recupero", - "Please provide a new recovery password" : "Fornisci una nuova password di recupero", - "Please repeat the new recovery password" : "Ripeti la nuova password di recupero", + "Please provide the old recovery password" : "Fornisci la vecchia password di ripristino", + "Please provide a new recovery password" : "Fornisci una nuova password di ripristino", + "Please repeat the new recovery password" : "Ripeti la nuova password di ripristino", "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.", "Recovery Key disabled" : "Chiave di ripristino disabilitata", @@ -35,9 +35,9 @@ OC.L10N.register( "Enable recovery key" : "Abilita chiave di ripristino", "Disable recovery key" : "Disabilita chiave di ripristino", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.", - "Recovery key password" : "Password della chiave di recupero", + "Recovery key password" : "Password della chiave di ripristino", "Repeat recovery key password" : "Ripeti la password della chiave di ripristino", - "Change recovery key password:" : "Cambia la password della chiave di recupero:", + "Change recovery key password:" : "Cambia la password della chiave di ripristino:", "Old recovery key password" : "Vecchia password della chiave di ripristino", "New recovery key password" : "Nuova password della chiave di ripristino", "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino", diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json index ee3f487c54f..a117af8a317 100644 --- a/apps/encryption/l10n/it.json +++ b/apps/encryption/l10n/it.json @@ -1,15 +1,15 @@ { "translations": { - "Missing recovery key password" : "Manca la password della chiave di recupero", - "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero", - "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita", - "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente", + "Missing recovery key password" : "Manca la password della chiave di ripristino", + "Please repeat the recovery key password" : "Ripeti la password della chiave di ripristino", + "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di ripristino ripetuta non corrisponde alla password della chiave di ripristino fornita", + "Recovery key successfully enabled" : "Chiave di ripristino abilitata correttamente", "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.", - "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente", - "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.", + "Recovery key successfully disabled" : "Chiave di ripristino disabilitata correttamente", + "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.", "Missing parameters" : "Parametri mancanti", - "Please provide the old recovery password" : "Fornisci la vecchia password di recupero", - "Please provide a new recovery password" : "Fornisci una nuova password di recupero", - "Please repeat the new recovery password" : "Ripeti la nuova password di recupero", + "Please provide the old recovery password" : "Fornisci la vecchia password di ripristino", + "Please provide a new recovery password" : "Fornisci una nuova password di ripristino", + "Please repeat the new recovery password" : "Ripeti la nuova password di ripristino", "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.", "Recovery Key disabled" : "Chiave di ripristino disabilitata", @@ -33,9 +33,9 @@ "Enable recovery key" : "Abilita chiave di ripristino", "Disable recovery key" : "Disabilita chiave di ripristino", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.", - "Recovery key password" : "Password della chiave di recupero", + "Recovery key password" : "Password della chiave di ripristino", "Repeat recovery key password" : "Ripeti la password della chiave di ripristino", - "Change recovery key password:" : "Cambia la password della chiave di recupero:", + "Change recovery key password:" : "Cambia la password della chiave di ripristino:", "Old recovery key password" : "Vecchia password della chiave di ripristino", "New recovery key password" : "Nuova password della chiave di ripristino", "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino", diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js index 29514b18226..5502733d2e2 100644 --- a/apps/files/l10n/es_MX.js +++ b/apps/files/l10n/es_MX.js @@ -59,6 +59,9 @@ OC.L10N.register( "Text file" : "Archivo de texto", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", + "You created %1$s" : "Has creado %1$s", + "You changed %1$s" : "Has cambiado %1$s", + "You deleted %1$s" : "Has eliminado %1$s", "%s could not be renamed" : "%s no pudo ser renombrado", "File handling" : "Administración de archivos", "Maximum upload size" : "Tamaño máximo de subida", diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json index 520f2d0c446..22918fae182 100644 --- a/apps/files/l10n/es_MX.json +++ b/apps/files/l10n/es_MX.json @@ -57,6 +57,9 @@ "Text file" : "Archivo de texto", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", + "You created %1$s" : "Has creado %1$s", + "You changed %1$s" : "Has cambiado %1$s", + "You deleted %1$s" : "Has eliminado %1$s", "%s could not be renamed" : "%s no pudo ser renombrado", "File handling" : "Administración de archivos", "Maximum upload size" : "Tamaño máximo de subida", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 650401d6fa3..0b290eb160a 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -78,7 +78,7 @@ OC.L10N.register( "{newname} already exists" : "{newname} existe déjà", "Upload" : "Chargement", "Text file" : "Fichier texte", - "New text file.txt" : "Nouveau fichier texte \"file.txt\"", + "New text file.txt" : "Nouveau fichier texte.txt", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 5f28b9d12e7..5f51bdee302 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -76,7 +76,7 @@ "{newname} already exists" : "{newname} existe déjà", "Upload" : "Chargement", "Text file" : "Fichier texte", - "New text file.txt" : "Nouveau fichier texte \"file.txt\"", + "New text file.txt" : "Nouveau fichier texte.txt", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index c9b8fd3ac54..93f8979c2cb 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -71,10 +71,14 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"], + "Path" : "Путања", + "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајта"], "Favorited" : "Омиљено", "Favorite" : "Омиљени", + "{newname} already exists" : "{newname} већ постоји", "Upload" : "Отпреми", "Text file" : "текстуални фајл", + "New text file.txt" : "Нов текстуални фајл.txt", "Folder" : "фасцикла", "New folder" : "Нова фасцикла", "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака", @@ -92,12 +96,16 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s обриса %1$s", "You restored %1$s" : "Вратили сте %1$s", "%2$s restored %1$s" : "%2$s поврати %1$s", + "Changed by %2$s" : "Изменио %2$s", + "Deleted by %2$s" : "Обрисао %2$s", + "Restored by %2$s" : "Повратио %2$s", "%s could not be renamed as it has been deleted" : "%s се не може преименовати јер је обрисан", "%s could not be renamed" : "%s се не може преименовати", "Upload (max. %s)" : "Отпремање (макс. %s)", "File handling" : "Руковање фајловима", "Maximum upload size" : "Највећа величина отпремања", "max. possible: " : "највише могуће:", + "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "У PHP-FPM-у ова вредност има ефекта тек након 5 минута након примене.", "Save" : "Сачувај", "Can not be edited from here due to insufficient permissions." : "Не може да се мења одавде због недостатка дозвола.", "Settings" : "Поставке", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index 8a1ed30cefe..08ba9712de7 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -69,10 +69,14 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"], + "Path" : "Путања", + "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајта"], "Favorited" : "Омиљено", "Favorite" : "Омиљени", + "{newname} already exists" : "{newname} већ постоји", "Upload" : "Отпреми", "Text file" : "текстуални фајл", + "New text file.txt" : "Нов текстуални фајл.txt", "Folder" : "фасцикла", "New folder" : "Нова фасцикла", "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака", @@ -90,12 +94,16 @@ "%2$s deleted %1$s" : "%2$s обриса %1$s", "You restored %1$s" : "Вратили сте %1$s", "%2$s restored %1$s" : "%2$s поврати %1$s", + "Changed by %2$s" : "Изменио %2$s", + "Deleted by %2$s" : "Обрисао %2$s", + "Restored by %2$s" : "Повратио %2$s", "%s could not be renamed as it has been deleted" : "%s се не може преименовати јер је обрисан", "%s could not be renamed" : "%s се не може преименовати", "Upload (max. %s)" : "Отпремање (макс. %s)", "File handling" : "Руковање фајловима", "Maximum upload size" : "Највећа величина отпремања", "max. possible: " : "највише могуће:", + "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "У PHP-FPM-у ова вредност има ефекта тек након 5 минута након примене.", "Save" : "Сачувај", "Can not be edited from here due to insufficient permissions." : "Не може да се мења одавде због недостатка дозвола.", "Settings" : "Поставке", diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js index 021179c6432..1cee4efd362 100644 --- a/apps/files/l10n/th_TH.js +++ b/apps/files/l10n/th_TH.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s ลบ %1$s ออก", "You restored %1$s" : "คุณกู้คืน %1$s", "%2$s restored %1$s" : "%2$s ได้กู้คืน %1$s", + "Changed by %2$s" : "เปลี่ยนแปลงโดย %2$s", + "Deleted by %2$s" : "ลบโดย %2$s", + "Restored by %2$s" : "กู้คืนโดย %2$s", "%s could not be renamed as it has been deleted" : "%s ไม่สามารถเปลี่ยนชื่อเนื่องจากถูกลบไปแล้ว", "%s could not be renamed" : "%s ไม่สามารถเปลี่ยนชื่อ", "Upload (max. %s)" : "อัพโหลด (สูงสุด %s)", diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json index 6ce9bc4b9ed..e15e4e5803b 100644 --- a/apps/files/l10n/th_TH.json +++ b/apps/files/l10n/th_TH.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s ลบ %1$s ออก", "You restored %1$s" : "คุณกู้คืน %1$s", "%2$s restored %1$s" : "%2$s ได้กู้คืน %1$s", + "Changed by %2$s" : "เปลี่ยนแปลงโดย %2$s", + "Deleted by %2$s" : "ลบโดย %2$s", + "Restored by %2$s" : "กู้คืนโดย %2$s", "%s could not be renamed as it has been deleted" : "%s ไม่สามารถเปลี่ยนชื่อเนื่องจากถูกลบไปแล้ว", "%s could not be renamed" : "%s ไม่สามารถเปลี่ยนชื่อ", "Upload (max. %s)" : "อัพโหลด (สูงสุด %s)", diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index a56d59e240e..d2b0989e35a 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s 删除了 %1$s", "You restored %1$s" : "你恢复了 %1$s", "%2$s restored %1$s" : "%2$s 恢复了 %1$s", + "Changed by %2$s" : "被 %2$s 更改", + "Deleted by %2$s" : "被 %2$s 删除", + "Restored by %2$s" : "被 %2$s 恢复", "%s could not be renamed as it has been deleted" : "%s 已经被删除，无法重命名 ", "%s could not be renamed" : "%s 不能被重命名", "Upload (max. %s)" : "上传 (最大 %s)", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index c84450a095c..6eee0d3a765 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s 删除了 %1$s", "You restored %1$s" : "你恢复了 %1$s", "%2$s restored %1$s" : "%2$s 恢复了 %1$s", + "Changed by %2$s" : "被 %2$s 更改", + "Deleted by %2$s" : "被 %2$s 删除", + "Restored by %2$s" : "被 %2$s 恢复", "%s could not be renamed as it has been deleted" : "%s 已经被删除，无法重命名 ", "%s could not be renamed" : "%s 不能被重命名", "Upload (max. %s)" : "上传 (最大 %s)", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index afedf29dc03..633b499934e 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -1,6 +1,9 @@ OC.L10N.register( "files_external", { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.", + "Please provide a valid app key and secret." : "Bitte trage einen gültigen App-Key mit Secret ein.", "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s", "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s", "External storage" : "Externer Speicher", @@ -11,6 +14,7 @@ OC.L10N.register( "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", + "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -28,6 +32,7 @@ OC.L10N.register( "OAuth1" : "OAuth1", "App key" : "App-Schlüssel", "App secret" : "Geheime Zeichenkette der App", + "OAuth2" : "OAutch2", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack" : "OpenStack", @@ -76,6 +81,7 @@ OC.L10N.register( "Scope" : "Anwendungsbereich", "External Storage" : "Externer Speicher", "Folder name" : "Ordnername", + "Authentication" : "Authentifizierung", "Configuration" : "Konfiguration", "Available for" : "Verfügbar für", "Advanced settings" : "Erweiterte Einstellungen", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index ef96bdcf0e5..94a89346c5d 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -1,4 +1,7 @@ { "translations": { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.", + "Please provide a valid app key and secret." : "Bitte trage einen gültigen App-Key mit Secret ein.", "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s", "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s", "External storage" : "Externer Speicher", @@ -9,6 +12,7 @@ "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", + "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -26,6 +30,7 @@ "OAuth1" : "OAuth1", "App key" : "App-Schlüssel", "App secret" : "Geheime Zeichenkette der App", + "OAuth2" : "OAutch2", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", "OpenStack" : "OpenStack", @@ -74,6 +79,7 @@ "Scope" : "Anwendungsbereich", "External Storage" : "Externer Speicher", "Folder name" : "Ordnername", + "Authentication" : "Authentifizierung", "Configuration" : "Konfiguration", "Available for" : "Verfügbar für", "Advanced settings" : "Erweiterte Einstellungen", diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js index 7e2770e6f52..574ba7443d8 100644 --- a/apps/files_external/l10n/es_MX.js +++ b/apps/files_external/l10n/es_MX.js @@ -5,10 +5,12 @@ OC.L10N.register( "Personal" : "Personal", "Grant access" : "Conceder acceso", "Access granted" : "Acceso concedido", + "Saved" : "Guardado", "None" : "Ninguno", "Username" : "Nombre de usuario", "Password" : "Contraseña", "API key" : "clave API", + "Public key" : "Llave pública", "Port" : "Puerto", "WebDAV" : "WebDAV", "URL" : "URL", diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json index 9a9835d9598..ab4fd8153c4 100644 --- a/apps/files_external/l10n/es_MX.json +++ b/apps/files_external/l10n/es_MX.json @@ -3,10 +3,12 @@ "Personal" : "Personal", "Grant access" : "Conceder acceso", "Access granted" : "Acceso concedido", + "Saved" : "Guardado", "None" : "Ninguno", "Username" : "Nombre de usuario", "Password" : "Contraseña", "API key" : "clave API", + "Public key" : "Llave pública", "Port" : "Puerto", "WebDAV" : "WebDAV", "URL" : "URL", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index c5ceea05566..464508ad298 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -8,11 +8,11 @@ OC.L10N.register( "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s", "External storage" : "Stockage externe", "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé", - "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable", + "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable", "Invalid mount point" : "Point de montage non valide", "Objectstore forbidden" : "\"Objectstore\" interdit", "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"", - "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"", + "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser le service \"%s\"", "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"", "Unsatisfied backend parameters" : "Paramètres manquants pour le service", "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification", @@ -35,7 +35,7 @@ OC.L10N.register( "Saved" : "Sauvegardé", "Access key" : "Clé d'accès", "Secret key" : "Clé secrète", - "Builtin" : "inclus", + "Builtin" : "Inclus", "None" : "Aucun", "OAuth1" : "OAuth1", "App key" : "App key", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 3eab0afee30..993ea0b95f4 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -6,11 +6,11 @@ "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s", "External storage" : "Stockage externe", "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé", - "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable", + "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable", "Invalid mount point" : "Point de montage non valide", "Objectstore forbidden" : "\"Objectstore\" interdit", "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"", - "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"", + "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser le service \"%s\"", "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"", "Unsatisfied backend parameters" : "Paramètres manquants pour le service", "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification", @@ -33,7 +33,7 @@ "Saved" : "Sauvegardé", "Access key" : "Clé d'accès", "Secret key" : "Clé secrète", - "Builtin" : "inclus", + "Builtin" : "Inclus", "None" : "Aucun", "OAuth1" : "OAuth1", "App key" : "App key", diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js index 9232ec997d2..741d507db42 100644 --- a/apps/files_external/l10n/lt_LT.js +++ b/apps/files_external/l10n/lt_LT.js @@ -5,6 +5,7 @@ OC.L10N.register( "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", "Access granted" : "Priėjimas suteiktas", + "Saved" : "Išsaugoti", "None" : "Nieko", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json index d196c8e00bd..152c48a1035 100644 --- a/apps/files_external/l10n/lt_LT.json +++ b/apps/files_external/l10n/lt_LT.json @@ -3,6 +3,7 @@ "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", "Access granted" : "Priėjimas suteiktas", + "Saved" : "Išsaugoti", "None" : "Nieko", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 0eb2b032e52..295c7cdbb76 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -45,8 +45,16 @@ OC.L10N.register( "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link", "Shared with %2$s" : "Geteilt mit %2$s", + "Shared with group %2$s" : "Geteilt mit Gruppe %2$s", + "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s", + "Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s", + "Shared via link by %2$s" : "Geteilt mittels Link von %2$s", + "Shared by %2$s" : "Geteilt von %2$s", + "Shared via public link" : "Geteilt mittels öffentlichen Link", "Shares" : "Freigaben", + "You received %2$s as a remote share from %1$s" : "Du hast %2$s als Remotefreigabe von %1$s erhalten", "Accept" : "Ok", + "Decline" : "Abgelehnt", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", @@ -72,6 +80,7 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu deiner Webseite hinzufügen", "Share with me via ownCloud" : "Teile mit mir über ownCloud", "HTML Code:" : "HTML-Code:" }, diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 3c0b3dd5714..690e7596ffc 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -43,8 +43,16 @@ "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link", "Shared with %2$s" : "Geteilt mit %2$s", + "Shared with group %2$s" : "Geteilt mit Gruppe %2$s", + "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s", + "Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s", + "Shared via link by %2$s" : "Geteilt mittels Link von %2$s", + "Shared by %2$s" : "Geteilt von %2$s", + "Shared via public link" : "Geteilt mittels öffentlichen Link", "Shares" : "Freigaben", + "You received %2$s as a remote share from %1$s" : "Du hast %2$s als Remotefreigabe von %1$s erhalten", "Accept" : "Ok", + "Decline" : "Abgelehnt", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", @@ -70,6 +78,7 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu deiner Webseite hinzufügen", "Share with me via ownCloud" : "Teile mit mir über ownCloud", "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index f0c7d6c331c..31680b85fcd 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -38,14 +38,15 @@ OC.L10N.register( "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé", "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s", "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s", - "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s", + "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s", "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s", + "%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien", "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", - "Downloaded via public link" : "Téléchargé via un lien publique", - "Shared via public link" : "Partagé via un lien publique", + "Downloaded via public link" : "Téléchargé par lien public", + "Shared via public link" : "Partagé par lien public", "Shares" : "Partages", - "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s", + "You received %2$s as a remote share from %1$s" : "Vous avez obtenu l'accès au partage distant %2$s de %1$s", "Accept" : "Accepter", "Decline" : "Refuser", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 524eb382568..6a3cca61374 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -36,14 +36,15 @@ "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé", "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s", "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s", - "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s", + "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s", "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s", + "%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien", "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", - "Downloaded via public link" : "Téléchargé via un lien publique", - "Shared via public link" : "Partagé via un lien publique", + "Downloaded via public link" : "Téléchargé par lien public", + "Shared via public link" : "Partagé par lien public", "Shares" : "Partages", - "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s", + "You received %2$s as a remote share from %1$s" : "Vous avez obtenu l'accès au partage distant %2$s de %1$s", "Accept" : "Accepter", "Decline" : "Refuser", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index c5b644cf254..b1400469af8 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -43,6 +43,14 @@ OC.L10N.register( "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์", "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", + "Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ", + "Shared with %2$s" : "แชร์กับ %2$s", + "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s", + "Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s", + "Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s", + "Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s", + "Shared by %2$s" : "แชร์โดย %2$s", + "Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ", "Shares" : "แชร์", "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s", "Accept" : "ยอมรับ", diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 4ff45e2734e..a9ee8d6eb53 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -41,6 +41,14 @@ "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์", "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", + "Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ", + "Shared with %2$s" : "แชร์กับ %2$s", + "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s", + "Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s", + "Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s", + "Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s", + "Shared by %2$s" : "แชร์โดย %2$s", + "Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ", "Shares" : "แชร์", "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s", "Accept" : "ยอมรับ", diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 28feb3110b4..616b64e6c59 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -233,9 +233,10 @@ class ShareController extends Controller { * @param string $token * @param string $files * @param string $path + * @param string $downloadStartSecret * @return void|RedirectResponse */ - public function downloadShare($token, $files = null, $path = '') { + public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') { \OC_User::setIncognitoMode(true); $linkItem = OCP\Share::getShareByToken($token, false); @@ -288,6 +289,19 @@ class ShareController extends Controller { } } + /** + * this sets a cookie to be able to recognize the start of the download + * the content must not be longer than 32 characters and must only contain + * alphanumeric characters + */ + if (!empty($downloadStartSecret) + && !isset($downloadStartSecret[32]) + && preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) { + + // FIXME: set on the response once we use an actual app framework response + setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/'); + } + // download selected files if (!is_null($files)) { // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well |