[tx-robot] updated from transifex

147 files changed, 1208 insertions, 2668 deletions

diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index bc5046767c6..201e731179a 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -20,9 +20,12 @@
 "replaced {new_name}" => "reemplazado {new_name}",
 "undo" => "deshacer",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
+"perform delete operation" => "Eliminar",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
@@ -54,11 +57,13 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde el enlace",
+"Trash" => "Basura",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Download" => "Descargar",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
-"Current scanning" => "Ahora escaneando"
+"Current scanning" => "Ahora escaneando",
+"Upgrading filesystem cache..." => "Actualizando cache de archivos de sistema"
 );
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index f08585e485f..375fbd9a9a6 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "التشفير",
-"Exclude the following file types from encryption" => "استبعد أنواع الملفات التالية من التشفير",
 "None" => "لا شيء"
 );
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 4ceee127af1..07a97f5f8a6 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Криптиране",
-"Exclude the following file types from encryption" => "Изключване на следните файлови типове от криптирането",
 "None" => "Няма"
 );
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 29c486b8ca0..43767d56518 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "সংকেতায়ন",
-"Exclude the following file types from encryption" => "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও",
 "None" => "কোনটিই নয়"
 );
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 56c81e747f7..815cf1af003 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Canvia la contrasenya d'encriptació per la d'accés",
 "Please check your passwords and try again." => "Comproveu les contrasenyes i proveu-ho de nou.",
 "Could not change your file encryption password to your login password" => "No s'ha pogut canviar la contrasenya d'encriptació de fitxers per la d'accés",
-"Choose encryption mode:" => "Escolliu el mode d'encriptació:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Encriptació per part del client (més segura però fa impossible l'accés a les dades des de la interfície web)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Encriptació per part del servidor (permet accedir als fitxers des de la interfície web i des del client d'escriptori)",
-"None (no encryption at all)" => "Cap (sense encriptació)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Important: quan seleccioneu un mode d'encriptació no hi ha manera de canviar-lo de nou",
-"User specific (let the user decide)" => "Específic per usuari (permet que l'usuari ho decideixi)",
 "Encryption" => "Encriptatge",
-"Exclude the following file types from encryption" => "Exclou els tipus de fitxers següents de l'encriptatge",
 "None" => "Cap"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 5948a9b82e8..27d2ae544b5 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Změnit šifrovací heslo na přihlašovací",
 "Please check your passwords and try again." => "Zkontrolujte, prosím, své heslo a zkuste to znovu.",
 "Could not change your file encryption password to your login password" => "Nelze změnit šifrovací heslo na přihlašovací.",
-"Choose encryption mode:" => "Vyberte režim šifrování:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Šifrování na straně klienta (nejbezpečnější ale neumožňuje vám přistupovat k souborům z webového rozhraní)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Šifrování na straně serveru (umožňuje vám přistupovat k souborům pomocí webového rozhraní i aplikací)",
-"None (no encryption at all)" => "Žádný (vůbec žádné šifrování)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Důležité: jak si jednou vyberete režim šifrování nelze jej opětovně změnit",
-"User specific (let the user decide)" => "Definován uživatelem (umožní uživateli si vybrat)",
 "Encryption" => "Šifrování",
-"Exclude the following file types from encryption" => "Při šifrování vynechat následující typy souborů",
 "None" => "Žádné"
 );
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index d65963f46b2..c9255759cb8 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Udskift krypteringskode til login-adgangskode",
 "Please check your passwords and try again." => "Check adgangskoder og forsøg igen.",
 "Could not change your file encryption password to your login password" => "Kunne ikke udskifte krypteringskode med login-adgangskode",
-"Choose encryption mode:" => "Vælg krypteringsform:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kryptering på klientsiden (mere sikker, men udelukker adgang til dataene fra webinterfacet)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Kryptering på serversiden (gør det muligt at tilgå filer fra webinterfacet såvel som desktopklienten)",
-"None (no encryption at all)" => "Ingen (ingen kryptering)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Vigtigt: Når der er valgt krypteringsform, kan det ikke ændres tilbage igen.",
-"User specific (let the user decide)" => "Brugerspecifik (lad brugeren bestemme)",
 "Encryption" => "Kryptering",
-"Exclude the following file types from encryption" => "Ekskluder følgende filtyper fra kryptering",
 "None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index e187f72ab50..c3c69e09007 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Ändern des Verschlüsselungspasswortes zum Anmeldepasswort",
 "Please check your passwords and try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
 "Could not change your file encryption password to your login password" => "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
-"Choose encryption mode:" => "Wählen Sie die Verschlüsselungsart:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Clientseitige Verschlüsselung (am sichersten, aber macht es unmöglich auf ihre Daten über das Webinterface zuzugreifen)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Serverseitige Verschlüsselung (erlaubt es ihnen auf ihre Daten über das Webinterface und den Desktop-Client zuzugreifen)",
-"None (no encryption at all)" => "Keine (ohne Verschlüsselung)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Wichtig: Sobald sie eine Verschlüsselungsmethode gewählt haben, können Sie diese nicht ändern!",
-"User specific (let the user decide)" => "Benutzerspezifisch (der Benutzer kann entscheiden)",
 "Encryption" => "Verschlüsselung",
-"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
 "None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index be4369ebf09..c3c69e09007 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Ändern des Verschlüsselungspasswortes zum Anmeldepasswort",
 "Please check your passwords and try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
 "Could not change your file encryption password to your login password" => "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
-"Choose encryption mode:" => "Wählen Sie die Verschlüsselungsmethode:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Clientseitige Verschlüsselung (am sichersten, aber macht es unmöglich auf ihre Daten über das Webinterface zuzugreifen)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Serverseitige Verschlüsselung (erlaubt es ihnen auf ihre Daten über das Webinterface und den Desktop-Client zuzugreifen)",
-"None (no encryption at all)" => "Keine (ohne Verschlüsselung)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Wichtig: Sobald sie eine Verschlüsselungsmethode gewählt haben, können Sie diese nicht ändern!",
-"User specific (let the user decide)" => "Benutzerspezifisch (der Benutzer kann entscheiden)",
 "Encryption" => "Verschlüsselung",
-"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
 "None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 50b812c82df..94bb68bcbca 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -2,8 +2,6 @@
 "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:" => "Επιλογή κατάστασης κρυπτογράφησης:",
 "Encryption" => "Κρυπτογράφηση",
-"Exclude the following file types from encryption" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση",
 "None" => "Καμία"
 );
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index c6f82dcb8a0..50847062c3b 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ĉifrado",
-"Exclude the following file types from encryption" => "Malinkluzivigi la jenajn dosiertipojn el ĉifrado",
 "None" => "Nenio"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 2c6b650960a..87f984c2c10 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -4,13 +4,6 @@
 "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.",
 "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 5cf0b8e4adc..8160db10df6 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -4,13 +4,6 @@
 "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/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0c0ef231145..07f1a48fb0b 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Krüpteerimine",
-"Exclude the following file types from encryption" => "Järgnevaid failitüüpe ära krüpteeri",
 "None" => "Pole"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index e7372937e4a..a2368816f52 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,9 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Please check your passwords and try again." => "Mesedez egiaztatu zure pasahitza eta saia zaitez berriro:",
-"Choose encryption mode:" => "Hautatu enkriptazio modua:",
-"None (no encryption at all)" => "Bat ere ez (enkriptaziorik gabe)",
-"User specific (let the user decide)" => "Erabiltzaileak zehaztuta (utzi erabiltzaileari hautatzen)",
 "Encryption" => "Enkriptazioa",
-"Exclude the following file types from encryption" => "Ez enkriptatu hurrengo fitxategi motak",
 "None" => "Bat ere ez"
 );
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 0cdee74f5a9..2186c9025b4 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Please check your passwords and try again." => "لطفا گذرواژه خود را بررسی کنید و دوباره امتحان کنید.",
 "Encryption" => "رمزگذاری",
-"Exclude the following file types from encryption" => "نادیده گرفتن فایل های زیر برای رمز گذاری",
 "None" => "هیچ‌کدام"
 );
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 33756c2831f..8a9dd30e670 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,9 +1,5 @@
 <?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/fr.php b/apps/files_encryption/l10n/fr.php
index 41e37134d4e..608778b2ec8 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Convertir le mot de passe de chiffrement en mot de passe de connexion",
 "Please check your passwords and try again." => "Veuillez vérifier vos mots de passe et réessayer.",
 "Could not change your file encryption password to your login password" => "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion",
-"Choose encryption mode:" => "Choix du type de chiffrement :",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Chiffrement côté client (plus sécurisé, mais ne permet pas l'accès à vos données depuis l'interface web)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Chiffrement côté serveur (vous permet d'accéder à vos fichiers depuis l'interface web et depuis le client de synchronisation)",
-"None (no encryption at all)" => "Aucun (pas de chiffrement)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Important : Une fois le mode de chiffrement choisi, il est impossible de revenir en arrière",
-"User specific (let the user decide)" => "Propre à l'utilisateur (laisse le choix à l'utilisateur)",
 "Encryption" => "Chiffrement",
