Merge branch 'master' into file_encryption_util_is_error

Conflicts:
	apps/files_encryption/lib/util.php

apps/files/l10n/hu_HU.php

@@ -46,6 +46,7 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fájl",
 "{count} files" => "{count} fájl",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
 "Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",

apps/files_encryption/l10n/ar.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "جاري الحفظ...",
 "Encryption" => "التشفير"
 );

apps/files_encryption/l10n/bg_BG.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Записване...",
 "Encryption" => "Криптиране"
 );

apps/files_encryption/l10n/bn_BD.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "Encryption" => "সংকেতায়ন"
 );

apps/files_encryption/l10n/ca.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Desant...",
 "Encryption" => "Xifrat"
 );

apps/files_encryption/l10n/cs_CZ.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Ukládám...",
 "Encryption" => "Šifrování"
 );

apps/files_encryption/l10n/cy_GB.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Yn cadw...",
 "Encryption" => "Amgryptiad"
 );

apps/files_encryption/l10n/da.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Gemmer...",
 "Encryption" => "Kryptering"
 );

apps/files_encryption/l10n/de.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Speichern...",
 "Encryption" => "Verschlüsselung"
 );

apps/files_encryption/l10n/de_DE.php

 <?php $TRANSLATIONS = array(
-"Encryption" => "Verschlüsselung"
+"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
+"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Saving..." => "Speichern...",
+"Encryption" => "Verschlüsselung",
+"Enabled" => "Aktiviert",
+"Disabled" => "Deaktiviert",
+"Change Password" => "Passwort ändern"
 );

apps/files_encryption/l10n/el.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Γίνεται αποθήκευση...",
 "Encryption" => "Κρυπτογράφηση"
 );

apps/files_encryption/l10n/eo.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Konservante...",
 "Encryption" => "Ĉifrado"
 );

apps/files_encryption/l10n/es.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Guardando...",
 "Encryption" => "Cifrado"
 );

apps/files_encryption/l10n/es_AR.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Guardando...",
 "Encryption" => "Encriptación"
 );

apps/files_encryption/l10n/et_EE.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Salvestamine...",
 "Encryption" => "Krüpteerimine"
 );

apps/files_encryption/l10n/eu.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Gordetzen...",
 "Encryption" => "Enkriptazioa"
 );

apps/files_encryption/l10n/fa.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "در حال ذخیره سازی...",
 "Encryption" => "رمزگذاری"
 );

apps/files_encryption/l10n/fi_FI.php

 <?php $TRANSLATIONS = array(
-"Encryption" => "Salaus"
+"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
+"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Saving..." => "Tallennetaan...",
+"Encryption" => "Salaus",
+"Enabled" => "Käytössä",
+"Disabled" => "Ei käytössä",
+"Change Password" => "Vaihda salasana"
 );

apps/files_encryption/l10n/fr.php

 <?php $TRANSLATIONS = array(
+"Saving..." => "Enregistrement...",
 "Encryption" => "Chiffrement"
 );

apps/files_encryption/l10n/gl.php

 <?php $TRANSLATIONS = array(
-"Encryption" => "Cifrado"
+"Recovery key successfully " => "O contrasinal foi recuperado satisfactoriamente",
+"Could not " => "Non foi posíbel",
+"Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
+"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+"Saving..." => "Gardando...",
+"Encryption" => "Cifrado",
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
+"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enabled" => "Activado",
+"Disabled" => "Desactivado",
+"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
+"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
+"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change Password" => "Cambiar o contrasinal",
+"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal",
+"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
+"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
 );