Merge branch 'master' into files_encryption-style-fixes

8 files changed, 78 insertions, 3 deletions

diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 6a6f5510db6..2c6b650960a 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,9 +1,15 @@
 <?php $TRANSLATIONS = array(
 "Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Por favor, cambie su cliente de ownCloud y cambie su clave de cifrado para completar la conversión.",
-"switched to client side encryption" => "Cambiar a encriptación en lado cliente",
-"Change encryption password to login password" => "Cambie la clave de cifrado para ingresar su contraseña",
+"switched to client side encryption" => "Cambiar a cifrado del lado del cliente",
+"Change encryption password to login password" => "Cambie la clave de cifrado para su contraseña de inicio de sesión",
 "Please check your passwords and try again." => "Por favor revise su contraseña e intentelo de nuevo.",
-"Choose encryption mode:" => "Elegir el modo de encriptado:",
+"Could not change your file encryption password to your login password" => "No se pudo cambiar la contraseña de cifrado de archivos de su contraseña de inicio de sesión",
+"Choose encryption mode:" => "Elegir el modo de cifrado:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Cifrado del lado del Cliente ( es el más seguro, pero hace que sea imposible acceder a sus datos desde la interfaz web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Cifrado del lado del Servidor (le permite acceder a sus archivos desde la interfaz web y el cliente de escritorio)",
+"None (no encryption at all)" => "Ninguno (ningún cifrado en absoluto)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: Una vez que haya seleccionado un modo de cifrado no existe forma de cambiarlo de nuevo",
+"User specific (let the user decide)" => "Específico del usuario (dejar que el usuario decida)",
 "Encryption" => "Cifrado",
 "Exclude the following file types from encryption" => "Excluir del cifrado los siguientes tipos de archivo",
 "None" => "Ninguno"
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 31898f50fde..5cf0b8e4adc 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Por favor, cambiá uu cliente de ownCloud y cambiá tu clave de encriptado para completar la conversión.",
+"switched to client side encryption" => "Cambiado a encriptación por parte del cliente",
+"Change encryption password to login password" => "Cambiá la clave de encriptado para tu contraseña de inicio de sesión",
+"Please check your passwords and try again." => "Por favor, revisá tu contraseña e intentalo de nuevo.",
+"Could not change your file encryption password to your login password" => "No se pudo cambiar la contraseña de encriptación de archivos de tu contraseña de inicio de sesión",
+"Choose encryption mode:" => "Elegir el modo de encriptación:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Encriptación por parte del cliente (es el modo más seguro, pero hace que sea imposible acceder a tus datos desde la interfaz web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Encriptación por parte del servidor (te permite acceder a tus archivos desde la interfaz web y desde el cliente de escritorio)",
+"None (no encryption at all)" => "Ninguno (ninguna encriptación en absoluto)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: Una vez que haya seleccionado un modo de encriptación, no existe forma de cambiarlo nuevamente",
+"User specific (let the user decide)" => "Específico por usuario (deja que el usuario decida)",
 "Encryption" => "Encriptación",
 "Exclude the following file types from encryption" => "Exceptuar de la encriptación los siguientes tipos de archivo",
 "None" => "Ninguno"
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 433ae890ef6..33756c2831f 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Please check your passwords and try again." => "Tarkista salasanasi ja yritä uudelleen.",
+"Choose encryption mode:" => "Choose encryption mode:",
+"None (no encryption at all)" => "Ei mitään (ei lainkaan salausta)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Tärkeä huomautus: Kun olet valinnut salaustatavan, sitä ei ole mahdollista vaihtaa",
 "Encryption" => "Salaus",
 "Exclude the following file types from encryption" => "Jätä seuraavat tiedostotyypit salaamatta",
 "None" => "Ei mitään"
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 68d60c1ae30..901c41e12ec 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "ownCloud로 전환한 다음 암호화에 사용할 암호를 변경하면 변환이 완료됩니다.",
+"switched to client side encryption" => "클라이언트 암호화로 변경됨",
+"Change encryption password to login password" => "암호화 암호를 로그인 암호로 변경",
+"Please check your passwords and try again." => "암호를 확인한 다음 다시 시도하십시오.",
+"Could not change your file encryption password to your login password" => "암호화 암호를 로그인 암호로 변경할 수 없습니다",
+"Choose encryption mode:" => "암호화 모드 선택:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "클라이언트 암호화 (안전하지만 웹에서 데이터에 접근할 수 없음)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "서버 암호화 (웹 및 데스크톱 클라이언트에서 데이터에 접근할 수 있음)",
+"None (no encryption at all)" => "없음 (암호화하지 않음)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "알림: 암호화 모드를 선택하면 다른 것으로 변경할 수 없습니다",
+"User specific (let the user decide)" => "사용자 지정 (사용자별 설정)",
 "Encryption" => "암호화",
 "Exclude the following file types from encryption" => "다음 파일 형식은 암호화하지 않음",
 "None" => "없음"
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
new file mode 100644
index 00000000000..7eb21037bb0
--- /dev/null
+++ b/apps/files_encryption/l10n/lv.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Lūdzu, pārslēdzieties uz savu ownCloud klientu un maniet savu šifrēšanas paroli, lai pabeigtu pārveidošanu.",
+"switched to client side encryption" => "Pārslēdzās uz klienta puses šifrēšanu",
+"Change encryption password to login password" => "Mainīt šifrēšanas paroli uz ierakstīšanās paroli",
+"Please check your passwords and try again." => "Lūdzu, pārbaudiet savas paroles un mēģiniet vēlreiz.",
+"Could not change your file encryption password to your login password" => "Nevarēja mainīt datņu šifrēšanas paroli uz ierakstīšanās paroli",
+"Choose encryption mode:" => "Izvēlieties šifrēšanas režīmu:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Klienta puses šifrēšana (visdrošākā, bet nav iespējams piekļūt saviem datiem no tīmekļa saskarnes)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Servera puses šifrēšana (ļauj piekļūt datnēm ar tīmekļa saskarni un ar darbvirsmas klientu)",
+"None (no encryption at all)" => "Nav (nekādas šifrēšanas)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Svarīgi — kad esat izvēlējies šifrēšanas režīmu, to nekādi nevar mainīt atpakaļ",
+"User specific (let the user decide)" => "Lietotājam specifiski (ļauj lietotājam izlemt)",
+"Encryption" => "Šifrēšana",
+"Exclude the following file types from encryption" => "Sekojošos datņu tipus nešifrēt",
+"None" => "Nav"
+);
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 7c09009cba9..02cb0d970f2 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,4 +1,11 @@
 <?php $TRANSLATIONS = array(
+"switched to client side encryption" => "overgeschakeld naar client side encryptie",
+"Change encryption password to login password" => "Verander encryptie wachtwoord naar login wachtwoord",
+"Please check your passwords and try again." => "Controleer uw wachtwoorden en probeer het opnieuw.",
+"Could not change your file encryption password to your login password" => "Kon het bestandsencryptie wachtwoord niet veranderen naar het login wachtwoord",
+"Choose encryption mode:" => "Kies encryptie mode:",
+"None (no encryption at all)" => "Geen (zonder encryptie)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Belangrijk: Zodra er voor een encryptie mode is gekozen kan deze niet meer worden gewijzigd.",
 "Encryption" => "Versleuteling",
 "Exclude the following file types from encryption" => "Versleutel de volgende bestand types niet",
 "None" => "Geen"
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 086d073cf5c..8bd6492a8f7 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Por favor, vá ao seu cliente ownCloud e mude sua criptografia de senha para completar a conversão.",
+"switched to client side encryption" => "alterado para criptografia por parte do cliente",
+"Change encryption password to login password" => "Mudar senha de criptografia para senha de login",
+"Please check your passwords and try again." => "Por favor, verifique suas senhas e tente novamente.",
+"Could not change your file encryption password to your login password" => "Não foi possível mudar sua senha de criptografia de arquivos para sua senha de login",
+"Choose encryption mode:" => "Escolha o modo de criptografia:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Criptografia por parte do cliente (mais segura, mas torna impossível acessar seus dados a partir da interface web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Criptografia por parte do servidor (permite que você acesse seus arquivos da interface web e do cliente desktop)",
+"None (no encryption at all)" => "Nenhuma (sem qualquer criptografia)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: Uma vez que tiver escolhido um modo de criptografia, não há um meio de voltar atrás",
+"User specific (let the user decide)" => "Específico por usuário (deixa o usuário decidir)",
 "Encryption" => "Criptografia",
 "Exclude the following file types from encryption" => "Excluir os seguintes tipos de arquivo da criptografia",
 "None" => "Nenhuma"
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 4321fb8a8a3..1149ac64f3e 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,4 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Пожалуйста, переключитесь на ownCloud-клиент и измените Ваш пароль шифрования для завершения конвертации.",
+"switched to client side encryption" => "переключено на шифрование на клиентской стороне",
+"Please check your passwords and try again." => "Пожалуйста, проверьте Ваш пароль и попробуйте снова",
+"Choose encryption mode:" => "Выберите способ шифрования:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Шифрование на стороне клиента (наиболее безопасно, но делает невозможным получение доступа к Вашим данным по вэб-интерфейсу)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Шифрование на стороне сервера (позволяет Вам получить доступ к Вашим файлам по вэб-интерфейсу и десктопному клиенту)",
+"None (no encryption at all)" => "Нет (шифрование полностью отсутствует)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Важно: Невозможно будет изменить выбранный способ шифрования",
+"User specific (let the user decide)" => "Специфика пользователя (позволено решить пользователю)",
 "Encryption" => "Шифрование",
 "Exclude the following file types from encryption" => "Исключите следующие типы файлов из шифрования",
 "None" => "Ни один"