-"Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
 "None" => "Aucun"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 42fcfce1cc0..b240990f3d5 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Cifrado",
-"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro do cifrado",
 "None" => "Nada"
 );
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 9adb6d2b92a..cbb74bfee9a 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "הצפנה",
-"Exclude the following file types from encryption" => "הוצא את סוגי הקבצים הבאים מהצפנה",
 "None" => "כלום"
 );
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index e32de01f973..fa62ae75fb6 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Titkosítási jelszó módosítása a bejelentkezési jelszóra",
 "Please check your passwords and try again." => "Kérjük, ellenőrizze a jelszavait, és próbálja meg újra.",
 "Could not change your file encryption password to your login password" => "Nem módosíthatja a fájltitkosítási jelszavát a bejelentkezési jelszavára",
-"Choose encryption mode:" => "Válassza ki a titkosítási módot:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kliens oldali titkosítás (biztonságosabb, de lehetetlenné teszi a fájlok elérését a böngészőből)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Kiszolgáló oldali titkosítás (lehetővé teszi a fájlok elérését úgy böngészőből mint az asztali kliensből)",
-"None (no encryption at all)" => "Semmi (semmilyen titkosítás)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Fontos: Ha egyszer kiválasztotta a titkosítás módját, többé már nem lehet megváltoztatni",
-"User specific (let the user decide)" => "Felhasználó specifikus (a felhasználó választhat)",
 "Encryption" => "Titkosítás",
-"Exclude the following file types from encryption" => "A következő fájltípusok kizárása a titkosításból",
 "None" => "Egyik sem"
 );
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 20f33b87829..3f9a6c7d07f 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "enkripsi",
-"Exclude the following file types from encryption" => "pengecualian untuk tipe file berikut dari enkripsi",
 "None" => "tidak ada"
 );
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index a2559cf2b76..bd964185c45 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Dulkóðun",
-"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skráartegundir frá dulkóðun",
 "None" => "Ekkert"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 0c394564e0f..86e1a66c458 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Converti la password di cifratura nella password di accesso",
 "Please check your passwords and try again." => "Controlla la password e prova ancora.",
 "Could not change your file encryption password to your login password" => "Impossibile convertire la password di cifratura nella password di accesso",
-"Choose encryption mode:" => "Scegli la modalità di cifratura.",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Cifratura lato client (più sicura ma rende impossibile accedere ai propri dati dall'interfaccia web)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Cifratura lato server (ti consente di accedere ai tuoi file dall'interfaccia web e dal client desktop)",
-"None (no encryption at all)" => "Nessuna (senza alcuna cifratura)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: una volta selezionata la modalità di cifratura non sarà possibile tornare indietro",
-"User specific (let the user decide)" => "Specificato dall'utente (lascia decidere all'utente)",
 "Encryption" => "Cifratura",
-"Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
 "None" => "Nessuna"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 4100908e00c..8d3df1f06ae 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -4,13 +4,6 @@
 "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)" => "クライアントサイドの暗号化（最もセキュアですが、WEBインターフェースからデータにアクセスできなくなります）",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "サーバサイド暗号化（WEBインターフェースおよびデスクトップクライアントからファイルにアクセスすることができます）",
-"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/ko.php b/apps/files_encryption/l10n/ko.php
index 901c41e12ec..625906d89d6 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -4,13 +4,6 @@
 "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/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 06bb9b93251..02c030014fa 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "نهێنیکردن",
-"Exclude the following file types from encryption" => "به‌ربه‌ست کردنی ئه‌م جۆره‌ په‌ڕگانه له‌ نهێنیکردن",
 "None" => "هیچ"
 );
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 22cbe7a4ffa..67769c8f365 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Šifravimas",
-"Exclude the following file types from encryption" => "Nešifruoti pasirinkto tipo failų",
 "None" => "Nieko"
 );
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 7eb21037bb0..7b94bb99e1a 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -4,13 +4,6 @@
 "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/mk.php b/apps/files_encryption/l10n/mk.php
index 7ccf8ac2d5b..513606fadc3 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Енкрипција",
-"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција",
 "None" => "Ништо"
 );
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index 2ec6670e928..e52ecb868af 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Kryptering",
-"Exclude the following file types from encryption" => "Ekskluder følgende filer fra kryptering",
 "None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 02cb0d970f2..fc8a7954a9e 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -3,10 +3,6 @@
 "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/pl.php b/apps/files_encryption/l10n/pl.php
index 896086108ec..505e8659f08 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Szyfrowanie",
-"Exclude the following file types from encryption" => "Wyłącz następujące typy plików z szyfrowania",
 "None" => "Brak"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 8bd6492a8f7..356419e0e7f 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -4,13 +4,6 @@
 "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/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index b6eedcdc509..4dac4d2273b 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Alterar a password de encriptação para a password de login",
 "Please check your passwords and try again." => "Por favor verifique as suas paswords e tente de novo.",
 "Could not change your file encryption password to your login password" => "Não foi possível alterar a password de encriptação de ficheiros para a sua password de login",
-"Choose encryption mode:" => "Escolha o método de encriptação",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Encriptação do lado do cliente (mais seguro mas torna possível o acesso aos dados através do interface web)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Encriptação do lado do servidor (permite o acesso aos seus ficheiros através do interface web e do cliente de sincronização)",
-"None (no encryption at all)" => "Nenhuma (sem encriptação)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: Uma vez escolhido o modo de encriptação, não existe maneira de o alterar!",
-"User specific (let the user decide)" => "Escolhido pelo utilizador",
 "Encryption" => "Encriptação",
-"Exclude the following file types from encryption" => "Excluir da encriptação os seguintes tipo de ficheiros",
 "None" => "Nenhum"
 );
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index f958692dd8d..9a3acc18dd3 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Schimbă parola de ecriptare în parolă de acces",
 "Please check your passwords and try again." => "Verifică te rog parolele și înceracă din nou.",
 "Could not change your file encryption password to your login password" => "Nu s-a putut schimba parola de encripție a fișierelor ca parolă de acces",
-"Choose encryption mode:" => "Alege tipul de ecripție",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Encripție locală (cea mai sigură, dar face ca datele să nu mai fie accesibile din interfața web)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Encripție pe server (permite să accesezi datele tale din interfața web și din clientul pentru calculator)",
-"None (no encryption at all)" => "Fără (nici un fel de ecriptare)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Important: Din moment ce ai setat un mod de encriptare, nu mai există metode de a-l schimba înapoi",
-"User specific (let the user decide)" => "Spefic fiecărui utilizator (lasă utilizatorul să decidă)",
 "Encryption" => "Încriptare",
-"Exclude the following file types from encryption" => "Exclude următoarele tipuri de fișiere de la încriptare",
 "None" => "Niciuna"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 14115c12683..c11cf74ecfb 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Шифрование",
-"Exclude the following file types from encryption" => "Исключить шифрование следующих типов файлов",
 "None" => "Ничего"
 );
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 1149ac64f3e..dbbb22ed9cf 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -2,13 +2,6 @@
 "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" => "Ни один"
 );
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index 2d61bec45b8..d9cec4b7220 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "ගුප්ත කේතනය",
-"Exclude the following file types from encryption" => "මෙම ගොනු වර්ග ගුප්ත කේතනය කිරීමෙන් බැහැරව තබන්න",
 "None" => "කිසිවක් නැත"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 355b45a4ce2..3a1e4c7e194 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Zmeniť šifrovacie heslo na prihlasovacie",
 "Please check your passwords and try again." => "Skontrolujte si heslo a skúste to znovu.",
 "Could not change your file encryption password to your login password" => "Nie je možné zmeniť šifrovacie heslo na prihlasovacie",
-"Choose encryption mode:" => "Vyberte režim šifrovania:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Šifrovanie prostredníctvom klienta (najbezpečnejšia voľba, neumožňuje však prístup k súborom z webového rozhrania)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Šifrovanie na serveri (umožňuje pristupovať k súborom z webového rozhrania a desktopového klienta)",
-"None (no encryption at all)" => "Žiadne (žiadne šifrovanie)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Dôležité: ak si zvolíte režim šifrovania, nie je možné ho znovu zrušiť",
-"User specific (let the user decide)" => "Definovaný používateľom (umožňuje používateľovi vybrať si)",
 "Encryption" => "Šifrovanie",
-"Exclude the following file types from encryption" => "Vynechať nasledujúce súbory pri šifrovaní",
 "None" => "Žiadne"
 );
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index db963ef2f8d..45272f1ee06 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Šifriranje",
-"Exclude the following file types from encryption" => "Navedene vrste datotek naj ne bodo šifrirane",
 "None" => "Brez"
 );
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 198bcc94ef9..91f7fc62a90 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Шифровање",
-"Exclude the following file types from encryption" => "Не шифруј следеће типове датотека",
 "None" => "Ништа"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 9b6ce141782..c3f92dc66eb 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -4,13 +4,6 @@
 "Change encryption password to login password" => "Ändra krypteringslösenord till loginlösenord",
 "Please check your passwords and try again." => "Kontrollera dina lösenord och försök igen.",
 "Could not change your file encryption password to your login password" => "Kunde inte ändra ditt filkrypteringslösenord till ditt loginlösenord",
-"Choose encryption mode:" => "Välj krypteringsläge:",
-"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kryptering på klientsidan (säkraste men gör det omöjligt att komma åt dina filer med en webbläsare)",
-"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Kryptering på serversidan (kan komma åt dina filer från webbläsare och datorklient)",
-"None (no encryption at all)" => "Ingen (ingen kryptering alls)",
-"Important: Once you selected an encryption mode there is no way to change it back" => "Viktigt: När du har valt ett krypteringsläge finns det inget sätt att ändra tillbaka",
-"User specific (let the user decide)" => "Användarspecifik (låter användaren bestämma)",
 "Encryption" => "Kryptering",
-"Exclude the following file types from encryption" => "Exkludera följande filtyper från kryptering",
 "None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index aab628b5519..152e631d0fc 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "மறைக்குறியீடு",
-"Exclude the following file types from encryption" => "மறைக்குறியாக்கலில் பின்வரும் கோப்பு வகைகளை நீக்கவும்",
 "None" => "ஒன்றுமில்லை"
 );
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index f8c19456ab3..28d9e30864f 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -4,13 +4,6 @@
 "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/tr.php b/apps/files_encryption/l10n/tr.php
index 07f78d148c8..0868d0a6905 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Şifreleme",
-"Exclude the following file types from encryption" => "Aşağıdaki dosya tiplerini şifrelemeye dahil etme",
 "None" => "Hiçbiri"
 );
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index e3589215658..8236c5afefd 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Шифрування",
-"Exclude the following file types from encryption" => "Не шифрувати файли наступних типів",
 "None" => "Жоден"
 );
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 218285b675a..b86cd839783 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Mã hóa",
-"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa",
 "None" => "Không có gì hết"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 31a3d3b49b8..12d903e6567 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "加密",
-"Exclude the following file types from encryption" => "从加密中排除如下文件类型",
 "None" => "无"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index aa4817b590c..867d000f2ed 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "加密",
-"Exclude the following file types from encryption" => "从加密中排除列出的文件类型",
 "None" => "None"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 146724def08..bd8257ed602 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -4,13 +4,6 @@
 "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_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 7a922b89002..2eb61a738e3 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Password" => "Лозинка",
 "Submit" => "Пошаљи"
 );
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index 798322cab24..b191ffc4246 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"perform restore operation" => "Restaurar",
 "Name" => "Nombre",
+"Deleted" => "Eliminado",
 "1 folder" => "1 carpeta",
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Nothing in here. Your trash bin is empty!" => "Nada aqui. La papelera esta vacia!",
 "Restore" => "Recuperar"
 );
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index a6d1d9d260d..3740d13e224 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -4,6 +4,7 @@
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "La configuración no es válida. Por favor, busque en el log de ownCloud para más detalles.",
 "Deletion failed" => "Falló el borrado",
+"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
 "Keep settings?" => "Mantener la configuración?",
 "Cannot add server configuration" => "No se puede añadir la configuración del servidor",
 "Connection test succeeded" => "La prueba de conexión fue exitosa",
@@ -13,6 +14,7 @@
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Server configuration" => "Configuración del Servidor",
+"Add Server Configuration" => "Agregar configuracion del servidor",
 "Host" => "Máquina",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
 "Base DN" => "DN base",
@@ -31,7 +33,15 @@
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Con cualquier placeholder, ej: \"objectClass=posixGroup\".",
+"Connection Settings" => "Configuracion de coneccion",
+"Configuration Active" => "Configuracion activa",
+"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
 "Port" => "Puerto",
+"Backup (Replica) Host" => "Host para backup (Replica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+"Backup (Replica) Port" => "Puerto para backup (Replica)",
+"Disable Main Server" => "Deshabilitar servidor principal",
+"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica",
 "Use TLS" => "Usar TLS",
 "Do not use it for SSL connections, it will fail." => "No usarlo para SSL, habrá error.",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
@@ -39,15 +49,20 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
 "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
+"Directory Settings" => "Configuracion de directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
 "Base User Tree" => "Árbol base de usuario",
 "One User Base DN per line" => "Un DN Base de Usuario por línea",
+"User Search Attributes" => "Atributos de la busqueda de usuario",
+"Optional; one attribute per line" => "Opcional; un atributo por linea",
 "Group Display Name Field" => "Campo de nombre de grupo a mostrar",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud.",
 "Base Group Tree" => "Árbol base de grupo",
 "One Group Base DN per line" => "Un DN Base de Grupo por línea",
+"Group Search Attributes" => "Atributos de busqueda de grupo",
 "Group-Member association" => "Asociación Grupo-Miembro",
+"Special Attributes" => "Atributos especiales",
 "in bytes" => "en bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
 "Help" => "Ayuda"
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index e3955d3f32d..7ddd7dad5c3 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "حذف کردن انجام نشد",
+"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
 "Host" => "میزبانی",
 "Password" => "رمز عبور",
 "Port" => "درگاه",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index a2879b4fa03..9bb350ea23c 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -33,6 +33,7 @@
 "Group Filter" => "Filtre de groupes",
 "Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
+"Connection Settings" => "Paramètres de connexion",
 "Configuration Active" => "Configuration active",
 "When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
 "Port" => "Port",
@@ -48,6 +49,7 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
 "Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.",
 "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
+"Directory Settings" => "Paramètres du répertoire",
 "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud.",
 "Base User Tree" => "DN racine de l'arbre utilisateurs",
@@ -60,6 +62,7 @@
 "One Group Base DN per line" => "Un DN racine groupe par ligne",
 "Group Search Attributes" => "Recherche des attributs du groupe",
 "Group-Member association" => "Association groupe-membre",
+"Special Attributes" => "Attributs spéciaux",
 "in bytes" => "en octets",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
 "Help" => "Aide"
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index f16e59273cd..418d94afca5 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,4 +1,36 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Брисање није успело",
+"Host" => "Домаћин",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
+"Base DN" => "База DN",
+"User DN" => "Корисник DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним.",
+"Password" => "Лозинка",
+"For anonymous access, leave DN and Password empty." => "За анониман приступ, оставите поља DN и лозинка празним.",
+"User Login Filter" => "Филтер за пријаву корисника",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "користите чувар места %%uid, нпр. „uid=%%uid\"",
+"User List Filter" => "Филтер за списак корисника",
+"Defines the filter to apply, when retrieving users." => "Одређује филтер за примењивање при прибављању корисника.",
+"without any placeholder, e.g. \"objectClass=person\"." => "без икаквог чувара места, нпр. „objectClass=person“.",
+"Group Filter" => "Филтер групе",
+"Defines the filter to apply, when retrieving groups." => "Одређује филтер за примењивање при прибављању група.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без икаквог чувара места, нпр. „objectClass=posixGroup“.",
+"Port" => "Порт",
+"Use TLS" => "Користи TLS",
+"Do not use it for SSL connections, it will fail." => "Не користите за SSL везе јер неће радити.",
+"Case insensitve LDAP server (Windows)" => "LDAP сервер осетљив на велика и мала слова (Windows)",
+"Turn off SSL certificate validation." => "Искључите потврду SSL сертификата.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Увезите SSL сертификат LDAP сервера у свој ownCloud ако веза ради само са овом опцијом.",
+"Not recommended, use for testing only." => "Не препоручује се; користите само за тестирање.",
+"in seconds. A change empties the cache." => "у секундама. Промена испражњава кеш меморију.",
+"User Display Name Field" => "Име приказа корисника",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP атрибут за стварање имена ownCloud-а корисника.",
+"Base User Tree" => "Основно стабло корисника",
+"Group Display Name Field" => "Име приказа групе",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP атрибут за стварање имена ownCloud-а групе.",
+"Base Group Tree" => "Основна стабло група",
+"Group-Member association" => "Придруживање чланова у групу",
+"in bytes" => "у бајтовима",
 "Help" => "Помоћ"
 );
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index b1da09ad3e1..509906934cb 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,8 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Misslyckades med att radera serverinställningen",
 "The configuration is valid and the connection could be established!" => "Inställningen är giltig och anslutningen kunde upprättas!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.",
 "Deletion failed" => "Raderingen misslyckades",
+"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
 "Keep settings?" => "Behåll inställningarna?",
 "Cannot add server configuration" => "Kunde inte lägga till serverinställning",
 "Connection test succeeded" => "Anslutningstestet lyckades",
@@ -31,8 +33,15 @@
 "Group Filter" => "Gruppfilter",
 "Defines the filter to apply, when retrieving groups." => "Definierar filter att tillämpa vid listning av grupper.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
+"Connection Settings" => "Uppkopplingsinställningar",
+"Configuration Active" => "Konfiguration aktiv",
+"When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
 "Port" => "Port",
+"Backup (Replica) Host" => "Säkerhetskopierings-värd (Replika)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern",
+"Backup (Replica) Port" => "Säkerhetskopierins-port (Replika)",
 "Disable Main Server" => "Inaktivera huvudserver",
+"When switched on, ownCloud will only connect to the replica server." => "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast.",
 "Use TLS" => "Använd TLS",
 "Do not use it for SSL connections, it will fail." => "Använd inte för SSL-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
@@ -40,15 +49,20 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
 "Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ",
 "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
+"Directory Settings" => "Mappinställningar",
 "User Display Name Field" => "Attribut för användarnamn",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Attribut som används för att generera användarnamn i ownCloud.",
 "Base User Tree" => "Bas för användare i katalogtjänst",
 "One User Base DN per line" => "En Användare start DN per rad",
+"User Search Attributes" => "Användarsökningsattribut",
+"Optional; one attribute per line" => "Valfritt; ett attribut per rad",
 "Group Display Name Field" => "Attribut för gruppnamn",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Attribut som används för att generera gruppnamn i ownCloud.",
 "Base Group Tree" => "Bas för grupper i katalogtjänst",
 "One Group Base DN per line" => "En Grupp start DN per rad",
+"Group Search Attributes" => "Gruppsökningsattribut",
 "Group-Member association" => "Attribut för gruppmedlemmar",
+"Special Attributes" => "Specialattribut",
 "in bytes" => "i bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
 "Help" => "Hjälp"
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index c2b5564d0c3..7bdb33d2fcc 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index a3c4ed89318..59f5adcf603 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "التشفير"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "التشفير"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "استبعد أنواع الملفات التالية من التشفير"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "لا شيء"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 8e5aeda0842..6faf2d1a518 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Криптиране"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Криптиране"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Изключване на следните файлови типове от криптирането"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Няма"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 4be08a9e00f..aa9ec984622 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "সংকেতায়ন"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "সংকেতায়ন"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "কোনটিই নয়"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 78e847f6e1e..c5cc2dc2b4a 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-26 00:09+0100\n"
-"PO-Revision-Date: 2013-01-25 08:06+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Comproveu les contrasenyes i proveu-ho de nou."
 msgid "Could not change your file encryption password to your login password"
 msgstr "No s'ha pogut canviar la contrasenya d'encriptació de fitxers per la d'accés"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Escolliu el mode d'encriptació:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Encriptació per part del client (més segura però fa impossible l'accés a les dades des de la interfície web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Encriptació per part del servidor (permet accedir als fitxers des de la interfície web i des del client d'escriptori)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Cap (sense encriptació)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Important: quan seleccioneu un mode d'encriptació no hi ha manera de canviar-lo de nou"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Específic per usuari (permet que l'usuari ho decideixi)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Encriptatge"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Exclou els tipus de fitxers següents de l'encriptatge"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Cap"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index c26a7ff0125..2df7a8af809 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 20:21+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Zkontrolujte, prosím, své heslo a zkuste to znovu."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Nelze změnit šifrovací heslo na přihlašovací."
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Vyberte režim šifrování:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Šifrování na straně klienta (nejbezpečnější ale neumožňuje vám přistupovat k souborům z webového rozhraní)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Šifrování na straně serveru (umožňuje vám přistupovat k souborům pomocí webového rozhraní i aplikací)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Žádný (vůbec žádné šifrování)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Důležité: jak si jednou vyberete režim šifrování nelze jej opětovně změnit"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Definován uživatelem (umožní uživateli si vybrat)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Při šifrování vynechat následující typy souborů"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Žádné"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 78a06bdcabc..2a28a291a50 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 12:03+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Check adgangskoder og forsøg igen."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Kunne ikke udskifte krypteringskode med login-adgangskode"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Vælg krypteringsform:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Kryptering på klientsiden (mere sikker, men udelukker adgang til dataene fra webinterfacet)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Kryptering på serversiden (gør det muligt at tilgå filer fra webinterfacet såvel som desktopklienten)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Ingen (ingen kryptering)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Vigtigt: Når der er valgt krypteringsform, kan det ikke ændres tilbage igen."
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Brugerspecifik (lad brugeren bestemme)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Ekskluder følgende filtyper fra kryptering"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ingen"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 2407e4ec911..858ca4d6923 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 12:47+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden."
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Wählen Sie die Verschlüsselungsart:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Clientseitige Verschlüsselung (am sichersten, aber macht es unmöglich auf ihre Daten über das Webinterface zuzugreifen)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Serverseitige Verschlüsselung (erlaubt es ihnen auf ihre Daten über das Webinterface und den Desktop-Client zuzugreifen)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Keine (ohne Verschlüsselung)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Wichtig: Sobald sie eine Verschlüsselungsmethode gewählt haben, können Sie diese nicht ändern!"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Benutzerspezifisch (der Benutzer kann entscheiden)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Keine"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index daeb5466e57..8d49245d9f5 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 12:47+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,44 +44,22 @@ msgstr "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden."
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Wählen Sie die Verschlüsselungsmethode:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Clientseitige Verschlüsselung (am sichersten, aber macht es unmöglich auf ihre Daten über das Webinterface zuzugreifen)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Serverseitige Verschlüsselung (erlaubt es ihnen auf ihre Daten über das Webinterface und den Desktop-Client zuzugreifen)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Keine (ohne Verschlüsselung)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Wichtig: Sobald sie eine Verschlüsselungsmethode gewählt haben, können Sie diese nicht ändern!"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Benutzerspezifisch (der Benutzer kann entscheiden)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Keine"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 8733b3c0019..fe96e9ba8af 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 08:32+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας κα�
 msgid "Could not change your file encryption password to your login password"
 msgstr "Αδυναμία αλλαγής συνθηματικού κρυπτογράφησης αρχείων στο συνθηματικό εισόδου σας"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Επιλογή κατάστασης κρυπτογράφησης:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Κρυπτογράφηση"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Καμία"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index ee8d61876c1..77ddc820b56 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Ĉifrado"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Ĉifrado"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Malinkluzivigi la jenajn dosiertipojn el ĉifrado"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nenio"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b2bb1203414..d5984a7cbf7 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -12,13 +12,14 @@
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011-2012.
 #   <sergio@entrecables.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 22:50+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,46 +27,46 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Fallo no se subió el fichero"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "No se ha producido ningún error, el archivo se ha subido con éxito"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentas subir solo se subió parcialmente"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:52
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -115,7 +116,7 @@ msgstr "reemplazado {new_name} con {old_name}"
 
 #: js/filelist.js:280
 msgid "perform delete operation"
-msgstr ""
+msgstr "Eliminar"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -133,11 +134,11 @@ msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)"
 
 #: js/files.js:224
 msgid ""
@@ -186,31 +187,31 @@ msgstr "La URL no puede estar vacía."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -268,7 +269,7 @@ msgstr "Desde el enlace"
 
 #: templates/index.php:40
 msgid "Trash"
-msgstr ""
+msgstr "Basura"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -302,4 +303,4 @@ msgstr "Ahora escaneando"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Actualizando cache de archivos de sistema"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index fa6fcc6a7b7..cfd77783345 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 14:50+0000\n"
-"Last-Translator: felix.liberio <felix.liberio@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,44 +42,22 @@ msgstr "Por favor revise su contraseña e intentelo de nuevo."
 msgid "Could not change your file encryption password to your login password"
 msgstr "No se pudo cambiar la contraseña de cifrado de archivos de su contraseña de inicio de sesión"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Elegir el modo de cifrado:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Cifrado del lado del Cliente ( es el más seguro, pero hace que sea imposible acceder a sus datos desde la interfaz web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Cifrado del lado del Servidor (le permite acceder a sus archivos desde la interfaz web y el cliente de escritorio)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Ninguno (ningún cifrado en absoluto)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Importante: Una vez que haya seleccionado un modo de cifrado no existe forma de cambiarlo de nuevo"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Específico del usuario (dejar que el usuario decida)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Excluir del cifrado los siguientes tipos de archivo"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ninguno"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 81d77e8689a..14f67707885 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 22:40+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: js/trash.js:7 js/trash.js:69
 msgid "perform restore operation"
-msgstr ""
+msgstr "Restaurar"
 
 #: js/trash.js:100 templates/index.php:17
 msgid "Name"
@@ -27,7 +28,7 @@ msgstr "Nombre"
 
 #: js/trash.js:101 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Eliminado"
 
 #: js/trash.js:110
 msgid "1 folder"
@@ -47,7 +48,7 @@ msgstr "{count} archivos"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Nada aqui. La papelera esta vacia!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 775bcdb6d92..5087cce0920 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,13 +15,14 @@
 #   <rom1dep@gmail.com>, 2011.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011-2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:00+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,11 +90,11 @@ msgstr "Imposible eliminar al usuario del grupo %s"
 
 #: ajax/updateapp.php:13
 msgid "Couldn't update app."
-msgstr ""
+msgstr "No se puedo actualizar la aplicacion."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Actualizado a {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -105,15 +106,15 @@ msgstr "Activar"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Espere por favor...."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Actualizando...."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Error mientras se actualizaba"
 
 #: js/apps.js:87
 msgid "Error"
@@ -121,7 +122,7 @@ msgstr "Error"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Actualizado"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -200,67 +201,67 @@ msgstr "Descargar cliente para android"
 msgid "Download iOS Client"
 msgstr "Descargar cliente para iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar tu contraseña"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostrar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:33
+#: templates/personal.php:38
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:34
+#: templates/personal.php:39
 msgid "Your email address"
 msgstr "Tu dirección de correo"
 
-#: templates/personal.php:35
+#: templates/personal.php:40
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:46 templates/personal.php:47
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:52
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:52
+#: templates/personal.php:57
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:59
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
 
-#: templates/personal.php:63
+#: templates/personal.php:68
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:70
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -272,7 +273,7 @@ msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_bl
 
 #: templates/users.php:21 templates/users.php:79
 msgid "Login Name"
-msgstr ""
+msgstr "Nombre de usuario"
 
 #: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
@@ -296,7 +297,7 @@ msgstr "Otro"
 
 #: templates/users.php:80
 msgid "Display Name"
-msgstr ""
+msgstr "Nombre a mostrar"
 
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
@@ -308,11 +309,11 @@ msgstr "Alamacenamiento"
 
 #: templates/users.php:97
 msgid "change display name"
-msgstr ""
+msgstr "Cambiar nombre a mostrar"
 
 #: templates/users.php:101
 msgid "set new password"
-msgstr ""
+msgstr "Configurar nueva contraseña"
 
 #: templates/users.php:137
 msgid "Default"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 048364d885d..1934ad18712 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -10,13 +10,14 @@
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 06:10+0000\n"
-"Last-Translator: felix.liberio <felix.liberio@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgstr "Falló el borrado"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Hacerse cargo de los ajustes de configuración del servidor reciente?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -95,7 +96,7 @@ msgstr "Configuración del Servidor"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Agregar configuracion del servidor"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -179,15 +180,15 @@ msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Configuracion de coneccion"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuracion activa"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
 #: templates/settings.php:34
 msgid "Port"
@@ -195,25 +196,25 @@ msgstr "Puerto"
 
 #: templates/settings.php:35
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Host para backup (Replica)"
 
 #: templates/settings.php:35
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
 
 #: templates/settings.php:36
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Puerto para backup (Replica)"
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Deshabilitar servidor principal"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
 
 #: templates/settings.php:38
 msgid "Use TLS"
@@ -247,7 +248,7 @@ msgstr "en segundos. Un cambio vacía la cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Configuracion de directorio"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -267,11 +268,11 @@ msgstr "Un DN Base de Usuario por línea"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Atributos de la busqueda de usuario"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Opcional; un atributo por linea"
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
@@ -291,7 +292,7 @@ msgstr "Un DN Base de Grupo por línea"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atributos de busqueda de grupo"
 
 #: templates/settings.php:51
 msgid "Group-Member association"
@@ -299,7 +300,7 @@ msgstr "Asociación Grupo-Miembro"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos especiales"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 11ac9c0c6d7..0e80127a880 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 16:11+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Por favor, revisá tu contraseña e intentalo de nuevo."
 msgid "Could not change your file encryption password to your login password"
 msgstr "No se pudo cambiar la contraseña de encriptación de archivos de tu contraseña de inicio de sesión"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Elegir el modo de encriptación:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "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)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Encriptación por parte del servidor (te permite acceder a tus archivos desde la interfaz web y desde el cliente de escritorio)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Ninguno (ninguna encriptación en absoluto)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Importante: Una vez que haya seleccionado un modo de encriptación, no existe forma de cambiarlo nuevamente"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Específico por usuario (deja que el usuario decida)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Exceptuar de la encriptación los siguientes tipos de archivo"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ninguno"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index eb1004d7bef..c7abb91cb73 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Krüpteerimine"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Krüpteerimine"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Järgnevaid failitüüpe ära krüpteeri"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Pole"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 4e6b0c18e04..8f72a0453b4 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 18:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Mesedez egiaztatu zure pasahitza eta saia zaitez berriro:"
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Hautatu enkriptazio modua:"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Enkriptazioa"
 
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Bat ere ez (enkriptaziorik gabe)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Erabiltzaileak zehaztuta (utzi erabiltzaileari hautatzen)"
-
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Enkriptazioa"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Ez enkriptatu hurrengo fitxategi motak"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Bat ere ez"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index b5ac04c90a9..586cebd200f 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <basir.jafarzadeh@gmail.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 # Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -35,50 +36,28 @@ msgstr ""
 
 #: js/settings-personal.js:25
 msgid "Please check your passwords and try again."
-msgstr ""
+msgstr "لطفا گذرواژه خود را بررسی کنید و دوباره امتحان کنید."
 
 #: js/settings-personal.js:25
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "رمزگذاری"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "رمزگذاری"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "نادیده گرفتن فایل های زیر برای رمز گذاری"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "هیچ‌کدام"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index b53e8d923b6..bc13d018d0b 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -5,15 +5,16 @@
 # Translators:
 #   <basir.jafarzadeh@gmail.com>, 2012.
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 #   <tamass4116@gmail.com>, 2012.
 # vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 14:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 13:30+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیس�
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "این گروه در حال حاضر موجود است"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "افزودن گروه امکان پذیر نیست"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
@@ -47,7 +48,7 @@ msgstr "ایمیل غیر قابل قبول"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "حذف گروه امکان پذیر نیست"
 
 #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
 msgid "Authentication error"
@@ -55,7 +56,7 @@ msgstr "خطا در اعتبار سنجی"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr ""
+msgstr "حذف کاربر امکان پذیر نیست"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -97,11 +98,11 @@ msgstr "فعال"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "لطفا صبر کنید ..."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "در حال بروز رسانی..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
@@ -113,7 +114,7 @@ msgstr "خطا"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "بروز رسانی انجام شد"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -129,7 +130,7 @@ msgstr "برنامه خود را بیافزایید"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "برنامه های بیشتر"
 
 #: templates/apps.php:24
 msgid "Select an App"
@@ -145,7 +146,7 @@ msgstr ""
 
 #: templates/apps.php:31
 msgid "Update"
-msgstr ""
+msgstr "به روز رسانی"
 
 #: templates/help.php:3
 msgid "User Documentation"
@@ -161,7 +162,7 @@ msgstr ""
 
 #: templates/help.php:7
 msgid "Forum"
-msgstr ""
+msgstr "انجمن"
 
 #: templates/help.php:9
 msgid "Bugtracker"
@@ -192,67 +193,67 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "رمز عبور شما تغییر یافت"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "ناتوان در تغییر گذرواژه"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "گذرواژه کنونی"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "گذرواژه جدید"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "نمایش"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:33
+#: templates/personal.php:38
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: templates/personal.php:34
+#: templates/personal.php:39
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:35
+#: templates/personal.php:40
 msgid "Fill in an email address to enable password recovery"
 msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:46 templates/personal.php:47
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:47
+#: templates/personal.php:52
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:52
+#: templates/personal.php:57
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:59
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:68
 msgid "Version"
-msgstr ""
+msgstr "نسخه"
 
-#: templates/personal.php:65
+#: templates/personal.php:70
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -276,11 +277,11 @@ msgstr "ایجاد کردن"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "ذخیره سازی پیش فرض"
 
 #: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "نامحدود"
 
 #: templates/users.php:60 templates/users.php:157
 msgid "Other"
@@ -296,7 +297,7 @@ msgstr ""
 
 #: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "حافظه"
 
 #: templates/users.php:97
 msgid "change display name"
@@ -308,7 +309,7 @@ msgstr ""
 
 #: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "پیش فرض"
 
 #: templates/users.php:165
 msgid "Delete"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 46daefbb3f6..2ec49d42b23 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 # Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 12:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 05:40+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +49,7 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "آیا تنظیمات ذخیره شود ؟"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 69b524af11c..d8095a939b7 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:59+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "Tarkista salasanasi ja yritä uudelleen."
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Choose encryption mode:"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Salaus"
 
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Ei mitään (ei lainkaan salausta)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Tärkeä huomautus: Kun olet valinnut salaustatavan, sitä ei ole mahdollista vaihtaa"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Salaus"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Jätä seuraavat tiedostotyypit salaamatta"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ei mitään"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index f1305f621d6..d20576ced12 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 01:10+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "Veuillez vérifier vos mots de passe et réessayer."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Choix du type de chiffrement :"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Chiffrement côté client (plus sécurisé, mais ne permet pas l'accès à vos données depuis l'interface web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Chiffrement côté serveur (vous permet d'accéder à vos fichiers depuis l'interface web et depuis le client de synchronisation)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Aucun (pas de chiffrement)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Important : Une fois le mode de chiffrement choisi, il est impossible de revenir en arrière"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Propre à l'utilisateur (laisse le choix à l'utilisateur)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Aucun"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 99f4d45ce83..59ec0fc34ac 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,13 +19,14 @@
 # Robert Di Rosa <>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+#  <thomash76@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 20:10+0000\n"
+"Last-Translator: jiminybillybob <thomash76@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +114,7 @@ msgstr "Veuillez patienter…"
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Mise à jour..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
@@ -204,67 +205,67 @@ msgstr "Télécharger le client Android"
 msgid "Download iOS Client"
 msgstr "Télécharger le client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Votre mot de passe a été changé"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "Afficher"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:33
+#: templates/personal.php:38
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:39
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:35
+#: templates/personal.php:40
 msgid "Fill in an email address to enable password recovery"
 msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:46 templates/personal.php:47
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:47
+#: templates/personal.php:52
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:52
+#: templates/personal.php:57
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:59
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
 
-#: templates/personal.php:63
+#: templates/personal.php:68
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:70
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 33a6365c90e..acc3b57fd72 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -7,15 +7,16 @@
 #   <mathieu.payrol@gmail.com>, 2012.
 #   <mishka.lazzlo@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+#  <thomash76@gmail.com>, 2013.
 #   <windes@tructor.net>, 2012.
 #   <zrk951@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 20:10+0000\n"
+"Last-Translator: jiminybillybob <thomash76@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -178,7 +179,7 @@ msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Paramètres de connexion"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
@@ -246,7 +247,7 @@ msgstr "en secondes. Tout changement vide le cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Paramètres du répertoire"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -298,7 +299,7 @@ msgstr "Association groupe-membre"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Attributs spéciaux"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index ba0a8e899da..2d7038a1249 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Cifrado"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Excluír os seguintes tipos de ficheiro do cifrado"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nada"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index cd62f06daf7..5347a271b67 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "הצפנה"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "הצפנה"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "הוצא את סוגי הקבצים הבאים מהצפנה"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "כלום"
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 83154bdbcbf..82eea01a3f3 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index d284b962472..9b86d0ed1f1 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 1a15c06b6fe..0409118f14a 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-29 00:04+0100\n"
-"PO-Revision-Date: 2013-01-28 11:15+0000\n"
-"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,44 +42,22 @@ msgstr "Kérjük, ellenőrizze a jelszavait, és próbálja meg újra."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Nem módosíthatja a fájltitkosítási jelszavát a bejelentkezési jelszavára"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Válassza ki a titkosítási módot:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Kliens oldali titkosítás (biztonságosabb, de lehetetlenné teszi a fájlok elérését a böngészőből)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Kiszolgáló oldali titkosítás (lehetővé teszi a fájlok elérését úgy böngészőből mint az asztali kliensből)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Semmi (semmilyen titkosítás)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Fontos: Ha egyszer kiválasztotta a titkosítás módját, többé már nem lehet megváltoztatni"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Felhasználó specifikus (a felhasználó választhat)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "A következő fájltípusok kizárása a titkosításból"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Egyik sem"
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index bd7a38a6b19..e9ea289fb9e 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index d6d66e61e07..88fc1f30a5a 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "enkripsi"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "enkripsi"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "pengecualian untuk tipe file berikut dari enkripsi"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "tidak ada"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index b46b5ff3c18..4d128e6b4fe 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Dulkóðun"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Dulkóðun"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Undanskilja eftirfarandi skráartegundir frá dulkóðun"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ekkert"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 544caf9fd79..c4035fbac33 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-28 00:04+0100\n"
-"PO-Revision-Date: 2013-01-27 19:44+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "Controlla la password e prova ancora."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Impossibile convertire la password di cifratura nella password di accesso"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Scegli la modalità di cifratura."
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Cifratura lato client (più sicura ma rende impossibile accedere ai propri dati dall'interfaccia web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Cifratura lato server (ti consente di accedere ai tuoi file dall'interfaccia web e dal client desktop)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Nessuna (senza alcuna cifratura)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Importante: una volta selezionata la modalità di cifratura non sarà possibile tornare indietro"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Specificato dall'utente (lascia decidere all'utente)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Escludi i seguenti tipi di file dalla cifratura"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nessuna"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 2c42c902059..95a52309047 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 03:07+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "パスワードを確認してもう一度行なってください。"
 msgid "Could not change your file encryption password to your login password"
 msgstr "ファイル暗号化パスワードをログインパスワードに変更できませんでした。"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "暗号化モードを選択:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "クライアントサイドの暗号化（最もセキュアですが、WEBインターフェースからデータにアクセスできなくなります）"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "サーバサイド暗号化（WEBインターフェースおよびデスクトップクライアントからファイルにアクセスすることができます）"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "暗号化無し（何も暗号化しません）"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "重要: 一度暗号化を選択してしまうと、もとに戻す方法はありません"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "ユーザ指定（ユーザが選べるようにする）"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "暗号化"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "暗号化から除外するファイルタイプ"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "なし"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index f0cc786850b..3bdaa16e102 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 2988d1f0cf5..22d55b96979 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 08:20+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "암호를 확인한 다음 다시 시도하십시오."
 msgid "Could not change your file encryption password to your login password"
 msgstr "암호화 암호를 로그인 암호로 변경할 수 없습니다"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "암호화 모드 선택:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "클라이언트 암호화 (안전하지만 웹에서 데이터에 접근할 수 없음)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "서버 암호화 (웹 및 데스크톱 클라이언트에서 데이터에 접근할 수 있음)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "없음 (암호화하지 않음)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "알림: 암호화 모드를 선택하면 다른 것으로 변경할 수 없습니다"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "사용자 지정 (사용자별 설정)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "암호화"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "다음 파일 형식은 암호화하지 않음"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "없음"
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index d372d58b033..db1496b70d9 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "نهێنیکردن"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "نهێنیکردن"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "به‌ربه‌ست کردنی ئه‌م جۆره‌ په‌ڕگانه له‌ نهێنیکردن"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "هیچ"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index f88e884164b..c8fc462a15b 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 152f3677f83..6e52ef83bbb 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Šifravimas"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Šifravimas"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Nešifruoti pasirinkto tipo failų"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nieko"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 539b9bd02cb..a289289f89e 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 12:00+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "Lūdzu, pārbaudiet savas paroles un mēģiniet vēlreiz."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Nevarēja mainīt datņu šifrēšanas paroli uz ierakstīšanās paroli"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Izvēlieties šifrēšanas režīmu:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Klienta puses šifrēšana (visdrošākā, bet nav iespējams piekļūt saviem datiem no tīmekļa saskarnes)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Servera puses šifrēšana (ļauj piekļūt datnēm ar tīmekļa saskarni un ar darbvirsmas klientu)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Nav (nekādas šifrēšanas)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Svarīgi — kad esat izvēlējies šifrēšanas režīmu, to nekādi nevar mainīt atpakaļ"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Lietotājam specifiski (ļauj lietotājam izlemt)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Sekojošos datņu tipus nešifrēt"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nav"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index b34192fc864..56ed5df95cd 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Енкрипција"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Енкрипција"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Исклучи ги следните типови на датотеки од енкрипција"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ништо"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 65777823e5b..5c9ecb2f228 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 5e2f1a4cf99..c8657a91e1b 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Kryptering"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Ekskluder følgende filer fra kryptering"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ingen"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 16c95df107e..4aafb1900df 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 10:30+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Controleer uw wachtwoorden en probeer het opnieuw."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Kon het bestandsencryptie wachtwoord niet veranderen naar het login wachtwoord"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Kies encryptie mode:"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Versleuteling"
 
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Geen (zonder encryptie)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Belangrijk: Zodra er voor een encryptie mode is gekozen kan deze niet meer worden gewijzigd."
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Versleuteling"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Versleutel de volgende bestand types niet"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Geen"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index f821638fbcd..4db0ffa21b9 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 91f6f906aae..a912cb58e71 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 21fa364ff19..acf7f3f06eb 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Szyfrowanie"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Szyfrowanie"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Wyłącz następujące typy plików z szyfrowania"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Brak"
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index ce8f0779cae..2e95f4ce7e5 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 5c733f9c615..1a4579181b5 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 16:40+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Por favor, verifique suas senhas e tente novamente."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Não foi possível mudar sua senha de criptografia de arquivos para sua senha de login"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Escolha o modo de criptografia:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Criptografia por parte do cliente (mais segura, mas torna impossível acessar seus dados a partir da interface web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Criptografia por parte do servidor (permite que você acesse seus arquivos da interface web e do cliente desktop)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Nenhuma (sem qualquer criptografia)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Importante: Uma vez que tiver escolhido um modo de criptografia, não há um meio de voltar atrás"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Específico por usuário (deixa o usuário decidir)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Excluir os seguintes tipos de arquivo da criptografia"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nenhuma"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 0ae4844da6f..09e55792f70 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 01:09+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Por favor verifique as suas paswords e tente de novo."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Não foi possível alterar a password de encriptação de ficheiros para a sua password de login"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Escolha o método de encriptação"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Encriptação do lado do cliente (mais seguro mas torna possível o acesso aos dados através do interface web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Encriptação do lado do servidor (permite o acesso aos seus ficheiros através do interface web e do cliente de sincronização)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Nenhuma (sem encriptação)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Importante: Uma vez escolhido o modo de encriptação, não existe maneira de o alterar!"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Escolhido pelo utilizador"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Excluir da encriptação os seguintes tipo de ficheiros"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Nenhum"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 504f72e85c4..10fad6ca469 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-26 00:05+0000\n"
-"Last-Translator: Dimon Pockemon <>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Verifică te rog parolele și înceracă din nou."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Nu s-a putut schimba parola de encripție a fișierelor ca parolă de acces"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Alege tipul de ecripție"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Encripție locală (cea mai sigură, dar face ca datele să nu mai fie accesibile din interfața web)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Encripție pe server (permite să accesezi datele tale din interfața web și din clientul pentru calculator)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Fără (nici un fel de ecriptare)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Important: Din moment ce ai setat un mod de encriptare, nu mai există metode de a-l schimba înapoi"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Spefic fiecărui utilizator (lasă utilizatorul să decidă)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Încriptare"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Exclude următoarele tipuri de fișiere de la încriptare"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Niciuna"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 9a2315aa144..b9f437eee8c 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Шифрование"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Шифрование"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Исключить шифрование следующих типов файлов"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ничего"
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index 2453fc2cb9d..41f89c1b290 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 12:11+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Пожалуйста, проверьте Ваш пароль и попр
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Выберите способ шифрования:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Шифрование на стороне клиента (наиболее безопасно, но делает невозможным получение доступа к Вашим данным по вэб-интерфейсу)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Шифрование на стороне сервера (позволяет Вам получить доступ к Вашим файлам по вэб-интерфейсу и десктопному клиенту)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Нет (шифрование полностью отсутствует)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Важно: Невозможно будет изменить выбранный способ шифрования"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Специфика пользователя (позволено решить пользователю)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Исключите следующие типы файлов из шифрования"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ни один"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 8f8475ed596..14724b9e31c 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "ගුප්ත කේතනය"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "ගුප්ත කේතනය"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "මෙම ගොනු වර්ග ගුප්ත කේතනය කිරීමෙන් බැහැරව තබන්න"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "කිසිවක් නැත"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index d2847e30d9e..7977f0fe3e1 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 14:49+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "Skontrolujte si heslo a skúste to znovu."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Nie je možné zmeniť šifrovacie heslo na prihlasovacie"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Vyberte režim šifrovania:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Šifrovanie prostredníctvom klienta (najbezpečnejšia voľba, neumožňuje však prístup k súborom z webového rozhrania)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Šifrovanie na serveri (umožňuje pristupovať k súborom z webového rozhrania a desktopového klienta)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Žiadne (žiadne šifrovanie)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Dôležité: ak si zvolíte režim šifrovania, nie je možné ho znovu zrušiť"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Definovaný používateľom (umožňuje používateľovi vybrať si)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Vynechať nasledujúce súbory pri šifrovaní"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Žiadne"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 934903b3bc5..da59ca9a476 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -41,44 +41,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Šifriranje"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Šifriranje"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Navedene vrste datotek naj ne bodo šifrirane"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Brez"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 661f59f97b0..a67b4bd93ab 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 15:00+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 19:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -162,55 +162,55 @@ msgstr "Децембар"
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:759
+#: js/js.js:760
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:760
+#: js/js.js:761
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: js/js.js:761
+#: js/js.js:762
 msgid "{minutes} minutes ago"
 msgstr "пре {minutes} минута"
 
-#: js/js.js:762
+#: js/js.js:763
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: js/js.js:763
+#: js/js.js:764
 msgid "{hours} hours ago"
 msgstr "Пре {hours} сата (сати)"
 
-#: js/js.js:764
+#: js/js.js:765
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:765
+#: js/js.js:766
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:766
+#: js/js.js:767
 msgid "{days} days ago"
 msgstr "пре {days} дана"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "{months} months ago"
 msgstr "Пре {months} месеца (месеци)"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "years ago"
 msgstr "година раније"
 
@@ -565,11 +565,11 @@ msgstr "Промените лозинку да бисте обезбедили �
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Пријава"
 
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 7765fc06e6c..4578d747327 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,44 +41,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Шифровање"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Шифровање"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Не шифруј следеће типове датотека"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ништа"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 345fb947c11..b7069b0278a 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 08:30+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 19:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Лозинка"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/public.php:17
+#: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:19
+#: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:14 templates/public.php:30
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:29
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: templates/public.php:35
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 64e5a5df379..9bd0665d7c2 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 19:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -190,67 +190,67 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Лозинка је промењена"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Не могу да изменим вашу лозинку"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "прикажи"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:33
+#: templates/personal.php:38
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:34
+#: templates/personal.php:39
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:35
+#: templates/personal.php:40
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ун"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:46 templates/personal.php:47
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:47
+#: templates/personal.php:52
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:52
+#: templates/personal.php:57
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:59
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:68
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:70
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 425922382c7..138ac0e03ff 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <theranchcowboy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 20:40+0000\n"
+"Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,16 +93,16 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Host"
-msgstr ""
+msgstr "Домаћин"
 
 #: templates/settings.php:21
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
 
 #: templates/settings.php:22
 msgid "Base DN"
-msgstr ""
+msgstr "База DN"
 
 #: templates/settings.php:22
 msgid "One Base DN per line"
@@ -113,62 +114,62 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "User DN"
-msgstr ""
+msgstr "Корисник DN"
 
 #: templates/settings.php:23
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним."
 
 #: templates/settings.php:24
 msgid "Password"
-msgstr ""
+msgstr "Лозинка"
 
 #: templates/settings.php:24
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "За анониман приступ, оставите поља DN и лозинка празним."
 
 #: templates/settings.php:25
 msgid "User Login Filter"
-msgstr ""
+msgstr "Филтер за пријаву корисника"
 
 #: templates/settings.php:25
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
 
 #: templates/settings.php:25
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
 
 #: templates/settings.php:26
 msgid "User List Filter"
-msgstr ""
+msgstr "Филтер за списак корисника"
 
 #: templates/settings.php:26
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Одређује филтер за примењивање при прибављању корисника."
 
 #: templates/settings.php:26
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "без икаквог чувара места, нпр. „objectClass=person“."
 
 #: templates/settings.php:27
 msgid "Group Filter"
-msgstr ""
+msgstr "Филтер групе"
 
 #: templates/settings.php:27
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Одређује филтер за примењивање при прибављању група."
 
 #: templates/settings.php:27
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
@@ -184,7 +185,7 @@ msgstr ""
 
 #: templates/settings.php:34
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: templates/settings.php:35
 msgid "Backup (Replica) Host"
@@ -210,33 +211,33 @@ msgstr ""
 
 #: templates/settings.php:38
 msgid "Use TLS"
-msgstr ""
+msgstr "Користи TLS"
 
 #: templates/settings.php:38
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Не користите за SSL везе јер неће радити."
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
 #: templates/settings.php:40
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Искључите потврду SSL сертификата."
 
 #: templates/settings.php:40
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Увезите SSL сертификат LDAP сервера у свој ownCloud ако веза ради само са овом опцијом."
 
 #: templates/settings.php:40
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Не препоручује се; користите само за тестирање."
 
 #: templates/settings.php:41
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "у секундама. Промена испражњава кеш меморију."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
@@ -244,15 +245,15 @@ msgstr ""
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Име приказа корисника"
 
 #: templates/settings.php:45
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP атрибут за стварање имена ownCloud-а корисника."
 
 #: templates/settings.php:46
 msgid "Base User Tree"
-msgstr ""
+msgstr "Основно стабло корисника"
 
 #: templates/settings.php:46
 msgid "One User Base DN per line"
@@ -268,15 +269,15 @@ msgstr ""
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Име приказа групе"
 
 #: templates/settings.php:48
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP атрибут за стварање имена ownCloud-а групе."
 
 #: templates/settings.php:49
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Основна стабло група"
 
 #: templates/settings.php:49
 msgid "One Group Base DN per line"
@@ -288,7 +289,7 @@ msgstr ""
 
 #: templates/settings.php:51
 msgid "Group-Member association"
-msgstr ""
+msgstr "Придруживање чланова у групу"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
@@ -296,7 +297,7 @@ msgstr ""
 
 #: templates/settings.php:56
 msgid "in bytes"
-msgstr ""
+msgstr "у бајтовима"
 
 #: templates/settings.php:58
 msgid ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 39f12cfb59b..55b2d059ad0 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index cb599b8ee0c..1e4c8002b08 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 20:45+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "Kontrollera dina lösenord och försök igen."
 msgid "Could not change your file encryption password to your login password"
 msgstr "Kunde inte ändra ditt filkrypteringslösenord till ditt loginlösenord"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "Välj krypteringsläge:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "Kryptering på klientsidan (säkraste men gör det omöjligt att komma åt dina filer med en webbläsare)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "Kryptering på serversidan (kan komma åt dina filer från webbläsare och datorklient)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "Ingen (ingen kryptering alls)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "Viktigt: När du har valt ett krypteringsläge finns det inget sätt att ändra tillbaka"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "Användarspecifik (låter användaren bestämma)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Exkludera följande filtyper från kryptering"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Ingen"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 1f1237b9af1..955753ff393 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <admin@danielholm.se>, 2013.
 # André <lokal_profil@hotmail.com>, 2013.
 # Magnus Höglund <magnus@linux.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 14:20+0000\n"
+"Last-Translator: danielholm <admin@danielholm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "Inställningen är giltig och anslutningen kunde upprättas!"
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation."
 
 #: ajax/testConfiguration.php:40
 msgid ""
@@ -45,7 +46,7 @@ msgstr "Raderingen misslyckades"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Ta över inställningar från tidigare serverkonfiguration?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -174,15 +175,15 @@ msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Uppkopplingsinställningar"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfiguration aktiv"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
 
 #: templates/settings.php:34
 msgid "Port"
@@ -190,17 +191,17 @@ msgstr "Port"
 
 #: templates/settings.php:35
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Säkerhetskopierings-värd (Replika)"
 
 #: templates/settings.php:35
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
 
 #: templates/settings.php:36
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Säkerhetskopierins-port (Replika)"
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
@@ -208,7 +209,7 @@ msgstr "Inaktivera huvudserver"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast."
 
 #: templates/settings.php:38
 msgid "Use TLS"
@@ -242,7 +243,7 @@ msgstr "i sekunder. En förändring tömmer cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Mappinställningar"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -262,11 +263,11 @@ msgstr "En Användare start DN per rad"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Användarsökningsattribut"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Valfritt; ett attribut per rad"
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
@@ -286,7 +287,7 @@ msgstr "En Grupp start DN per rad"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Gruppsökningsattribut"
 
 #: templates/settings.php:51
 msgid "Group-Member association"
@@ -294,7 +295,7 @@ msgstr "Attribut för gruppmedlemmar"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Specialattribut"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 82cfd11914c..dc06118a3e5 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "மறைக்குறியீடு"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "மறைக்குறியீடு"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "மறைக்குறியாக்கலில் பின்வரும் கோப்பு வகைகளை நீக்கவும்"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "ஒன்றுமில்லை"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6f663178aa4..f1afb42f0ee 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ae36fd501f5..34bc7000c62 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 64e6d0ded68..7a06b3ede0a 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it "
-"back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 43f9d2e2965..84e3ca4e992 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 92fc21f0d1f..5de56c72e91 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0b16639a53d..206be07e682 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index e785197b7b9..94a37a83d03 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 9c1b1b4bcfa..69d33a082d0 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 3e4d268fe83..40c9c5deb2c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,67 +189,67 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:38
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:34
+#: templates/personal.php:39
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:40
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:46 templates/personal.php:47
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:52
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:57
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:59
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:68
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:70
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index ac142ab399e..8e560cca7ce 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index def54daf0e5..9690e764a5c 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index e76ad6347f8..5131a396a5a 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 15:03+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,44 +40,22 @@ msgstr "กรุณาตรวจสอบรหัสผ่านของค
 msgid "Could not change your file encryption password to your login password"
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่านสำหรับการเข้ารหัสไฟล์ของคุณไปเป็นรหัสผ่านสำหรับการเข้าสู่ระบบของคุณได้"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "เลือกรูปแบบการเข้ารหัส:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "การเข้ารหัสด้วยโปรแกรมไคลเอนต์ (ปลอดภัยที่สุด แต่จะทำให้คุณไม่สามารถเข้าถึงข้อมูลต่างๆจากหน้าจอเว็บไซต์ได้)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "การเข้ารหัสจากทางฝั่งเซิร์ฟเวอร์ (อนุญาตให้คุณเข้าถึงไฟล์ของคุณจากหน้าจอเว็บไซต์ และโปรแกรมไคลเอนต์จากเครื่องเดสก์ท็อปได้)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "ไม่ต้อง (ไม่มีการเข้ารหัสเลย)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "ข้อความสำคัญ: หลังจากที่คุณได้เลือกรูปแบบการเข้ารหัสแล้ว จะไม่สามารถเปลี่ยนกลับมาใหม่ได้อีก"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "ให้ผู้ใช้งานเลือกเอง (ปล่อยให้ผู้ใช้งานตัดสินใจเอง)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "ไม่ต้อง"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index e95281ce029..d8297b19c35 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Şifreleme"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Şifreleme"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Hiçbiri"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 884db2f7afa..535f3068553 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Шифрування"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Шифрування"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Не шифрувати файли наступних типів"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Жоден"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index a6019e03022..a845b05ea15 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "Mã hóa"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "Mã hóa"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "Loại trừ các loại tập tin sau đây từ mã hóa"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "Không có gì hết"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index f85989afca2..bacd5c9294b 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "加密"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "从加密中排除如下文件类型"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "无"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 5395d6734d1..f7e50a5ccc1 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "加密"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "从加密中排除列出的文件类型"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "None"
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index adf957c6ee4..c8652a2cde3 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -39,44 +39,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr ""
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr ""
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 0ff077a2b2e..785876bb0fb 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-26 01:44+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "請檢查您的密碼並再試一次。"
 msgid "Could not change your file encryption password to your login password"
 msgstr "無法變更您的檔案加密密碼為登入密碼"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "選擇加密模式："
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "客戶端加密 (最安全但是會使您無法從網頁界面存取您的檔案)"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "伺服器端加密 (您可以從網頁界面及客戶端程式存取您的檔案)"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "無 (不加密)"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "重要：一旦您選擇了加密就無法再改回來"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "使用者自訂 (讓使用者自己決定)"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "下列的檔案類型不加密"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "無"
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 0b82c3b7f01..e0649587a44 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -13,9 +13,15 @@
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
 "Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
+"Couldn't update app." => "No se puedo actualizar la aplicacion.",
+"Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
+"Please wait...." => "Espere por favor....",
+"Updating...." => "Actualizando....",
+"Error while updating app" => "Error mientras se actualizaba",
 "Error" => "Error",
+"Updated" => "Actualizado",
 "Saving..." => "Guardando...",
 "__language_name__" => "Castellano",
 "Add your App" => "Añade tu aplicación",
@@ -51,13 +57,17 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Login Name" => "Nombre de usuario",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
+"Display Name" => "Nombre a mostrar",
 "Group Admin" => "Grupo admin",
 "Storage" => "Alamacenamiento",
+"change display name" => "Cambiar nombre a mostrar",
+"set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 349af0e503f..0d35ddc226b 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,18 +1,28 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
+"Group already exists" => "این گروه در حال حاضر موجود است",
+"Unable to add group" => "افزودن گروه امکان پذیر نیست",
 "Email saved" => "ایمیل ذخیره شد",
 "Invalid email" => "ایمیل غیر قابل قبول",
+"Unable to delete group" => "حذف گروه امکان پذیر نیست",
 "Authentication error" => "خطا در اعتبار سنجی",
+"Unable to delete user" => "حذف کاربر امکان پذیر نیست",
 "Language changed" => "زبان تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
+"Please wait...." => "لطفا صبر کنید ...",
+"Updating...." => "در حال بروز رسانی...",
 "Error" => "خطا",
+"Updated" => "بروز رسانی انجام شد",
 "Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
 "Add your App" => "برنامه خود را بیافزایید",
+"More Apps" => "برنامه های بیشتر",
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
+"Update" => "به روز رسانی",
+"Forum" => "انجمن",
 "Clients" => "مشتریان",
 "Password" => "گذرواژه",
 "Your password was changed" => "رمز عبور شما تغییر یافت",
@@ -26,8 +36,13 @@
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
+"Version" => "نسخه",
 "Groups" => "گروه ها",
 "Create" => "ایجاد کردن",
+"Default Storage" => "ذخیره سازی پیش فرض",
+"Unlimited" => "نامحدود",
 "Other" => "سایر",
+"Storage" => "حافظه",
+"Default" => "پیش فرض",
 "Delete" => "پاک کردن"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1e80ce13c1e..b870b56607c 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -18,6 +18,7 @@
 "Disable" => "Désactiver",
 "Enable" => "Activer",
 "Please wait...." => "Veuillez patienter…",
+"Updating...." => "Mise à jour...",
 "Error while updating app" => "Erreur lors de la mise à jour de l'application",
 "Error" => "Erreur",
 "Updated" => "Mise à jour effectuée avec succès",