Merge branch 'master' into load-apps-proper-master

Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php

74 files changed, 1621 insertions, 347 deletions

diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 67cbc6655dd..cdc689a211c 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "ادخال خاطئ لقيمة %s",
+"Saved" => "حفظ",
+"test email settings" => "إعدادات البريد التجريبي",
+"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "حدث خطأ اثناء ارسال البريد الالكتروني ، الرجاء مراجعة اعداداتك",
+"Email sent" => "تم ارسال البريد الالكتروني",
+"Send mode" => "وضعية الإرسال",
+"Encryption" => "التشفير",
+"Authentication method" => "أسلوب التطابق",
 "Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
+"Your full name has been changed." => "اسمك الكامل تم تغييره.",
+"Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل",
 "Group already exists" => "المجموعة موجودة مسبقاً",
 "Unable to add group" => "فشل إضافة المجموعة",
 "Email saved" => "تم حفظ البريد الإلكتروني",
@@ -14,16 +25,31 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "فشل إضافة المستخدم الى المجموعة %s",
 "Unable to remove user from group %s" => "فشل إزالة المستخدم من المجموعة %s",
 "Couldn't update app." => "تعذر تحديث التطبيق.",
+"Wrong password" => "كلمة مرور خاطئة",
+"No user supplied" => "لم يتم توفير مستخدم ",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم ",
+"Wrong admin recovery password. Please check the password and try again." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+"Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Sending..." => "جاري الارسال ...",
+"User Documentation" => "كتاب توثيق المستخدم",
 "Update to {appversion}" => "تم التحديث الى ",
 "Disable" => "إيقاف",
 "Enable" => "تفعيل",
 "Please wait...." => "الرجاء الانتظار ...",
+"Error while disabling app" => "خطا عند تعطيل البرنامج",
+"Error while enabling app" => "خطا عند تفعيل البرنامج ",
 "Updating...." => "جاري التحديث ...",
 "Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
 "Error" => "خطأ",
 "Update" => "حدث",
 "Updated" => "تم التحديث بنجاح",
-"Saving..." => "جاري الحفظ...",
+"Select a profile picture" => "اختر صورة الملف الشخصي ",
+"Very weak password" => "كلمة السر ضعيفة جدا",
+"Weak password" => "كلمة السر ضعيفة",
+"Good password" => "كلمة السر جيدة",
+"Strong password" => "كلمة السر قوية",
+"Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
 "deleted" => "تم الحذف",
 "undo" => "تراجع",
 "Unable to remove user" => "تعذر حذف المستخدم",
@@ -34,27 +60,55 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
 "Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
 "A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة",
+"Warning: Home directory for user \"{user}\" already exists" => "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
 "__language_name__" => "__language_name__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
+"Info, warnings, errors and fatal issues" => "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
+"Warnings, errors and fatal issues" => "تحذيرات , اخطاء , مشاكل فادحة ",
+"Errors and fatal issues" => "اخطاء ومشاكل فادحة ",
+"Fatal issues only" => "مشاكل فادحة فقط ",
+"None" => "لا شيء",
+"Login" => "تسجيل الدخول",
 "Security Warning" => "تحذير أمان",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. ",
 "Setup Warning" => "تحذير في التنصيب",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
+"Please double check the <a href=\"%s\">installation guides</a>." => "يرجى التحقق <a href=\"%s\">دليل التثبيت</a>.",
 "Module 'fileinfo' missing" => "الموديل 'fileinfo' مفقود",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق ",
+"Your PHP version is outdated" => "اصدار PHP الخاص بك قديم",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة.",
 "Locale not working" => "اللغه لا تعمل",
+"System locale can not be set to a one which supports UTF-8." => "لا يمكن تعيين لغة النظام الى احد اللغات التي تدعم UTF-8.",
+"This means that there might be problems with certain characters in file names." => "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
 "Internet connection not working" => "الاتصال بالانترنت لا يعمل",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
 "Cron" => "مجدول",
 "Execute one task with each page loaded" => "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه",
+"Use systems cron service to call the cron.php file every 15 minutes." => "استخدم نظام خدمة cron لـ استدعاء ملف cron.php كل 15 دقيقة ",
 "Sharing" => "مشاركة",
 "Enable Share API" => "السماح بالمشاركة عن طريق الAPI ",
 "Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
 "Allow links" => "السماح بالعناوين",
 "Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
+"Allow public uploads" => "السماح بالرفع للعامة ",
+"Allow users to enable others to upload into their publicly shared folders" => "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام ",
 "Allow resharing" => "السماح بإعادة المشاركة ",
 "Allow users to share items shared with them again" => "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم",
 "Allow users to share with anyone" => "السماح للمستعملين بإعادة المشاركة مع أي أحد  ",
 "Allow users to only share with users in their groups" => "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم",
+"Allow mail notification" => "السماح بتنبيهات البريد الالكتروني.",
+"Allow user to send mail notification for shared files" => "السماح للمستخدم الى ارسال تنبيه البريد الالكتروني للملفات المشتركة ",
 "Security" => "حماية",
 "Enforce HTTPS" => "فرض HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
+"Email Server" => "خادم البريد الالكتروني",
+"Server address" => "عنوان الخادم",
+"Port" => "المنفذ",
 "Log" => "سجل",
 "Log level" => "مستوى السجل",
 "More" => "المزيد",
@@ -64,9 +118,9 @@ $TRANSLATIONS = array(
 "Add your App" => "أضف تطبيقاتك",
 "More Apps" => "المزيد من التطبيقات",
 "Select an App" => "إختر تطبيقاً",
+"Documentation:" => "التوثيق",
 "See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>",
-"User Documentation" => "كتاب توثيق المستخدم",
 "Administrator Documentation" => "كتاب توثيق المدير",
 "Online Documentation" => "توثيق متوفر على الشبكة",
 "Forum" => "منتدى",
@@ -81,21 +135,35 @@ $TRANSLATIONS = array(
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
 "Change password" => "عدل كلمة السر",
+"Full Name" => "اسمك الكامل",
 "Email" => "البريد الإلكترونى",
 "Your email address" => "عنوانك البريدي",
-"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور",
-"Abort" => "إلغاء.",
+"Profile picture" => "صورة الملف الشخصي",
+"Upload new" => "رفع الان",
+"Select new from Files" => "اختر جديد من الملفات ",
+"Remove image" => "احذف الصورة ",
+"Either png or jpg. Ideally square but you will be able to crop it." => "سواء png او jpg. بامكانك قص الصورة ",
+"Your avatar is provided by your original account." => "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
+"Cancel" => "الغاء",
+"Choose as profile image" => "اختر صورة الملف الشخصي",
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
-"Encryption" => "التشفير",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
+"Log-in password" => "كلمه سر الدخول",
+"Decrypt all Files" => "فك تشفير جميع الملفات ",
 "Login Name" => "اسم الدخول",
 "Create" => "انشئ",
+"Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
+"Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
 "Default Storage" => "وحدة التخزين الافتراضية",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
 "Username" => "إسم المستخدم",
 "Storage" => "وحدة التخزين",
+"change full name" => "تغيير اسمك الكامل",
 "set new password" => "اعداد كلمة مرور جديدة",
 "Default" => "افتراضي"
 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 17163027d49..4715447b7f9 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Пощата е изпратена",
+"Encryption" => "Криптиране",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Group already exists" => "Групата вече съществува",
 "Unable to add group" => "Невъзможно добавяне на група",
@@ -9,6 +11,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "Невъзможно изтриване на потребител",
 "Language changed" => "Езикът е променен",
 "Invalid request" => "Невалидна заявка",
+"User Documentation" => "Потребителска документация",
 "Update to {appversion}" => "Обновяване до {appversion}",
 "Disable" => "Изключено",
 "Enable" => "Включено",
@@ -17,23 +20,24 @@ $TRANSLATIONS = array(
 "Error" => "Грешка",
 "Update" => "Обновяване",
 "Updated" => "Обновено",
-"Saving..." => "Записване...",
 "deleted" => "изтрито",
 "undo" => "възтановяване",
 "Groups" => "Групи",
 "Delete" => "Изтриване",
 "add group" => "нова група",
 "__language_name__" => "__language_name__",
+"None" => "Няма",
+"Login" => "Вход",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
 "Cron" => "Крон",
 "Sharing" => "Споделяне",
+"Server address" => "Адрес на сървъра",
 "More" => "Още",
 "Less" => "По-малко",
 "Version" => "Версия",
 "Add your App" => "Добавете Ваше приложение",
 "More Apps" => "Още приложения",
 "Select an App" => "Изберете приложение",
-"User Documentation" => "Потребителска документация",
 "Administrator Documentation" => "Административна документация",
 "Online Documentation" => "Документация",
 "Forum" => "Форум",
@@ -47,11 +51,10 @@ $TRANSLATIONS = array(
 "Change password" => "Промяна на паролата",
 "Email" => "E-mail",
 "Your email address" => "Вашия email адрес",
-"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
+"Cancel" => "Отказ",
 "Language" => "Език",
 "Help translate" => "Помогнете с превода",
 "WebDAV" => "WebDAV",
-"Encryption" => "Криптиране",
 "Login Name" => "Потребител",
 "Create" => "Създаване",
 "Default Storage" => "Хранилище по подразбиране",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 55528b71cf1..574426ea634 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ই-মেইল পাঠানো হয়েছে",
+"Encryption" => "সংকেতায়ন",
 "Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -13,17 +15,21 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "প্রশাসকবৃন্দ তাদেরকে প্রশাসক গোষ্ঠী থেকে মুছে ফেলতে পারবেন না",
 "Unable to add user to group %s" => " %s গোষ্ঠীতে ব্যবহারকারী যোগ করা সম্ভব হলো না ",
 "Unable to remove user from group %s" => "%s গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না",
+"User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Disable" => "নিষ্ক্রিয়",
 "Enable" => "সক্রিয় ",
 "Error" => "সমস্যা",
 "Update" => "পরিবর্ধন",
-"Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "undo" => "ক্রিয়া প্রত্যাহার",
 "Groups" => "গোষ্ঠীসমূহ",
 "Group Admin" => "গোষ্ঠী প্রশাসক",
 "Delete" => "মুছে",
 "__language_name__" => "__language_name__",
+"None" => "কোনটিই নয়",
+"Login" => "প্রবেশ",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
+"Server address" => "সার্ভার ঠিকানা",
+"Port" => "পোর্ট",
 "More" => "বেশী",
 "Less" => "কম",
 "Version" => "ভার্সন",
@@ -33,7 +39,6 @@ $TRANSLATIONS = array(
 "Select an App" => "অ্যাপ নির্বাচন করুন",
 "See application page at apps.owncloud.com" => "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>",
-"User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Administrator Documentation" => "প্রশাসক সহায়িকা",
 "Online Documentation" => "অনলাইন সহায়িকা",
 "Forum" => "ফোরাম",
@@ -49,11 +54,11 @@ $TRANSLATIONS = array(
 "Change password" => "কূটশব্দ পরিবর্তন করুন",
 "Email" => "ইমেইল",
 "Your email address" => "আপনার ই-মেইল ঠিকানা",
-"Fill in an email address to enable password recovery" => "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন",
+"Cancel" => "বাতির",
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
-"Encryption" => "সংকেতায়ন",
+"Login Name" => "প্রবেশ",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 316eadc19a1..92c5450b7dc 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "El valor proporcionat no és vàlid per %s",
+"Saved" => "Desat",
+"test email settings" => "prova l'arranjament del correu",
+"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Hi ha hagut un problema en enviar el correu. Comproveu-ne l'arranjament.",
+"Email sent" => "El correu electrónic s'ha enviat",
+"You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+"Send mode" => "Mode d'enviament",
+"Encryption" => "Xifrat",
+"Authentication method" => "Mètode d'autenticació",
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticació",
 "Your full name has been changed." => "El vostre nom complet ha canviat.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
 "Unable to change password" => "No es pot canviar la contrasenya",
+"Sending..." => "Enviant...",
+"User Documentation" => "Documentació d'usuari",
+"Admin Documentation" => "Documentació d'administrador",
 "Update to {appversion}" => "Actualitza a {appversion}",
 "Disable" => "Desactiva",
 "Enable" => "Habilita",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualitza",
 "Updated" => "Actualitzada",
 "Select a profile picture" => "Seleccioneu una imatge de perfil",
+"Very weak password" => "Contrasenya massa feble",
+"Weak password" => "Contrasenya feble",
+"So-so password" => "Contrasenya passable",
+"Good password" => "Contrasenya bona",
+"Strong password" => "Contrasenya forta",
 "Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-"Saving..." => "Desant...",
 "deleted" => "esborrat",
 "undo" => "desfés",
 "Unable to remove user" => "No s'ha pogut eliminar l'usuari",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, errors i problemes fatals",
 "Errors and fatal issues" => "Errors i problemes fatals",
 "Fatal issues only" => "Només problemes fatals",
+"None" => "Cap",
+"Login" => "Inici de sessió",
+"Plain" => "Pla",
+"NT LAN Manager" => "Gestor NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avís de seguretat",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
@@ -61,6 +84,8 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
 "Module 'fileinfo' missing" => "No s'ha trobat el mòdul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
+"Your PHP version is outdated" => "La versió de PHP és obsoleta",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
 "Locale not working" => "Locale no funciona",
 "System locale can not be set to a one which supports UTF-8." => "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
 "This means that there might be problems with certain characters in file names." => "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
@@ -88,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Força HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Força la connexió dels clients a %s a través d'una connexió encriptada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
+"Email Server" => "Servidor de correu",
+"This is used for sending out notifications." => "S'usa per enviar notificacions.",
+"From address" => "Des de l'adreça",
+"Authentication required" => "Es requereix autenticació",
+"Server address" => "Adreça del servidor",
+"Port" => "Port",
+"Credentials" => "Credencials",
+"SMTP Username" => "Nom d'usuari SMTP",
+"SMTP Password" => "Contrasenya SMTP",
+"Test email settings" => "Prova l'arranjament del correu",
+"Send email" => "Envia correu",
 "Log" => "Registre",
 "Log level" => "Nivell de registre",
 "More" => "Més",
@@ -97,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Afegiu la vostra aplicació",
 "More Apps" => "Més aplicacions",
 "Select an App" => "Seleccioneu una aplicació",
+"Documentation:" => "Documentació:",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
+"See application website" => "Mostra la web de l'aplicació",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
-"User Documentation" => "Documentació d'usuari",
 "Administrator Documentation" => "Documentació d'administrador",
 "Online Documentation" => "Documentació en línia",
 "Forum" => "Fòrum",
@@ -117,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nom complet",
 "Email" => "Correu electrònic",
 "Your email address" => "Correu electrònic",
-"Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
+"Fill in an email address to enable password recovery and receive notifications" => "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Puja'n una de nova",
 "Select new from Files" => "Selecciona'n una de nova dels fitxers",
 "Remove image" => "Elimina imatge",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
 "Your avatar is provided by your original account." => "El vostre compte original proporciona l'avatar.",
-"Abort" => "Cancel·la",
+"Cancel" => "Cancel·la",
 "Choose as profile image" => "Selecciona com a imatge de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-"Encryption" => "Xifrat",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
 "Log-in password" => "Contrasenya d'accés",
 "Decrypt all Files" => "Desencripta tots els fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index c89b3b6a5de..1d9a554f3c7 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Uloženo",
+"test email settings" => "nastavení zkušebního emailu",
+"Email sent" => "E-mail odeslán",
+"Encryption" => "Šifrování",
+"Authentication method" => "Metoda autentifikace",
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
 "Authentication error" => "Chyba přihlášení",
 "Your full name has been changed." => "Vaše celé jméno bylo změněno.",
@@ -22,6 +27,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
 "Unable to change password" => "Změna hesla se nezdařila",
+"Sending..." => "Odesílání...",
+"User Documentation" => "Uživatelská dokumentace",
+"Admin Documentation" => "Dokumentace pro administrátory",
 "Update to {appversion}" => "Aktualizovat na {appversion}",
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
@@ -34,8 +42,12 @@ $TRANSLATIONS = array(
 "Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
 "Select a profile picture" => "Vyberte profilový obrázek",
+"Very weak password" => "Velmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Středně silné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
 "Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
-"Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
 "Unable to remove user" => "Nelze odebrat uživatele",
@@ -53,6 +65,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Varování, chyby a fatální problémy",
 "Errors and fatal issues" => "Chyby a fatální problémy",
 "Fatal issues only" => "Pouze fatální problémy",
+"None" => "Žádné",
+"Login" => "Přihlásit",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Bezpečnostní upozornění",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
@@ -61,8 +77,8 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>.",
 "Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
-"Your PHP version is outdated" => "Tato verze PHP je zastaralá.",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Tato verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze jsou chybné. Je možné, že tato instalace nebude fungovat správně.",
+"Your PHP version is outdated" => "Vaše verze PHP je zastaralá",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně.",
 "Locale not working" => "Lokalizace nefunguje",
 "System locale can not be set to a one which supports UTF-8." => "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
@@ -90,6 +106,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
+"Email Server" => "Emailový server",
+"This is used for sending out notifications." => "Toto se používá při odesílání upozornění.",
+"From address" => "Adresa odesílatele",
+"Authentication required" => "Ověření vyžadováno",
+"Server address" => "Adresa serveru",
+"Port" => "Port",
+"Credentials" => "Přihlašovací údaje",
+"SMTP Username" => "SMTP uživatelské jméno ",
+"SMTP Password" => "SMTP heslo",
+"Test email settings" => "Nastavení zkušebního emailu",
+"Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
 "Log level" => "Úroveň zaznamenávání",
 "More" => "Více",
@@ -99,9 +126,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Přidat Vaši aplikaci",
 "More Apps" => "Více aplikací",
 "Select an App" => "Vyberte aplikaci",
+"Documentation:" => "Dokumentace:",
 "See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
+"See application website" => "Prohlédněte si webovou stránku aplikace",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
-"User Documentation" => "Uživatelská dokumentace",
 "Administrator Documentation" => "Dokumentace správce",
 "Online Documentation" => "Online dokumentace",
 "Forum" => "Fórum",
@@ -119,20 +147,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Celé jméno",
 "Email" => "E-mail",
 "Your email address" => "Vaše e-mailová adresa",
-"Fill in an email address to enable password recovery" => "Pro povolení obnovy hesla vyplňte e-mailovou adresu",
 "Profile picture" => "Profilový obrázek",
 "Upload new" => "Nahrát nový",
 "Select new from Files" => "Vyberte nový ze souborů",
 "Remove image" => "Odebrat obrázek",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.",
 "Your avatar is provided by your original account." => "Váš avatar je poskytován Vaším původním účtem.",
-"Abort" => "Přerušit",
+"Cancel" => "Zrušit",
 "Choose as profile image" => "Vybrat jako profilový obrázek",
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
-"Encryption" => "Šifrování",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
 "Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index da8d02a9e40..5beeeadae96 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -1,18 +1,22 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Anfonwyd yr e-bost",
+"Encryption" => "Amgryptiad",
 "Authentication error" => "Gwall dilysu",
 "Invalid request" => "Cais annilys",
 "Error" => "Gwall",
-"Saving..." => "Yn cadw...",
 "undo" => "dadwneud",
 "Groups" => "Grwpiau",
 "Delete" => "Dileu",
+"None" => "Dim",
+"Login" => "Mewngofnodi",
 "Security Warning" => "Rhybudd Diogelwch",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
-"Encryption" => "Amgryptiad",
+"Cancel" => "Diddymu",
+"Login Name" => "Mewngofnodi",
 "Other" => "Arall",
 "Username" => "Enw defnyddiwr"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 6fe3cf6c396..d8ee237bed5 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Gemt",
+"Email sent" => "E-mail afsendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Authentication error" => "Adgangsfejl",
 "Your full name has been changed." => "Dit fulde navn er blevet ændret.",
@@ -22,6 +25,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
 "Unable to change password" => "Kunne ikke ændre kodeord",
+"User Documentation" => "Brugerdokumentation",
 "Update to {appversion}" => "Opdatér til {appversion}",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
@@ -35,7 +39,6 @@ $TRANSLATIONS = array(
 "Updated" => "Opdateret",
 "Select a profile picture" => "Vælg et profilbillede",
 "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-"Saving..." => "Gemmer...",
 "deleted" => "Slettet",
 "undo" => "fortryd",
 "Unable to remove user" => "Kan ikke fjerne bruger",
@@ -53,6 +56,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advarsler, fejl og alvorlige fejl",
 "Errors and fatal issues" => "Fejl og alvorlige fejl",
 "Fatal issues only" => "Kun alvorlige fejl",
+"None" => "Ingen",
+"Login" => "Login",
 "Security Warning" => "Sikkerhedsadvarsel",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
@@ -90,6 +95,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Gennemtving HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
+"Server address" => "Serveradresse",
+"Port" => "Port",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Mere",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vælg en App",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
-"User Documentation" => "Brugerdokumentation",
 "Administrator Documentation" => "Administrator Dokumentation",
 "Online Documentation" => "Online dokumentation",
 "Forum" => "Forum",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Fulde navn",
 "Email" => "E-mail",
 "Your email address" => "Din emailadresse",
-"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
 "Profile picture" => "Profilbillede",
 "Upload new" => "Upload nyt",
 "Select new from Files" => "Vælg nyt fra Filer",
 "Remove image" => "Fjern billede",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
 "Your avatar is provided by your original account." => "Din avatar kommer fra din oprindelige konto.",
-"Abort" => "Afbryd",
+"Cancel" => "Annuller",
 "Choose as profile image" => "Vælg som profilbillede",
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-"Encryption" => "Kryptering",
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
 "Log-in password" => "Log-in kodeord",
 "Decrypt all Files" => "Dekrypter alle Filer ",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b9432f187e9..5f1433f62ca 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen teste",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen",
+"Email sent" => "E-Mail wurde verschickt",
+"You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
+"Send mode" => "Sende-Modus",
+"Encryption" => "Verschlüsselung",
+"Authentication method" => "Authentifizierungsmethode",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Sending..." => "Sende...",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Admin-Dokumentation",
 "Update to {appversion}" => "Aktualisiere zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aktualisierung durchführen",
 "Updated" => "Aktualisiert",
 "Select a profile picture" => "Wähle ein Profilbild",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Durchschnittliches Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
@@ -53,12 +70,18 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
 "Errors and fatal issues" => "Fehler und fatale Probleme",
 "Fatal issues only" => "Nur fatale Probleme",
+"None" => "Nichts",
+"Login" => "Anmelden",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sicherheitswarnung",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, das stattdessen HTTPS verlangt wird.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfe die <a href=\"%s\">Installationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
 "Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
@@ -79,7 +102,7 @@ $TRANSLATIONS = array(
 "Allow links" => "Erlaubt Links",
 "Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -88,8 +111,19 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Email Server" => "E-Mail-Server",
+"This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
+"From address" => "Absender-Adresse",
+"Authentication required" => "Authentifizierung benötigt",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
+"Credentials" => "Zugangsdaten",
+"SMTP Username" => "SMTP Benutzername",
+"SMTP Password" => "SMTP Passwor",
+"Test email settings" => "Teste E-Mail-Einstellunge",
+"Send email" => "Sende E-Mail",
 "Log" => "Log",
 "Log level" => "Loglevel",
 "More" => "Mehr",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Füge Deine Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wähle eine Anwendung aus",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
+"See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Vollständiger Name",
 "Email" => "E-Mail",
 "Your email address" => "Deine E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Fill in an email address to enable password recovery and receive notifications" => "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
 "Profile picture" => "Profilbild",
 "Upload new" => "Neues hochladen",
 "Select new from Files" => "Neues aus den Dateien wählen",
 "Remove image" => "Bild entfernen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
 "Your avatar is provided by your original account." => "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.",
-"Abort" => "Abbrechen",
+"Cancel" => "Abbrechen",
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-"Encryption" => "Verschlüsselung",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index d70f365826c..d31b9ad151a 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
-"__language_name__" => "Deutsch (Österreich)"
+"Invalid request" => "Fehlerhafte Anfrage",
+"Delete" => "Löschen",
+"__language_name__" => "Deutsch (Österreich)",
+"Server address" => "Adresse des Servers",
+"Password" => "Passwort",
+"Email" => "E-Mail",
+"Cancel" => "Abbrechen",
+"Other" => "Anderes"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index c313cd18b46..9bfe06d0236 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email gesendet",
+"Encryption" => "Verschlüsselung",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Group already exists" => "Die Gruppe existiert bereits",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
 "Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"User Documentation" => "Dokumentation für Benutzer",
 "Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -26,7 +29,6 @@ $TRANSLATIONS = array(
 "Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -38,6 +40,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Schweiz)",
+"Login" => "Anmelden",
 "Security Warning" => "Sicherheitshinweis",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
@@ -65,6 +68,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
@@ -76,7 +81,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -93,11 +97,10 @@ $TRANSLATIONS = array(
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Cancel" => "Abbrechen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
-"Encryption" => "Verschlüsselung",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
 "Login Name" => "Loginname",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index ce349b5fcb7..8884afcbc3c 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen testen",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+"Email sent" => "Email gesendet",
+"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können.",
+"Send mode" => "Sende-Modus",
+"Encryption" => "Verschlüsselung",
+"Authentication method" => "Authentifizierungsmethode",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
@@ -17,11 +27,14 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
 "Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
 "Wrong password" => "Falsches Passwort",
-"No user supplied" => "Keinen Benutzer übermittelt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+"No user supplied" => "Keinen Benutzer angegeben",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können",
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Sending..." => "Sende...",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Dokumentation für Administratoren",
 "Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
 "Select a profile picture" => "Wählen Sie ein Profilbild",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Passables Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -52,13 +69,19 @@ $TRANSLATIONS = array(
 "Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
 "Errors and fatal issues" => "Fehler und fatale Probleme",
-"Fatal issues only" => "Nur fatale Probleme",
+"Fatal issues only" => "Nur kritische Fehler",
+"None" => "Keine",
+"Login" => "Anmelden",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sicherheitshinweis",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, das stattdessen HTTPS verlangt wird.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
@@ -68,7 +91,7 @@ $TRANSLATIONS = array(
 "This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
 "Internet connection not working" => "Keine Internetverbindung",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
@@ -79,7 +102,7 @@ $TRANSLATIONS = array(
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -88,8 +111,19 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Email Server" => "E-Mail-Server",
+"This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
+"From address" => "Absender-Adresse",
+"Authentication required" => "Authentifizierung benötigt",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
+"Credentials" => "Zugangsdaten",
+"SMTP Username" => "SMTP Benutzername",
+"SMTP Password" => "SMTP Passwort",
+"Test email settings" => "E-Mail-Einstellungen testen",
+"Send email" => "E-Mail senden",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Fügen Sie Ihre Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wählen Sie eine Anwendung aus",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Vollständiger Name",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Fill in an email address to enable password recovery and receive notifications" => "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
 "Profile picture" => "Profilbild",
 "Upload new" => "Neues hochladen",
-"Select new from Files" => "Neues aus den Dateien wählen",
+"Select new from Files" => "Neues aus Dateien wählen",
 "Remove image" => "Bild entfernen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
 "Your avatar is provided by your original account." => "Ihr Avatar wird von Ihrerem ursprünglichenKonto verwendet.",
-"Abort" => "Abbrechen",
+"Cancel" => "Abbrechen",
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-"Encryption" => "Verschlüsselung",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index ab285389a5c..c438fa0f997 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,5 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Αποθηκεύτηκαν",
+"test email settings" => "δοκιμή ρυθμίσεων email",
+"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.",
+"Email sent" => "Το Email απεστάλη ",
+"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+"Send mode" => "Κατάσταση αποστολής",
+"Encryption" => "Κρυπτογράφηση",
+"Authentication method" => "Μέθοδος πιστοποίησης",
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
@@ -22,6 +31,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
 "Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
+"Sending..." => "Αποστέλεται...",
+"User Documentation" => "Τεκμηρίωση Χρήστη",
+"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Update to {appversion}" => "Ενημέρωση σε {appversion}",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
@@ -34,8 +46,11 @@ $TRANSLATIONS = array(
 "Update" => "Ενημέρωση",
 "Updated" => "Ενημερώθηκε",
 "Select a profile picture" => "Επιλογή εικόνας προφίλ",
+"Very weak password" => "Πολύ αδύναμο συνθηματικό",
+"Weak password" => "Αδύναμο συνθηματικό",
+"Good password" => "Καλό συνθηματικό",
+"Strong password" => "Δυνατό συνθηματικό",
 "Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-"Saving..." => "Γίνεται αποθήκευση...",
 "deleted" => "διαγράφηκε",
 "undo" => "αναίρεση",
 "Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
@@ -53,6 +68,11 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
 "Errors and fatal issues" => "Σφάλματα και καίρια ζητήματα",
 "Fatal issues only" => "Καίρια ζητήματα μόνο",
+"None" => "Τίποτα",
+"Login" => "Σύνδεση",
+"NT LAN Manager" => "Διαχειριστης NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Έχετε πρόσβαση στο %s μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί χρήση HTTPS αντ' αυτού.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
@@ -90,26 +110,38 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
+"Email Server" => "Διακομιστής Email",
+"This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+"From address" => "Από τη διεύθυνση",
+"Authentication required" => "Απαιτείται πιστοποίηση",
+"Server address" => "Διεύθυνση διακομιστή",
+"Port" => "Θύρα",
+"Credentials" => "Πιστοποιητικά",
+"SMTP Username" => "Όνομα χρήστη SMTP",
+"SMTP Password" => "Συνθηματικό SMTP",
+"Test email settings" => "Δοκιμή ρυθμίσεων email",
+"Send email" => "Αποστολή email",
 "Log" => "Καταγραφές",
 "Log level" => "Επίπεδο καταγραφής",
 "More" => "Περισσότερα",
 "Less" => "Λιγότερα",
 "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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Πρόσθεστε τη Δικιά σας Εφαρμογή",
+"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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Προσθέστε Δικιά σας Εφαρμογή",
 "More Apps" => "Περισσότερες Εφαρμογές",
 "Select an App" => "Επιλέξτε μια Εφαρμογή",
+"Documentation:" => "Τεκμηρίωση:",
 "See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>",
-"User Documentation" => "Τεκμηρίωση Χρήστη",
+"See application website" => "Δείτε την ιστοσελίδα της εφαρμογής",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>",
 "Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
 "Forum" => "Φόρουμ",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Εμπορική Υποστήριξη",
 "Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
-"Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
+"Show First Run Wizard again" => "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα",
 "Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
 "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
@@ -117,22 +149,21 @@ $TRANSLATIONS = array(
 "New password" => "Νέο συνθηματικό",
 "Change password" => "Αλλαγή συνθηματικού",
 "Full Name" => "Πλήρες όνομα",
-"Email" => "Ηλ. ταχυδρομείο",
-"Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
-"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
+"Email" => "Ηλεκτρονικό ταχυδρομείο",
+"Your email address" => "Η διεύθυνση ηλ. ταχυδρομείου σας",
+"Fill in an email address to enable password recovery and receive notifications" => "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις",
 "Profile picture" => "Φωτογραφία προφίλ",
 "Upload new" => "Μεταφόρτωση νέου",
 "Select new from Files" => "Επιλογή νέου από τα Αρχεία",
 "Remove image" => "Αφαίρεση εικόνας",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε.",
 "Your avatar is provided by your original account." => "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
-"Abort" => "Ματαίωση",
+"Cancel" => "Άκυρο",
 "Choose as profile image" => "Επιλογή εικόνας προφίλ",
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης <a href=\"%s\" target=\"_blank\">πρόσβαση των Αρχείων σας μέσω WebDAV</a>",
-"Encryption" => "Κρυπτογράφηση",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
 "Log-in password" => "Συνθηματικό εισόδου",
 "Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 5f7b6e1fe0d..2315586b187 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Invalid value supplied for %s",
+"Saved" => "Saved",
+"test email settings" => "test email settings",
+"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "A problem occurred whilst sending the e-mail. Please revisit your settings.",
+"Email sent" => "Email sent",
+"You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
+"Send mode" => "Send mode",
+"Encryption" => "Encryption",
+"Authentication method" => "Authentication method",
 "Unable to load list from App Store" => "Unable to load list from App Store",
 "Authentication error" => "Authentication error",
 "Your full name has been changed." => "Your full name has been changed.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
 "Unable to change password" => "Unable to change password",
+"Sending..." => "Sending...",
+"User Documentation" => "User Documentation",
+"Admin Documentation" => "Admin Documentation",
 "Update to {appversion}" => "Update to {appversion}",
 "Disable" => "Disable",
 "Enable" => "Enable",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Update",
 "Updated" => "Updated",
 "Select a profile picture" => "Select a profile picture",
+"Very weak password" => "Very weak password",
+"Weak password" => "Weak password",
+"So-so password" => "So-so password",
+"Good password" => "Good password",
+"Strong password" => "Strong password",
 "Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
-"Saving..." => "Saving...",
 "deleted" => "deleted",
 "undo" => "undo",
 "Unable to remove user" => "Unable to remove user",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Warnings, errors and fatal issues",
 "Errors and fatal issues" => "Errors and fatal issues",
 "Fatal issues only" => "Fatal issues only",
+"None" => "None",
+"Login" => "Login",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Security Warning",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Enforce HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Email Server" => "Email Server",
+"This is used for sending out notifications." => "This is used for sending out notifications.",
+"From address" => "From address",
+"Authentication required" => "Authentication required",
+"Server address" => "Server address",
+"Port" => "Port",
+"Credentials" => "Credentials",
+"SMTP Username" => "SMTP Username",
+"SMTP Password" => "SMTP Password",
+"Test email settings" => "Test email settings",
+"Send email" => "Send email",
 "Log" => "Log",
 "Log level" => "Log level",
 "More" => "More",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Add your App",
 "More Apps" => "More Apps",
 "Select an App" => "Select an App",
+"Documentation:" => "Documentation:",
 "See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"See application website" => "See application website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"User Documentation" => "User Documentation",
 "Administrator Documentation" => "Administrator Documentation",
 "Online Documentation" => "Online Documentation",
 "Forum" => "Forum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Full Name",
 "Email" => "Email",
 "Your email address" => "Your email address",
-"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Fill in an email address to enable password recovery and receive notifications" => "Fill in an email address to enable password recovery and receive notifications",
 "Profile picture" => "Profile picture",
 "Upload new" => "Upload new",
 "Select new from Files" => "Select new from Files",
 "Remove image" => "Remove image",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Either png or jpg. Ideally square but you will be able to crop it.",
 "Your avatar is provided by your original account." => "Your avatar is provided by your original account.",
-"Abort" => "Abort",
+"Cancel" => "Cancel",
 "Choose as profile image" => "Choose as profile image",
 "Language" => "Language",
 "Help translate" => "Help translate",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-"Encryption" => "Encryption",
 "The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
 "Log-in password" => "Log-in password",
 "Decrypt all Files" => "Decrypt all Files",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 4c797e1a8dd..f63c5140a45 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "La retpoŝtaĵo sendiĝis",
+"Encryption" => "Ĉifrado",
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Authentication error" => "Aŭtentiga eraro",
 "Group already exists" => "La grupo jam ekzistas",
@@ -13,17 +15,19 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
+"User Documentation" => "Dokumentaro por uzantoj",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Error" => "Eraro",
 "Update" => "Ĝisdatigi",
-"Saving..." => "Konservante...",
 "deleted" => "forigita",
 "undo" => "malfari",
 "Groups" => "Grupoj",
 "Group Admin" => "Grupadministranto",
 "Delete" => "Forigi",
 "__language_name__" => "Esperanto",
+"None" => "Nenio",
+"Login" => "Ensaluti",
 "Security Warning" => "Sekureca averto",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
 "Cron" => "Cron",
@@ -36,6 +40,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
 "Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
 "Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
+"Server address" => "Servila adreso",
+"Port" => "Pordo",
+"Credentials" => "Aŭtentigiloj",
 "Log" => "Protokolo",
 "Log level" => "Registronivelo",
 "More" => "Pli",
@@ -47,7 +54,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Elekti aplikaĵon",
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
-"User Documentation" => "Dokumentaro por uzantoj",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
 "Forum" => "Forumo",
@@ -63,12 +69,12 @@ $TRANSLATIONS = array(
 "Change password" => "Ŝanĝi la pasvorton",
 "Email" => "Retpoŝto",
 "Your email address" => "Via retpoŝta adreso",
-"Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
 "Profile picture" => "Profila bildo",
+"Cancel" => "Nuligi",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "WebDAV" => "WebDAV",
-"Encryption" => "Ĉifrado",
+"Login Name" => "Ensaluti",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
 "Unlimited" => "Senlima",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index fbd98409821..734149034b9 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Se introdujo un valor inválido para %s",
+"Saved" => "Guardado",
+"test email settings" => "probar configuración de correo",
+"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocurrió un problema la enviar el mensaje. Revise la configuración.",
+"Email sent" => "Correo electrónico enviado",
+"You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
+"Authentication method" => "Método de autenticación",
 "Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentación de usuario",
+"Admin Documentation" => "Documentación para administradores",
 "Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imagen de perfil",
+"Very weak password" => "Contraseña muy débil",
+"Weak password" => "Contraseña débil",
+"So-so password" => "Contraseña pasable",
+"Good password" => "Contraseña buena",
+"Strong password" => "Contraseña muy buena",
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Saving..." => "Guardando...",
 "deleted" => "eliminado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible eliminar al usuario",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
 "Errors and fatal issues" => "Errores y problemas fatales",
 "Fatal issues only" => "Problemas fatales solamente",
+"None" => "Ninguno",
+"Login" => "Iniciar sesión",
+"Plain" => "Plano",
+"NT LAN Manager" => "Gestor de NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Advertencia de seguridad",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
@@ -61,7 +84,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
 "Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
-"Your PHP version is outdated" => "Su versión de PHP ha caducado",
+"Your PHP version is outdated" => "Su versión de PHP no está actualizada",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
 "Locale not working" => "La configuración regional no está funcionando",
 "System locale can not be set to a one which supports UTF-8." => "No se puede escoger una configuración regional que soporte UTF-8.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+"Email Server" => "Servidor de correo electrónico",
+"This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
+"From address" => "Desde la dirección",
+"Authentication required" => "Se necesita autenticación",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
+"Credentials" => "Credenciales",
+"SMTP Username" => "Nombre de usuario SMTP",
+"SMTP Password" => "Contraseña SMTP",
+"Test email settings" => "Probar configuración de correo electrónico",
+"Send email" => "Enviar mensaje",
 "Log" => "Registro",
 "Log level" => "Nivel de registro",
 "More" => "Más",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
+"Documentation:" => "Documentación:",
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
+"See application website" => "Ver sitio web de la aplicación",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
-"User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nombre completo",
 "Email" => "Correo electrónico",
 "Your email address" => "Su dirección de correo",
-"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
+"Fill in an email address to enable password recovery and receive notifications" => "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Subir otra",
 "Select new from Files" => "Seleccionar otra desde Archivos",
 "Remove image" => "Borrar imagen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
 "Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-"Encryption" => "Cifrado",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 44c9964778c..b637dd4f147 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "e-mail mandado",
+"Encryption" => "Encriptación",
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
+"Your full name has been changed." => "Su nombre completo ha sido cambiado.",
+"Unable to change full name" => "Imposible cambiar el nombre completo",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
 "Email saved" => "e-mail guardado",
@@ -14,6 +18,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "No fue posible agregar el usuario al grupo %s",
 "Unable to remove user from group %s" => "No es posible borrar al usuario del grupo %s",
 "Couldn't update app." => "No se pudo actualizar la App.",
+"Wrong password" => "Clave incorrecta",
+"No user supplied" => "No se ha indicado el usuario",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario",
+"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
+"Unable to change password" => "Imposible cambiar la contraseña",
+"User Documentation" => "Documentación de Usuario",
 "Update to {appversion}" => "Actualizar a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -25,8 +36,8 @@ $TRANSLATIONS = array(
 "Error" => "Error",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Select a profile picture" => "Seleccionar una imágen de perfil",
 "Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
-"Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible borrar usuario",
@@ -37,19 +48,35 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
 "Error creating user" => "Error creando usuario",
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
+"Warning: Home directory for user \"{user}\" already exists" => "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
 "__language_name__" => "Castellano (Argentina)",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (notificaciones fatales, errores, advertencias, info, debug)",
+"Info, warnings, errors and fatal issues" => "Info, advertencias, errores y notificaciones fatales",
+"Warnings, errors and fatal issues" => "Advertencias, errores y notificaciones fatales",
+"Errors and fatal issues" => "Errores y notificaciones fatales",
+"Fatal issues only" => "Notificaciones fatales solamente",
+"None" => "Ninguno",
+"Login" => "Ingresar",
 "Security Warning" => "Advertencia de seguridad",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
 "Setup Warning" => "Alerta de Configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
 "Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
+"Your PHP version is outdated" => "Su versión de PHP está fuera de término",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente.",
 "Locale not working" => "\"Locale\" no está funcionando",
+"System locale can not be set to a one which supports UTF-8." => "La localización del sistema no puede cambiarse a una que soporta UTF-8",
+"This means that there might be problems with certain characters in file names." => "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -61,10 +88,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
+"Allow mail notification" => "Permitir notificaciones por correo",
+"Allow user to send mail notification for shared files" => "Permitir al usuario enviar notificaciones por correo para archivos compartidos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
+"Credentials" => "Credenciales",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
@@ -76,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Elegí una App",
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
-"User Documentation" => "Documentación de Usuario",
 "Administrator Documentation" => "Documentación de Administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -91,14 +122,22 @@ $TRANSLATIONS = array(
 "Current password" => "Contraseña actual",
 "New password" => "Nueva contraseña:",
 "Change password" => "Cambiar contraseña",
+"Full Name" => "Nombre completo",
 "Email" => "e-mail",
 "Your email address" => "Tu dirección de e-mail",
-"Fill in an email address to enable password recovery" => "Escribí una dirección de e-mail para restablecer la contraseña",
-"Abort" => "Abortar",
+"Profile picture" => "Imágen de perfil",
+"Upload new" => "Subir nuevo",
+"Select new from Files" => "Seleccionar nuevo desde archivos",
+"Remove image" => "Remover imagen",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo.",
+"Your avatar is provided by your original account." => "Su avatar es proveído por su cuenta original.",
+"Cancel" => "Cancelar",
+"Choose as profile image" => "Elegir como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
-"Encryption" => "Encriptación",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
 "Log-in password" => "Clave de acceso",
 "Decrypt all Files" => "Desencriptar todos los archivos",
 "Login Name" => "Nombre de Usuario",
@@ -106,10 +145,12 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
 "Default Storage" => "Almacenamiento Predeterminado",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Otros",
 "Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
+"change full name" => "Cambiar nombre completo",
 "set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado"
 );
diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php
index 86e66bd4825..bdf34e62979 100644
--- a/settings/l10n/es_CL.php
+++ b/settings/l10n/es_CL.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "Error",
 "Password" => "Clave",
+"Cancel" => "Cancelar",
 "Username" => "Usuario"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 520ab637ffc..abfeaa577d2 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Correo electrónico enviado",
+"Encryption" => "Cifrado",
 "Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"User Documentation" => "Documentación de usuario",
 "Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imagen de perfil",
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Saving..." => "Guardando...",
 "deleted" => "eliminado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible eliminar al usuario",
@@ -53,6 +55,7 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
 "Errors and fatal issues" => "Errores y problemas fatales",
 "Fatal issues only" => "Problemas fatales solamente",
+"Login" => "Iniciar sesión",
 "Security Warning" => "Advertencia de seguridad",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
@@ -90,6 +93,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
 "Log" => "Registro",
 "Log level" => "Nivel de registro",
 "More" => "Más",
@@ -101,7 +106,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
-"User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -119,20 +123,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nombre completo",
 "Email" => "Correo electrónico",
 "Your email address" => "Su dirección de correo",
-"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Subir otra",
 "Select new from Files" => "Seleccionar otra desde Archivos",
 "Remove image" => "Borrar imagen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
 "Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-"Encryption" => "Cifrado",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index f5436525828..c294fcc137c 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-kiri on saadetud",
+"Encryption" => "Krüpteerimine",
 "Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus",
 "Authentication error" => "Autentimise viga",
 "Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
 "Unable to change password" => "Ei suuda parooli muuta",
+"User Documentation" => "Kasutaja dokumentatsioon",
 "Update to {appversion}" => "Uuenda versioonile {appversion}",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Uuendatud",
 "Select a profile picture" => "Vali profiili pilt",
 "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-"Saving..." => "Salvestamine...",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
 "Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Hoiatused, veateated ja tõsised probleemid",
 "Errors and fatal issues" => "Veateated ja tõsised probleemid",
 "Fatal issues only" => "Ainult tõsised probleemid",
+"None" => "Pole",
+"Login" => "Logi sisse",
 "Security Warning" => "Turvahoiatus",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
@@ -90,6 +94,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
 "Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
+"Server address" => "Serveri aadress",
+"Port" => "Port",
+"Credentials" => "Kasutajatunnused",
 "Log" => "Logi",
 "Log level" => "Logi tase",
 "More" => "Rohkem",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vali programm",
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
-"User Documentation" => "Kasutaja dokumentatsioon",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
 "Online Documentation" => "Online dokumentatsioon",
 "Forum" => "Foorum",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Täispikk nimi",
 "Email" => "E-post",
 "Your email address" => "Sinu e-posti aadress",
-"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Profile picture" => "Profiili pilt",
 "Upload new" => "Laadi uus üles",
 "Select new from Files" => "Vali failidest uus",
 "Remove image" => "Eemalda pilt",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
 "Your avatar is provided by your original account." => "Sinu avatari pakub sinu algne konto.",
-"Abort" => "Katkesta",
+"Cancel" => "Loobu",
 "Choose as profile image" => "Vali profiilipildiks",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-"Encryption" => "Krüpteerimine",
 "The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
 "Log-in password" => "Sisselogimise parool",
 "Decrypt all Files" => "Dekrüpteeri kõik failid",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 0542deee3d1..0225fb00f65 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Eposta bidalia",
+"Encryption" => "Enkriptazioa",
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
 "Your full name has been changed." => "Zure izena aldatu egin da.",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Please provide an admin recovery password, otherwise all user data will be lost" => "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira",
 "Wrong admin recovery password. Please check the password and try again." => "Berreskuratze administradore pasahitz ez egokia. Medesez egiaztatu pasahitza eta saiatu berriz.",
 "Unable to change password" => "Ezin izan da pasahitza aldatu",
+"User Documentation" => "Erabiltzaile dokumentazioa",
 "Update to {appversion}" => "Eguneratu {appversion}-ra",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Update" => "Eguneratu",
 "Updated" => "Eguneratuta",
 "Select a profile picture" => "Profil argazkia aukeratu",
-"Saving..." => "Gordetzen...",
 "deleted" => "ezabatuta",
 "undo" => "desegin",
 "Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
@@ -46,6 +48,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "Warning: Home directory for user \"{user}\" already exists" => "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
 "__language_name__" => "Euskera",
+"None" => "Ezer",
+"Login" => "Saio hasiera",
 "Security Warning" => "Segurtasun abisua",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
@@ -82,6 +86,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Behartu HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
+"Server address" => "Zerbitzariaren helbidea",
+"Port" => "Portua",
+"Credentials" => "Kredentzialak",
 "Log" => "Egunkaria",
 "Log level" => "Erregistro maila",
 "More" => "Gehiago",
@@ -93,7 +100,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Aukeratu programa bat",
 "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
-"User Documentation" => "Erabiltzaile dokumentazioa",
 "Administrator Documentation" => "Administradore dokumentazioa",
 "Online Documentation" => "Online dokumentazioa",
 "Forum" => "Foroa",
@@ -111,19 +117,17 @@ $TRANSLATIONS = array(
 "Full Name" => "Izena",
 "Email" => "E-posta",
 "Your email address" => "Zure e-posta",
-"Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
 "Profile picture" => "Profilaren irudia",
 "Upload new" => "Igo berria",
 "Select new from Files" => "Hautatu berria Fitxategietatik",
 "Remove image" => "Irudia ezabatu",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png edo jpg. Hobe karratua baina mozteko aukera izango duzu.",
-"Abort" => "Bertan-behera utzi",
+"Cancel" => "Ezeztatu",
 "Choose as profile image" => "Profil irudi bezala aukeratu",
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-"Encryption" => "Enkriptazioa",
 "The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
 "Log-in password" => "Saioa hasteko pasahitza",
 "Decrypt all Files" => "Desenkripattu fitxategi guztiak",
diff --git a/settings/l10n/eu_ES.php b/settings/l10n/eu_ES.php
new file mode 100644
index 00000000000..280c7f05c0c
--- /dev/null
+++ b/settings/l10n/eu_ES.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid request" => "Eskakizun baliogabea",
+"Delete" => "Ezabatu",
+"Cancel" => "Ezeztatu",
+"Other" => "Bestea"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index e8582868f3b..bec91c69706 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ایمیل ارسال شد",
+"Encryption" => "رمزگذاری",
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Group already exists" => "این گروه در حال حاضر موجود است",
@@ -14,16 +16,26 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "امکان افزودن کاربر به گروه %s نیست",
 "Unable to remove user from group %s" => "امکان حذف کاربر از گروه %s نیست",
 "Couldn't update app." => "برنامه را نمی توان به هنگام ساخت.",
+"Wrong password" => "رمز عبور اشتباه است",
+"No user supplied" => "هیچ کاربری تعریف نشده است",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت.",
+"Wrong admin recovery password. Please check the password and try again." => "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
+"Unable to change password" => "نمی‌توان رمز را تغییر داد",
+"User Documentation" => "مستندات کاربر",
 "Update to {appversion}" => "بهنگام شده به  {appversion}",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Please wait...." => "لطفا صبر کنید ...",
+"Error while disabling app" => "خطا در هنگام غیر فعال سازی برنامه",
+"Error while enabling app" => "خطا در هنگام فعال سازی برنامه",
 "Updating...." => "در حال بروز رسانی...",
 "Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
 "Error" => "خطا",
 "Update" => "به روز رسانی",
 "Updated" => "بروز رسانی انجام شد",
-"Saving..." => "در حال ذخیره سازی...",
+"Select a profile picture" => "انتخاب تصویر پروفایل",
+"Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
 "deleted" => "حذف شده",
 "undo" => "بازگشت",
 "Unable to remove user" => "حذف کاربر امکان پذیر نیست",
@@ -34,27 +46,44 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
 "Error creating user" => "خطا در ایجاد کاربر",
 "A valid password must be provided" => "رمز عبور صحیح باید وارد شود",
+"Warning: Home directory for user \"{user}\" already exists" => "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
 "__language_name__" => "__language_name__",
+"None" => "هیچ‌کدام",
+"Login" => "ورود",
 "Security Warning" => "اخطار امنیتی",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید.",
 "Setup Warning" => "هشدار راه اندازی",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
 "Module 'fileinfo' missing" => "ماژول 'fileinfo' از کار افتاده",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
 "Locale not working" => "زبان محلی کار نمی کند.",
 "Internet connection not working" => "اتصال اینترنت کار نمی کند",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
 "Cron" => "زمانبند",
 "Execute one task with each page loaded" => "اجرای یک وظیفه با هر بار بارگذاری صفحه",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "از سرویس کرون سرور استفاده شده است که فایل cron.php را هر 15 دقیقه یک بار فراخوانی کند.",
 "Sharing" => "اشتراک گذاری",
 "Enable Share API" => "فعال کردن API اشتراک گذاری",
 "Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
 "Allow links" => "اجازه ی لینک ها",
 "Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
+"Allow public uploads" => "اجازه بارگذاری عمومی",
+"Allow users to enable others to upload into their publicly shared folders" => "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند",
 "Allow resharing" => "مجوز اشتراک گذاری مجدد",
 "Allow users to share items shared with them again" => "اجازه به کاربران برای اشتراک گذاری دوباره با آنها",
 "Allow users to share with anyone" => "اجازه به کابران برای اشتراک گذاری با همه",
 "Allow users to only share with users in their groups" => "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان",
+"Allow mail notification" => "مجاز نمودن اطلاع رسانی توسط ایمیل",
+"Allow user to send mail notification for shared files" => "مجاز نمودن ارسال ایمیل توسط کاربر برای فایل‌های به اشتراک گذاشته شده",
 "Security" => "امنیت",
 "Enforce HTTPS" => "وادار کردن HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
+"Server address" => "آدرس سرور",
+"Port" => "درگاه",
+"Credentials" => "اعتبارهای",
 "Log" => "کارنامه",
 "Log level" => "سطح ورود",
 "More" => "بیش‌تر",
@@ -66,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>",
-"User Documentation" => "مستندات کاربر",
 "Administrator Documentation" => "مستندات مدیر",
 "Online Documentation" => "مستندات آنلاین",
 "Forum" => "انجمن",
@@ -81,14 +109,22 @@ $TRANSLATIONS = array(
 "Current password" => "گذرواژه کنونی",
 "New password" => "گذرواژه جدید",
 "Change password" => "تغییر گذر واژه",
+"Full Name" => "نام کامل",
 "Email" => "ایمیل",
 "Your email address" => "پست الکترونیکی شما",
-"Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Profile picture" => "تصویر پروفایل",
+"Upload new" => "بارگذاری جدید",
+"Select new from Files" => "انتخاب جدید از میان فایل ها",
+"Remove image" => "تصویر پاک شود",
+"Either png or jpg. Ideally square but you will be able to crop it." => "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید.",
+"Cancel" => "منصرف شدن",
+"Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
 "WebDAV" => "WebDAV",
-"Encryption" => "رمزگذاری",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
+"Log-in password" => "رمز ورود",
+"Decrypt all Files" => "تمام فایلها رمزگشایی شود",
 "Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
 "Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 0451703cc75..284c47e0806 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Virheellinen arvo kohdassa %s",
+"Saved" => "Tallennettu",
+"test email settings" => "testaa sähköpostiasetukset",
+"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
+"Email sent" => "Sähköposti lähetetty",
+"You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
+"Send mode" => "Lähetystila",
+"Encryption" => "Salaus",
+"Authentication method" => "Tunnistautumistapa",
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Tunnistautumisvirhe",
 "Your full name has been changed." => "Koko nimesi on muutettu.",
@@ -18,6 +28,9 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Sovelluksen päivitys epäonnistui.",
 "Wrong password" => "Väärä salasana",
 "Unable to change password" => "Salasanan vaihto ei onnistunut",
+"Sending..." => "Lähetetään...",
+"User Documentation" => "Käyttäjäohjeistus",
+"Admin Documentation" => "Ylläpitäjän ohjeistus",
 "Update to {appversion}" => "Päivitä versioon {appversion}",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
@@ -30,8 +43,12 @@ $TRANSLATIONS = array(
 "Update" => "Päivitä",
 "Updated" => "Päivitetty",
 "Select a profile picture" => "Valitse profiilikuva",
+"Very weak password" => "Erittäin heikko salasana",
+"Weak password" => "Heikko salasana",
+"So-so password" => "Kohtalainen salasana",
+"Good password" => "Hyvä salasana",
+"Strong password" => "Vahva salasana",
 "Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-"Saving..." => "Tallennetaan...",
 "deleted" => "poistettu",
 "undo" => "kumoa",
 "Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
@@ -49,6 +66,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Varoitukset, virheet ja vakavat ongelmat",
 "Errors and fatal issues" => "Virheet ja vakavat ongelmat",
 "Fatal issues only" => "Vain vakavat ongelmat",
+"None" => "Ei mitään",
+"Login" => "Kirjaudu",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Turvallisuusvaroitus",
 "Setup Warning" => "Asetusvaroitus",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
@@ -59,6 +80,7 @@ $TRANSLATIONS = array(
 "Locale not working" => "Maa-asetus ei toimi",
 "System locale can not be set to a one which supports UTF-8." => "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
 "This means that there might be problems with certain characters in file names." => "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
 "Internet connection not working" => "Internet-yhteys ei toimi",
 "Cron" => "Cron",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumiseen 15 minuutin välein",
@@ -77,6 +99,17 @@ $TRANSLATIONS = array(
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+"Email Server" => "Sähköpostipalvelin",
+"This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
+"From address" => "Lähettäjän osoite",
+"Authentication required" => "Tunnistautuminen vaaditaan",
+"Server address" => "Palvelimen osoite",
+"Port" => "Portti",
+"Credentials" => "Tilitiedot",
+"SMTP Username" => "SMTP-käyttäjätunnus",
+"SMTP Password" => "SMTP-salasana",
+"Test email settings" => "Testaa sähköpostiasetukset",
+"Send email" => "Lähetä sähköpostiviesti",
 "Log" => "Loki",
 "Log level" => "Lokitaso",
 "More" => "Enemmän",
@@ -86,9 +119,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Lisää sovelluksesi",
 "More Apps" => "Lisää sovelluksia",
 "Select an App" => "Valitse sovellus",
+"Documentation:" => "Ohjeistus:",
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
+"See application website" => "Lue lisää sovelluksen sivustolta",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
-"User Documentation" => "Käyttäjäohjeistus",
 "Administrator Documentation" => "Ylläpito-ohjeistus",
 "Online Documentation" => "Verkko-ohjeistus",
 "Forum" => "Keskustelupalsta",
@@ -106,24 +140,24 @@ $TRANSLATIONS = array(
 "Full Name" => "Koko nimi",
 "Email" => "Sähköpostiosoite",
 "Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
+"Fill in an email address to enable password recovery and receive notifications" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia",
 "Profile picture" => "Profiilikuva",
 "Upload new" => "Lähetä uusi",
 "Select new from Files" => "Valitse uusi tiedostoista",
 "Remove image" => "Poista kuva",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa.",
-"Abort" => "Keskeytä",
+"Cancel" => "Peru",
 "Choose as profile image" => "Valitse profiilikuvaksi",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-"Encryption" => "Salaus",
 "The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
 "Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
 "Username" => "Käyttäjätunnus",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 156533f6fa0..11c75ea1e08 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Type de valeur METADATA invalide : \"%s\".",
+"Saved" => "Sauvegarder",
+"test email settings" => "tester les paramètres d'e-mail",
+"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
+"Email sent" => "Email envoyé",
+"You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
+"Send mode" => "Mode d'envoi",
+"Encryption" => "Chiffrement",
+"Authentication method" => "Méthode d'authentification",
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
+"Sending..." => "Envoi en cours...",
+"User Documentation" => "Documentation utilisateur",
+"Admin Documentation" => "Documentation administrateur",
 "Update to {appversion}" => "Mettre à jour vers {appversion}",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
@@ -34,13 +47,17 @@ $TRANSLATIONS = array(
 "Update" => "Mettre à jour",
 "Updated" => "Mise à jour effectuée avec succès",
 "Select a profile picture" => "Selectionner une photo de profil ",
+"Very weak password" => "Mot de passe de très faible sécurité",
+"Weak password" => "Mot de passe de faible sécurité",
+"So-so password" => "Mot de passe de sécurité tout juste acceptable",
+"Good password" => "Mot de passe de sécurité suffisante",
+"Strong password" => "Mot de passe de forte sécurité",
 "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
-"Saving..." => "Enregistrement...",
 "deleted" => "supprimé",
 "undo" => "annuler",
 "Unable to remove user" => "Impossible de retirer l'utilisateur",
 "Groups" => "Groupes",
-"Group Admin" => "Groupe Admin",
+"Group Admin" => "Admin Groupe",
 "Delete" => "Supprimer",
 "add group" => "ajouter un groupe",
 "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avertissements, erreurs et erreurs fatales",
 "Errors and fatal issues" => "Erreurs et erreurs fatales",
 "Fatal issues only" => "Erreurs fatales uniquement",
+"None" => "Aucun",
+"Login" => "Connexion",
+"Plain" => "En clair",
+"NT LAN Manager" => "Gestionnaire du réseau NT",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avertissement de sécurité",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
+"Email Server" => "Serveur mail",
+"This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
+"From address" => "Adresse source",
+"Authentication required" => "Authentification requise",
+"Server address" => "Adresse du serveur",
+"Port" => "Port",
+"Credentials" => "Informations d'identification",
+"SMTP Username" => "Nom d'utilisateur SMTP",
+"SMTP Password" => "Mot de passe SMTP",
+"Test email settings" => "Paramètres de test d'e-mail",
+"Send email" => "Envoyer un e-mail",
 "Log" => "Log",
 "Log level" => "Niveau de log",
 "More" => "Plus",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Ajoutez votre application",
 "More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
+"Documentation:" => "Documentation :",
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
+"See application website" => "Voir le site web de l'application",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
-"User Documentation" => "Documentation utilisateur",
 "Administrator Documentation" => "Documentation administrateur",
 "Online Documentation" => "Documentation en ligne",
 "Forum" => "Forum",
@@ -119,33 +154,32 @@ $TRANSLATIONS = array(
 "Full Name" => "Nom complet",
 "Email" => "Adresse mail",
 "Your email address" => "Votre adresse e-mail",
-"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
+"Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
 "Upload new" => "Télécharger nouveau",
 "Select new from Files" => "Sélectionner un nouveau depuis les documents",
 "Remove image" => "Supprimer l'image",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer .",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
 "Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
-"Abort" => "Abandonner",
+"Cancel" => "Annuler",
 "Choose as profile image" => "Choisir en temps que photo de profil ",
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
-"Encryption" => "Chiffrement",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
 "Log-in password" => "Mot de passe de connexion",
 "Decrypt all Files" => "Déchiffrer tous les fichiers",
-"Login Name" => "Nom de la connexion",
+"Login Name" => "Nom d'utilisateur",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
 "Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-"Default Storage" => "Support de stockage par défaut",
+"Default Storage" => "Espace de stockage par défaut",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
 "Username" => "Nom d'utilisateur",
-"Storage" => "Support de stockage",
+"Storage" => "Espace de stockage",
 "change full name" => "Modifier le nom complet",
 "set new password" => "Changer le mot de passe",
 "Default" => "Défaut"
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index e345280bddf..d98d812d944 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Forneceu un valor incorrecto para %s",
+"Saved" => "Gardado",
+"test email settings" => "correo de proba dos axustes",
+"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Produciuse un problema ao enviar o correo. Revise os seus axustes.",
+"Email sent" => "Correo enviado",
+"You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
+"Authentication method" => "Método de autenticación",
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Your full name has been changed." => "O seu nome completo foi cambiado",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
 "Unable to change password" => "Non é posíbel cambiar o contrasinal",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentación do usuario",
+"Admin Documentation" => "Documentación do administrador",
 "Update to {appversion}" => "Actualizar á {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccione unha imaxe para o perfil",
+"Very weak password" => "Contrasinal moi feble",
+"Weak password" => "Contrasinal feble",
+"So-so password" => "Contrasinal non moi aló",
+"Good password" => "Bo contrasinal",
+"Strong password" => "Contrasinal forte",
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
-"Saving..." => "Gardando...",
 "deleted" => "eliminado",
 "undo" => "desfacer",
 "Unable to remove user" => "Non é posíbel retirar o usuario",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas críticos",
 "Errors and fatal issues" => "Erros e problemas críticos",
 "Fatal issues only" => "Só problemas críticos",
+"None" => "Ningún",
+"Login" => "Acceso",
+"Plain" => "Simple",
+"NT LAN Manager" => "Xestor NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de seguranza",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
+"Email Server" => "Servidor de correo",
+"This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
+"From address" => "Desde o enderezo",
+"Authentication required" => "Requírese autenticación",
+"Server address" => "Enderezo do servidor",
+"Port" => "Porto",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome de usuario SMTP",
+"SMTP Password" => "Contrasinal SMTP",
+"Test email settings" => "Correo de proba dos axustes",
+"Send email" => "Enviar o correo",
 "Log" => "Rexistro",
 "Log level" => "Nivel de rexistro",
 "More" => "Máis",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Engada o seu aplicativo",
 "More Apps" => "Máis aplicativos",
 "Select an App" => "Escolla un aplicativo",
+"Documentation:" => "Documentación:",
 "See application page at apps.owncloud.com" => "Consulte a páxina do aplicativo en apps.owncloud.com",
+"See application website" => "Vexa o sitio web do aplicativo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
-"User Documentation" => "Documentación do usuario",
 "Administrator Documentation" => "Documentación do administrador",
 "Online Documentation" => "Documentación na Rede",
 "Forum" => "Foro",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Correo",
 "Your email address" => "O seu enderezo de correo",
-"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación",
+"Fill in an email address to enable password recovery and receive notifications" => "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións",
 "Profile picture" => "Imaxe do perfil",
 "Upload new" => "Novo envío",
 "Select new from Files" => "Seleccione unha nova de ficheiros",
 "Remove image" => "Retirar a imaxe",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.",
 "Your avatar is provided by your original account." => "O seu avatar é fornecido pola súa conta orixinal.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolla unha imaxe para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón  <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
-"Encryption" => "Cifrado",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
 "Log-in password" => "Contrasinal de acceso",
 "Decrypt all Files" => "Descifrar todos os ficheiros",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 21c32d0f8e0..0b42c2167ad 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "הודעת הדוא״ל נשלחה",
+"Encryption" => "הצפנה",
 "Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
 "Authentication error" => "שגיאת הזדהות",
 "Group already exists" => "הקבוצה כבר קיימת",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "לא ניתן להוסיף משתמש לקבוצה %s",
 "Unable to remove user from group %s" => "לא ניתן להסיר משתמש מהקבוצה %s",
 "Couldn't update app." => "לא ניתן לעדכן את היישום.",
+"User Documentation" => "תיעוד משתמש",
 "Update to {appversion}" => "עדכון לגרסה {appversion}",
 "Disable" => "בטל",
 "Enable" => "הפעלה",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "שגיאה",
 "Update" => "עדכון",
 "Updated" => "מעודכן",
-"Saving..." => "שמירה…",
 "deleted" => "נמחק",
 "undo" => "ביטול",
 "Unable to remove user" => "לא ניתן להסיר את המשתמש",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "יצירת המשתמש נכשלה",
 "A valid password must be provided" => "יש לספק ססמה תקנית",
 "__language_name__" => "עברית",
+"None" => "כלום",
+"Login" => "התחברות",
 "Security Warning" => "אזהרת אבטחה",
 "Setup Warning" => "שגיאת הגדרה",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
@@ -53,6 +57,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד",
 "Security" => "אבטחה",
 "Enforce HTTPS" => "לאלץ HTTPS",
+"Server address" => "כתובת שרת",
+"Port" => "פורט",
+"Credentials" => "פרטי גישה",
 "Log" => "יומן",
 "Log level" => "רמת הדיווח",
 "More" => "יותר",
@@ -64,7 +71,6 @@ $TRANSLATIONS = array(
 "Select an App" => "בחירת יישום",
 "See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
-"User Documentation" => "תיעוד משתמש",
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
 "Forum" => "פורום",
@@ -81,12 +87,11 @@ $TRANSLATIONS = array(
 "Change password" => "שינוי ססמה",
 "Email" => "דואר אלקטרוני",
 "Your email address" => "כתובת הדוא״ל שלך",
-"Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
 "Profile picture" => "תמונת פרופיל",
+"Cancel" => "ביטול",
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "WebDAV" => "WebDAV",
-"Encryption" => "הצפנה",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 2c65a26dae5..67463ef7bd4 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,11 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ईमेल भेज दिया गया है ",
 "Error" => "त्रुटि",
 "Update" => "अद्यतन",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Password" => "पासवर्ड",
 "New password" => "नया पासवर्ड",
-"Abort" => "रद्द करना ",
 "Username" => "प्रयोक्ता का नाम"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 4a225ed4b8a..d0b19c3c3c4 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -9,13 +9,13 @@ $TRANSLATIONS = array(
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Error" => "Greška",
-"Saving..." => "Spremanje...",
 "deleted" => "izbrisano",
 "undo" => "vrati",
 "Groups" => "Grupe",
 "Group Admin" => "Grupa Admin",
 "Delete" => "Obriši",
 "__language_name__" => "__ime_jezika__",
+"Login" => "Prijava",
 "Cron" => "Cron",
 "Log" => "dnevnik",
 "More" => "više",
@@ -29,9 +29,10 @@ $TRANSLATIONS = array(
 "Change password" => "Izmjena lozinke",
 "Email" => "e-mail adresa",
 "Your email address" => "Vaša e-mail adresa",
-"Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
+"Cancel" => "Odustani",
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
+"Login Name" => "Prijava",
 "Create" => "Izradi",
 "Other" => "ostali",
 "Username" => "Korisničko ime"
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 6b2dc3e0172..b3492b9fd76 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Az emailt elküldtük",
+"Encryption" => "Titkosítás",
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Authentication error" => "Azonosítási hiba",
 "Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.",
 "Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
+"User Documentation" => "Felhasználói leírás",
 "Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
 "Disable" => "Letiltás",
 "Enable" => "engedélyezve",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Frissítve",
 "Select a profile picture" => "Válassz profil képet",
 "Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
-"Saving..." => "Mentés...",
 "deleted" => "törölve",
 "undo" => "visszavonás",
 "Unable to remove user" => "A felhasználót nem sikerült eltávolítáni",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Figyelmeztetések, hibák és végzetes hibák",
 "Errors and fatal issues" => "Hibák és végzetes hibák",
 "Fatal issues only" => "Csak a végzetes hibák",
+"None" => "Egyik sem",
+"Login" => "Bejelentkezés",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Jelenlegi elérése a következőnek '%s' jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálot úgy állitsd be, hogy HTTPS-t tudjál használni.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
@@ -90,6 +94,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Kötelező HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást.",
+"Server address" => "A kiszolgáló címe",
+"Port" => "Port",
+"Credentials" => "Azonosítók",
 "Log" => "Naplózás",
 "Log level" => "Naplózási szint",
 "More" => "Több",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Válasszon egy alkalmazást",
 "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
-"User Documentation" => "Felhasználói leírás",
 "Administrator Documentation" => "Üzemeltetői leírás",
 "Online Documentation" => "Online leírás",
 "Forum" => "Fórum",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Teljes név",
 "Email" => "Email",
 "Your email address" => "Az Ön email címe",
-"Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!",
 "Profile picture" => "Profilkép",
 "Upload new" => "Új feltöltése",
 "Select new from Files" => "Új kiválasztása Fileokból",
 "Remove image" => "Kép eltávolítása",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható",
 "Your avatar is provided by your original account." => "Az avatarod az eredeti fiókod alapján van beállítva.",
-"Abort" => "Megszakítás",
+"Cancel" => "Mégsem",
 "Choose as profile image" => "Válassz profil képet",
 "Language" => "Nyelv",
 "Help translate" => "Segítsen a fordításban!",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
-"Encryption" => "Titkosítás",
 "The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak.",
 "Log-in password" => "Bejelentkezési jelszó",
 "Decrypt all Files" => "Kititkosítja az összes file-t",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index b51bc32a2f5..35ddeb30ca8 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "Email" => "E-posta",
 "Your email address" => "Tu adresse de e-posta",
 "Profile picture" => "Imagine de profilo",
+"Cancel" => "Cancellar",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
 "Create" => "Crear",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 2ff3f572966..a7b59d82f84 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email terkirim",
+"Encryption" => "Enkripsi",
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
 "Authentication error" => "Galat saat autentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
 "Unable to change password" => "Tidak dapat mengubah sandi",
+"User Documentation" => "Dokumentasi Pengguna",
 "Update to {appversion}" => "Perbarui ke {appversion}",
 "Disable" => "Nonaktifkan",
 "Enable" => "Aktifkan",
@@ -34,7 +37,6 @@ $TRANSLATIONS = array(
 "Updated" => "Diperbarui",
 "Select a profile picture" => "Pilih foto profil",
 "Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
-"Saving..." => "Menyimpan...",
 "deleted" => "dihapus",
 "undo" => "urungkan",
 "Unable to remove user" => "Tidak dapat menghapus pengguna",
@@ -52,6 +54,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Peringatan, galat dan masalah fatal",
 "Errors and fatal issues" => "Galat dan masalah fatal",
 "Fatal issues only" => "Hanya masalah fatal",
+"None" => "Tidak ada",
+"Login" => "Masuk",
 "Security Warning" => "Peringatan Keamanan",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
@@ -88,6 +92,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
+"Server address" => "Alamat server",
+"Port" => "port",
 "Log" => "Catat",
 "Log level" => "Level pencatatan",
 "More" => "Lainnya",
@@ -99,7 +105,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Pilih Aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
-"User Documentation" => "Dokumentasi Pengguna",
 "Administrator Documentation" => "Dokumentasi Administrator",
 "Online Documentation" => "Dokumentasi Online",
 "Forum" => "Forum",
@@ -117,20 +122,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nama Lengkap",
 "Email" => "Email",
 "Your email address" => "Alamat email Anda",
-"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan sandi",
 "Profile picture" => "Foto profil",
 "Upload new" => "Unggah baru",
 "Select new from Files" => "Pilih baru dari Berkas",
 "Remove image" => "Hapus gambar",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Bisa png atau jpg. Idealnya berbentuk persegi tetapi jika tidak Anda bisa memotongnya nanti.",
 "Your avatar is provided by your original account." => "Avatar disediakan oleh akun asli Anda.",
-"Abort" => "Batal",
+"Cancel" => "Batal",
 "Choose as profile image" => "Pilih sebagai gambar profil",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-"Encryption" => "Enkripsi",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
 "Log-in password" => "Sandi masuk",
 "Decrypt all Files" => "Deskripsi semua Berkas",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 6798783f83b..3f8b5accda2 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Tölvupóstur sendur",
+"Encryption" => "Dulkóðun",
 "Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
 "Authentication error" => "Villa við auðkenningu",
 "Group already exists" => "Hópur er þegar til",
@@ -13,6 +15,7 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
 "Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
 "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
+"User Documentation" => "Notenda handbók",
 "Disable" => "Gera óvirkt",
 "Enable" => "Virkja",
 "Please wait...." => "Andartak....",
@@ -20,14 +23,15 @@ $TRANSLATIONS = array(
 "Error" => "Villa",
 "Update" => "Uppfæra",
 "Updated" => "Uppfært",
-"Saving..." => "Er að vista ...",
 "deleted" => "eytt",
 "undo" => "afturkalla",
 "Groups" => "Hópar",
 "Group Admin" => "Hópstjóri",
 "Delete" => "Eyða",
 "__language_name__" => "__nafn_tungumáls__",
+"None" => "Ekkert",
 "Security Warning" => "Öryggis aðvörun",
+"Server address" => "Host nafn netþjóns",
 "More" => "Meira",
 "Less" => "Minna",
 "Version" => "Útgáfa",
@@ -37,7 +41,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Veldu forrit",
 "See application page at apps.owncloud.com" => "Skoða síðu forrits hjá apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>",
-"User Documentation" => "Notenda handbók",
 "Administrator Documentation" => "Stjórnenda handbók",
 "Online Documentation" => "Handbók á netinu",
 "Forum" => "Vefspjall",
@@ -52,11 +55,10 @@ $TRANSLATIONS = array(
 "Change password" => "Breyta lykilorði",
 "Email" => "Netfang",
 "Your email address" => "Netfangið þitt",
-"Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði",
+"Cancel" => "Hætta við",
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
-"Encryption" => "Dulkóðun",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 08bab35244c..181fd11f972 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valore non valido fornito per %s",
+"Saved" => "Salvato",
+"test email settings" => "prova impostazioni email",
+"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
+"Email sent" => "Email inviata",
+"You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
+"Send mode" => "Modalità di invio",
+"Encryption" => "Cifratura",
+"Authentication method" => "Metodo di autenticazione",
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
 "Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
 "Unable to change password" => "Impossibile cambiare la password",
+"Sending..." => "Invio in corso...",
+"User Documentation" => "Documentazione utente",
+"Admin Documentation" => "Documentazione di amministrazione",
 "Update to {appversion}" => "Aggiorna a {appversion}",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aggiorna",
 "Updated" => "Aggiornato",
 "Select a profile picture" => "Seleziona un'immagine del profilo",
+"Very weak password" => "Password molto debole",
+"Weak password" => "Password debole",
+"So-so password" => "Password così-così",
+"Good password" => "Password buona",
+"Strong password" => "Password forte",
 "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-"Saving..." => "Salvataggio in corso...",
 "deleted" => "eliminati",
 "undo" => "annulla",
 "Unable to remove user" => "Impossibile rimuovere l'utente",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avvisi, errori e problemi gravi",
 "Errors and fatal issues" => "Errori e problemi gravi",
 "Fatal issues only" => "Solo problemi gravi",
+"None" => "Nessuno",
+"Login" => "Accesso",
+"Plain" => "Semplice",
+"NT LAN Manager" => "Gestore NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avviso di sicurezza",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forza HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
+"Email Server" => "Server di posta",
+"This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
+"From address" => "Indirizzo mittente",
+"Authentication required" => "Autenticazione richiesta",
+"Server address" => "Indirizzo del server",
+"Port" => "Porta",
+"Credentials" => "Credenziali",
+"SMTP Username" => "Nome utente SMTP",
+"SMTP Password" => "Password SMTP",
+"Test email settings" => "Prova impostazioni email",
+"Send email" => "Invia email",
 "Log" => "Log",
 "Log level" => "Livello di log",
 "More" => "Altro",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Aggiungi la tua applicazione",
 "More Apps" => "Altre applicazioni",
 "Select an App" => "Seleziona un'applicazione",
+"Documentation:" => "Documentazione:",
 "See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
+"See application website" => "Visita il sito web dell'applicazione",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
-"User Documentation" => "Documentazione utente",
 "Administrator Documentation" => "Documentazione amministratore",
 "Online Documentation" => "Documentazione in linea",
 "Forum" => "Forum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Posta elettronica",
 "Your email address" => "Il tuo indirizzo email",
-"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
+"Fill in an email address to enable password recovery and receive notifications" => "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche",
 "Profile picture" => "Immagine del profilo",
 "Upload new" => "Carica nuova",
 "Select new from Files" => "Seleziona nuova da file",
 "Remove image" => "Rimuovi immagine",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
 "Your avatar is provided by your original account." => "Il tuo avatar è ottenuto dal tuo account originale.",
-"Abort" => "Interrompi",
+"Cancel" => "Annulla",
 "Choose as profile image" => "Scegli come immagine del profilo",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-"Encryption" => "Cifratura",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
 "Log-in password" => "Password di accesso",
 "Decrypt all Files" => "Decifra tutti i file",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
new file mode 100644
index 00000000000..7a2802d588a
--- /dev/null
+++ b/settings/l10n/ja.php
@@ -0,0 +1,187 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s に提供された無効な値",
+"Saved" => "保存されました",
+"test email settings" => "eメール設定をテスト",
+"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
+"Email sent" => "メールを送信しました",
+"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+"Send mode" => "送信モード",
+"Encryption" => "暗号化",
+"Authentication method" => "認証方法",
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Authentication error" => "認証エラー",
+"Your full name has been changed." => "フルネームを変更しました。",
+"Unable to change full name" => "フルネームを変更できません",
+"Group already exists" => "グループはすでに存在します",
+"Unable to add group" => "グループを追加できません",
+"Email saved" => "メールアドレスを保存しました",
+"Invalid email" => "無効なメールアドレス",
+"Unable to delete group" => "グループを削除できません",
+"Unable to delete user" => "ユーザーを削除できません",
+"Language changed" => "言語が変更されました",
+"Invalid request" => "不正なリクエスト",
+"Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
+"Unable to add user to group %s" => "ユーザーをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザーをグループ %s から削除できません",
+"Couldn't update app." => "アプリをアップデートできませんでした。",
+"Wrong password" => "無効なパスワード",
+"No user supplied" => "ユーザーが指定されていません",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
+"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
+"Unable to change password" => "パスワードを変更できません",
+"Sending..." => "送信中…",
+"User Documentation" => "ユーザードキュメント",
+"Admin Documentation" => "管理者ドキュメント",
+"Update to {appversion}" => "{appversion} にアップデート",
+"Disable" => "無効",
+"Enable" => "有効にする",
+"Please wait...." => "しばらくお待ちください。",
+"Error while disabling app" => "アプリ無効化中にエラーが発生",
+"Error while enabling app" => "アプリを有効にする際にエラーが発生",
+"Updating...." => "更新中....",
+"Error while updating app" => "アプリの更新中にエラーが発生",
+"Error" => "エラー",
+"Update" => "アップデート",
+"Updated" => "アップデート済み",
+"Select a profile picture" => "プロファイル画像を選択",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
+"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+"deleted" => "削除",
+"undo" => "元に戻す",
+"Unable to remove user" => "ユーザーを削除できません",
+"Groups" => "グループ",
+"Group Admin" => "グループ管理者",
+"Delete" => "削除",
+"add group" => "グループを追加",
+"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
+"Error creating user" => "ユーザー作成エラー",
+"A valid password must be provided" => "有効なパスワードを指定する必要があります",
+"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
+"__language_name__" => "Japanese (日本語)",
+"Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
+"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
+"Errors and fatal issues" => "エラー、致命的な問題",
+"Fatal issues only" => "致命的な問題のみ",
+"None" => "なし",
+"Login" => "ログイン",
+"Plain" => "平文",
+"NT LAN Manager" => "NT LAN マネージャー",
+"SSL" => "SSL",
+"TLS" => "TLS",
+"Security Warning" => "セキュリティ警告",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
+"Setup Warning" => "セットアップ警告",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+"Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。",
+"Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
+"Your PHP version is outdated" => "PHPバーションが古くなっています。",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+"Locale not working" => "ロケールが動作していません",
+"System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
+"This means that there might be problems with certain characters in file names." => "これは、ファイル名の特定の文字に問題があることを意味しています。",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+"Internet connection not working" => "インターネット接続が動作していません",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+"Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。",
+"Sharing" => "共有",
+"Enable Share API" => "共有APIを有効にする",
+"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
+"Allow links" => "リンクを許可する",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
+"Allow public uploads" => "パブリックなアップロードを許可",
+"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
+"Allow resharing" => "再共有を許可する",
+"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
+"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
+"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
+"Allow mail notification" => "メール通知を許可",
+"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
+"Security" => "セキュリティ",
+"Enforce HTTPS" => "常にHTTPSを使用する",
+"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+"Email Server" => "メールサーバー",
+"This is used for sending out notifications." => "これは通知の送信に使われます。",
+"From address" => "アドレスから",
+"Authentication required" => "要求される認証",
+"Server address" => "サーバーアドレス",
+"Port" => "ポート",
+"Credentials" => "資格情報",
+"SMTP Username" => "SMTP ユーザー名",
+"SMTP Password" => "SMTP パスワード",
+"Test email settings" => "メールテスト設定",
+"Send email" => "メールを送信",
+"Log" => "ログ",
+"Log level" => "ログレベル",
+"More" => "もっと見る",
+"Less" => "閉じる",
+"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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
+"Add your App" => "アプリを追加",
+"More Apps" => "さらにアプリを表示",
+"Select an App" => "アプリを選択してください",
+"Documentation:" => "ドキュメント:",
+"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"See application website" => "アプリケーションのウェブサイトを見る",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
+"Administrator Documentation" => "管理者ドキュメント",
+"Online Documentation" => "オンラインドキュメント",
+"Forum" => "フォーラム",
+"Bugtracker" => "バグトラッカー",
+"Commercial Support" => "商用サポート",
+"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
+"Show First Run Wizard again" => "初回ウィザードを再表示する",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
+"Password" => "パスワード",
+"Your password was changed" => "パスワードを変更しました",
+"Unable to change your password" => "パスワードを変更することができません",
+"Current password" => "Current password",
+"New password" => "新しいパスワードを入力",
+"Change password" => "パスワードを変更",
+"Full Name" => "名前",
+"Email" => "メール",
+"Your email address" => "あなたのメールアドレス",
+"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
+"Profile picture" => "プロフィール写真",
+"Upload new" => "新規にアップロード",
+"Select new from Files" => "ファイルから新規に選択",
+"Remove image" => "画像を削除",
+"Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。",
+"Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
+"Cancel" => "キャンセル",
+"Choose as profile image" => "プロファイル画像として選択",
+"Language" => "言語",
+"Help translate" => "翻訳に協力する",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
+"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+"Log-in password" => "ログインパスワード",
+"Decrypt all Files" => "すべてのファイルを複合する",
+"Login Name" => "ログイン名",
+"Create" => "作成",
+"Admin Recovery Password" => "管理者リカバリパスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+"Default Storage" => "デフォルトストレージ",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
+"Unlimited" => "無制限",
+"Other" => "その他",
+"Username" => "ユーザー名",
+"Storage" => "ストレージ",
+"change full name" => "フルネームを変更",
+"set new password" => "新しいパスワードを設定",
+"Default" => "デフォルト"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index b151564a18c..7a2802d588a 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,68 +1,91 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s に提供された無効な値",
+"Saved" => "保存されました",
+"test email settings" => "eメール設定をテスト",
+"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
+"Email sent" => "メールを送信しました",
+"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+"Send mode" => "送信モード",
+"Encryption" => "暗号化",
+"Authentication method" => "認証方法",
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Authentication error" => "認証エラー",
-"Your full name has been changed." => "姓名が変更されました",
-"Unable to change full name" => "姓名を変更できません",
-"Group already exists" => "グループは既に存在しています",
+"Your full name has been changed." => "フルネームを変更しました。",
+"Unable to change full name" => "フルネームを変更できません",
+"Group already exists" => "グループはすでに存在します",
 "Unable to add group" => "グループを追加できません",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "Unable to delete group" => "グループを削除できません",
-"Unable to delete user" => "ユーザを削除できません",
+"Unable to delete user" => "ユーザーを削除できません",
 "Language changed" => "言語が変更されました",
 "Invalid request" => "不正なリクエスト",
 "Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
-"Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
-"Unable to remove user from group %s" => "ユーザをグループ %s から削除できません",
-"Couldn't update app." => "アプリを更新出来ませんでした。",
+"Unable to add user to group %s" => "ユーザーをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザーをグループ %s から削除できません",
+"Couldn't update app." => "アプリをアップデートできませんでした。",
 "Wrong password" => "無効なパスワード",
-"No user supplied" => "ユーザが指定されていません",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。",
-"Wrong admin recovery password. Please check the password and try again." => "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。",
+"No user supplied" => "ユーザーが指定されていません",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
+"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
 "Unable to change password" => "パスワードを変更できません",
-"Update to {appversion}" => "{appversion} に更新",
+"Sending..." => "送信中…",
+"User Documentation" => "ユーザードキュメント",
+"Admin Documentation" => "管理者ドキュメント",
+"Update to {appversion}" => "{appversion} にアップデート",
 "Disable" => "無効",
-"Enable" => "有効化",
+"Enable" => "有効にする",
 "Please wait...." => "しばらくお待ちください。",
 "Error while disabling app" => "アプリ無効化中にエラーが発生",
-"Error while enabling app" => "アプリ有効化中にエラーが発生",
+"Error while enabling app" => "アプリを有効にする際にエラーが発生",
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Error" => "エラー",
-"Update" => "更新",
-"Updated" => "更新済み",
+"Update" => "アップデート",
+"Updated" => "アップデート済み",
 "Select a profile picture" => "プロファイル画像を選択",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
 "Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-"Saving..." => "保存中...",
 "deleted" => "削除",
 "undo" => "元に戻す",
-"Unable to remove user" => "ユーザを削除出来ません",
+"Unable to remove user" => "ユーザーを削除できません",
 "Groups" => "グループ",
 "Group Admin" => "グループ管理者",
 "Delete" => "削除",
 "add group" => "グループを追加",
-"A valid username must be provided" => "有効なユーザ名を指定する必要があります",
-"Error creating user" => "ユーザ作成エラー",
+"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
+"Error creating user" => "ユーザー作成エラー",
 "A valid password must be provided" => "有効なパスワードを指定する必要があります",
-"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザ \"{user}\" のホームディレクトリはすでに存在します",
+"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
 "__language_name__" => "Japanese (日本語)",
 "Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-"Info, warnings, errors and fatal issues" => "情報と警告、エラー、致命的な問題",
-"Warnings, errors and fatal issues" => "警告とエラー、致命的な問題",
-"Errors and fatal issues" => "エラーと致命的な問題",
+"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
+"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
+"Errors and fatal issues" => "エラー、致命的な問題",
 "Fatal issues only" => "致命的な問題のみ",
+"None" => "なし",
+"Login" => "ログイン",
+"Plain" => "平文",
+"NT LAN Manager" => "NT LAN マネージャー",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "セキュリティ警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP 経由で %s にアクセスしています。HTTPS を使用するようにサーバの設定を行うことを強くおすすめします。",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
 "Setup Warning" => "セットアップ警告",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
 "Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。",
 "Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
-"Your PHP version is outdated" => "PHPバーションが古くなっております。",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっております。このプログラムが不正な行為を発生する可能性はある為、PHPバーション5.3.8以降にアップグレードをください。",
+"Your PHP version is outdated" => "PHPバーションが古くなっています。",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
 "Locale not working" => "ロケールが動作していません",
 "System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
 "This means that there might be problems with certain characters in file names." => "これは、ファイル名の特定の文字に問題があることを意味しています。",
@@ -71,25 +94,36 @@ $TRANSLATIONS = array(
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "HTTPを通して15分間隔で cron.php を実行するように、cron.php は webcron サービスに登録されています。",
-"Use systems cron service to call the cron.php file every 15 minutes." => "15分間隔で cron.php ファイルを実行するためにシステムの cron サービスを利用する",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+"Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。",
 "Sharing" => "共有",
 "Enable Share API" => "共有APIを有効にする",
 "Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
 "Allow links" => "リンクを許可する",
-"Allow users to share items to the public with links" => "リンクによりアイテムを公開することを許可する",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
 "Allow public uploads" => "パブリックなアップロードを許可",
-"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダへのアップロードを共有しているメンバーにも許可",
+"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
 "Allow resharing" => "再共有を許可する",
-"Allow users to share items shared with them again" => "ユーザが共有しているアイテムの再共有を許可する",
-"Allow users to share with anyone" => "ユーザが誰とでも共有することを許可する",
-"Allow users to only share with users in their groups" => "ユーザにグループ内のユーザとのみ共有を許可する",
+"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
+"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
+"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
 "Allow mail notification" => "メール通知を許可",
-"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
+"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
 "Security" => "セキュリティ",
 "Enforce HTTPS" => "常にHTTPSを使用する",
-"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化する。",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効／無効にするために、HTTPS経由で %s へ接続してください。",
+"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+"Email Server" => "メールサーバー",
+"This is used for sending out notifications." => "これは通知の送信に使われます。",
+"From address" => "アドレスから",
+"Authentication required" => "要求される認証",
+"Server address" => "サーバーアドレス",
+"Port" => "ポート",
+"Credentials" => "資格情報",
+"SMTP Username" => "SMTP ユーザー名",
+"SMTP Password" => "SMTP パスワード",
+"Test email settings" => "メールテスト設定",
+"Send email" => "メールを送信",
 "Log" => "ログ",
 "Log level" => "ログレベル",
 "More" => "もっと見る",
@@ -99,14 +133,15 @@ $TRANSLATIONS = array(
 "Add your App" => "アプリを追加",
 "More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
+"Documentation:" => "ドキュメント:",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"See application website" => "アプリケーションのウェブサイトを見る",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
-"User Documentation" => "ユーザドキュメント",
 "Administrator Documentation" => "管理者ドキュメント",
 "Online Documentation" => "オンラインドキュメント",
 "Forum" => "フォーラム",
 "Bugtracker" => "バグトラッカー",
-"Commercial Support" => "コマーシャルサポート",
+"Commercial Support" => "商用サポート",
 "Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
 "Show First Run Wizard again" => "初回ウィザードを再表示する",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
@@ -116,37 +151,36 @@ $TRANSLATIONS = array(
 "Current password" => "Current password",
 "New password" => "新しいパスワードを入力",
 "Change password" => "パスワードを変更",
-"Full Name" => "姓名",
+"Full Name" => "名前",
 "Email" => "メール",
 "Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
+"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
 "Profile picture" => "プロフィール写真",
 "Upload new" => "新規にアップロード",
 "Select new from Files" => "ファイルから新規に選択",
 "Remove image" => "画像を削除",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。",
 "Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
-"Abort" => "中止",
+"Cancel" => "キャンセル",
 "Choose as profile image" => "プロファイル画像として選択",
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
-"Encryption" => "暗号化",
 "The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
 "Log-in password" => "ログインパスワード",
 "Decrypt all Files" => "すべてのファイルを複合する",
 "Login Name" => "ログイン名",
 "Create" => "作成",
-"Admin Recovery Password" => "管理者復旧パスワード",
-"Enter the recovery password in order to recover the users files during password change" => "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください",
+"Admin Recovery Password" => "管理者リカバリパスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
 "Default Storage" => "デフォルトストレージ",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
 "Unlimited" => "無制限",
 "Other" => "その他",
 "Username" => "ユーザー名",
 "Storage" => "ストレージ",
-"change full name" => "姓名を変更",
+"change full name" => "フルネームを変更",
 "set new password" => "新しいパスワードを設定",
 "Default" => "デフォルト"
 );
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index ba844736a5b..88f6ef514d5 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "იმეილი გაიგზავნა",
+"Encryption" => "ენკრიპცია",
 "Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
 "Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Group already exists" => "ჯგუფი უკვე არსებობს",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s",
 "Unable to remove user from group %s" => "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s",
 "Couldn't update app." => "ვერ მოხერხდა აპლიკაციის განახლება.",
+"User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Update to {appversion}" => "განაახლე {appversion}–მდე",
 "Disable" => "გამორთვა",
 "Enable" => "ჩართვა",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "შეცდომა",
 "Update" => "განახლება",
 "Updated" => "განახლებულია",
-"Saving..." => "შენახვა...",
 "deleted" => "წაშლილი",
 "undo" => "დაბრუნება",
 "Unable to remove user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
 "A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი",
 "__language_name__" => "__language_name__",
+"None" => "არა",
+"Login" => "ლოგინი",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
 "Setup Warning" => "გაფრთხილება დაყენებისას",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
@@ -55,6 +59,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის",
 "Security" => "უსაფრთხოება",
 "Enforce HTTPS" => "HTTPS–ის ჩართვა",
+"Server address" => "სერვერის მისამართი",
+"Port" => "პორტი",
+"Credentials" => "იუზერ/პაროლი",
 "Log" => "ლოგი",
 "Log level" => "ლოგირების დონე",
 "More" => "უფრო მეტი",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "აირჩიეთ აპლიკაცია",
 "See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
-"User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
 "Online Documentation" => "ონლაინ დოკუმენტაცია",
 "Forum" => "ფორუმი",
@@ -83,11 +89,10 @@ $TRANSLATIONS = array(
 "Change password" => "პაროლის შეცვლა",
 "Email" => "იმეილი",
 "Your email address" => "თქვენი იმეილ მისამართი",
-"Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
+"Cancel" => "უარყოფა",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
 "WebDAV" => "WebDAV",
-"Encryption" => "ენკრიპცია",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
 "Default Storage" => "საწყისი საცავი",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index f7d9faa38c5..37bebc1c6fa 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,5 +1,82 @@
 <?php
 $TRANSLATIONS = array(
-"Delete" => "លុប"
+"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
+"Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store",
+"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+"Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ",
+"Unable to add group" => "មិន​អាច​បន្ថែម​ក្រុម",
+"Email saved" => "បាន​រក្សា​ទុក​អ៊ីមែល",
+"Invalid email" => "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ",
+"Unable to delete group" => "មិន​អាច​លុប​ក្រុម​បាន",
+"Unable to delete user" => "មិន​អាច​លុប​អ្នក​ប្រើ​បាន",
+"Language changed" => "បាន​ប្ដូរ​ភាសា",
+"Invalid request" => "សំណើ​មិន​ត្រឹម​ត្រូវ",
+"Admins can't remove themself from the admin group" => "អ្នក​គ្រប់​គ្រង​មិន​អាច​លុប​ខ្លួន​ឯង​ចេញ​ពី​ក្រុម​អ្នក​គ្រប់​គ្រង​ឡើយ",
+"Unable to add user to group %s" => "មិន​អាច​បន្ថែម​អ្នក​ប្រើ​ទៅ​ក្រុម %s",
+"Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
+"Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+"Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}",
+"Disable" => "បិទ",
+"Enable" => "បើក",
+"Please wait...." => "សូម​រង់​ចាំ....",
+"Updating...." => "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+"Error while updating app" => "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+"Error" => "កំហុស",
+"Update" => "ធ្វើ​បច្ចុប្បន្នភាព",
+"Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+"deleted" => "បាន​លុប",
+"undo" => "មិន​ធ្វើ​វិញ",
+"Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ",
+"Groups" => "ក្រុ",
+"Group Admin" => "ក្រុម​អ្នក​គ្រប់គ្រង",
+"Delete" => "លុប",
+"add group" => "បន្ថែម​ក្រុម",
+"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+"Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+"__language_name__" => "__language_name__",
+"Login" => "ចូល",
+"Security Warning" => "បម្រាម​សុវត្ថិភាព",
+"Setup Warning" => "បម្រាម​ការ​ដំឡើង",
+"Module 'fileinfo' missing" => "ខ្វះ​ម៉ូឌុល 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
+"Locale not working" => "Locale មិន​ដំណើរការ",
+"Internet connection not working" => "ការ​តភ្ជាប់​អ៊ីនធឺណិត​មិន​មាន​ដំណើរ​ការ",
+"Sharing" => "ការ​ចែក​រំលែក",
+"Enable Share API" => "បើក API ចែក​រំលែក",
+"Allow apps to use the Share API" => "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+"Allow links" => "អនុញ្ញាត​តំណ",
+"Allow users to share items to the public with links" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ",
+"Allow resharing" => "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+"Allow users to share with anyone" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់",
+"Security" => "សុវត្ថិភាព",
+"Enforce HTTPS" => "បង្ខំ HTTPS",
+"Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+"Log" => "Log",
+"Log level" => "កម្រិត Log",
+"More" => "ច្រើន​ទៀត",
+"Less" => "តិច",
+"Version" => "កំណែ",
+"Add your App" => "បន្ថែម​កម្មវិធី​របស់​អ្នក",
+"More Apps" => "កម្មវិធី​ច្រើន​ទៀត",
+"Select an App" => "ជ្រើស​កម្មវិធី​មួយ",
+"Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+"Online Documentation" => "ឯកសារ Online",
+"Forum" => "វេទិកាពិភាក្សា",
+"Bugtracker" => "Bugtracker",
+"Password" => "ពាក្យសម្ងាត់",
+"Current password" => "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
+"Change password" => "ប្តូរ​ពាក្យសម្ងាត់",
+"Email" => "អ៊ីមែល",
+"Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
+"Cancel" => "លើកលែង",
+"Language" => "ភាសា",
+"Help translate" => "ជួយ​បក​ប្រែ",
+"WebDAV" => "WebDAV",
+"Login Name" => "ចូល",
+"Other" => "ផ្សេងៗ",
+"Username" => "ឈ្មោះ​អ្នកប្រើ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 83c92bba0f1..a4506975e89 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "이메일 발송됨",
+"Encryption" => "암호화",
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
 "Authentication error" => "인증 오류",
 "Your full name has been changed." => "전체 이름이 변경되었습니다.",
@@ -22,6 +24,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
 "Unable to change password" => "암호를 변경할 수 없음",
+"Sending..." => "보내는 중...",
+"User Documentation" => "사용자 문서",
+"Admin Documentation" => "운영자 문서",
 "Update to {appversion}" => "버전 {appversion}(으)로 업데이트",
 "Disable" => "사용 안함",
 "Enable" => "사용함",
@@ -34,8 +39,12 @@ $TRANSLATIONS = array(
 "Update" => "업데이트",
 "Updated" => "업데이트됨",
 "Select a profile picture" => "프로필 사진 선택",
+"Very weak password" => "매우 약한 암호",
+"Weak password" => "약한 암호",
+"So-so password" => "그저 그런 암호",
+"Good password" => "좋은 암호",
+"Strong password" => "강력한 암호",
 "Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Saving..." => "저장 중...",
 "deleted" => "삭제됨",
 "undo" => "실행 취소",
 "Unable to remove user" => "사용자를 삭제할 수 없음",
@@ -53,6 +62,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "경고, 오류, 치명적 문제",
 "Errors and fatal issues" => "오류, 치명적 문제",
 "Fatal issues only" => "치명적 문제만",
+"None" => "없음",
+"Login" => "로그인",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "보안 경고",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s에 HTTP로 접근하고 있습니다. 서버에서 HTTPS를 사용하도록 설정하는 것을 추천합니다.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
@@ -90,6 +103,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS 강제 사용",
 "Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+"Email Server" => "전자우편 서버",
+"From address" => "보낸 이 주소",
+"Authentication required" => "인증 필요함",
+"Server address" => "서버 주소",
+"Port" => "포트",
+"Credentials" => "자격 정보",
+"SMTP Username" => "SMTP 사용자명",
+"SMTP Password" => "SMTP 암호",
+"Test email settings" => "시험용 전자우편 설정",
+"Send email" => "전자우편 보내기",
 "Log" => "로그",
 "Log level" => "로그 단계",
 "More" => "더 중요함",
@@ -99,9 +122,9 @@ $TRANSLATIONS = array(
 "Add your App" => "내 앱 추가",
 "More Apps" => "더 많은 앱",
 "Select an App" => "앱 선택",
+"Documentation:" => "문서",
 "See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>",
-"User Documentation" => "사용자 문서",
 "Administrator Documentation" => "관리자 문서",
 "Online Documentation" => "온라인 문서",
 "Forum" => "포럼",
@@ -119,20 +142,18 @@ $TRANSLATIONS = array(
 "Full Name" => "전체 이름",
 "Email" => "이메일",
 "Your email address" => "이메일 주소",
-"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오",
 "Profile picture" => "프로필 사진",
 "Upload new" => "새로 업로드",
 "Select new from Files" => "파일에서 선택",
 "Remove image" => "그림 삭제",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다.",
 "Your avatar is provided by your original account." => "원본 계정의 아바타를 사용합니다.",
-"Abort" => "중지",
+"Cancel" => "취소",
 "Choose as profile image" => "프로필 이미지로 사용",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-"Encryption" => "암호화",
 "The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
 "Log-in password" => "로그인 암호",
 "Decrypt all Files" => "모든 파일 복호화",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index d0a8abea713..b5c40ae0a1f 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,14 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "نهێنیکردن",
 "Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
 "Error" => "هه‌ڵه",
 "Update" => "نوێکردنه‌وه",
-"Saving..." => "پاشکه‌وتده‌کات...",
+"None" => "هیچ",
+"Login" => "چوونەژوورەوە",
+"Server address" => "ناونیشانی ڕاژه",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
-"Encryption" => "نهێنیکردن",
+"Cancel" => "لابردن",
+"Login Name" => "چوونەژوورەوە",
 "Username" => "ناوی به‌کارهێنه‌ر"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index ac8c1b6a16f..f564527c5df 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email geschéckt",
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Group already exists" => "Group existeiert schon.",
@@ -16,13 +17,13 @@ $TRANSLATIONS = array(
 "Enable" => "Aschalten",
 "Error" => "Fehler",
 "Update" => "Update",
-"Saving..." => "Speicheren...",
 "deleted" => "geläscht",
 "undo" => "réckgängeg man",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppen Admin",
 "Delete" => "Läschen",
 "__language_name__" => "__language_name__",
+"Login" => "Login",
 "Security Warning" => "Sécherheets Warnung",
 "Cron" => "Cron",
 "Enable Share API" => "Share API aschalten",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Resharing erlaben",
 "Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
 "Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
+"Server address" => "Server Adress",
 "Log" => "Log",
 "More" => "Méi",
 "Less" => "Manner",
@@ -44,9 +46,10 @@ $TRANSLATIONS = array(
 "Change password" => "Passwuert änneren",
 "Email" => "Email",
 "Your email address" => "Deng Email Adress",
-"Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
+"Cancel" => "Ofbriechen",
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
+"Login Name" => "Login",
 "Create" => "Erstellen",
 "Other" => "Aner",
 "Username" => "Benotzernumm"
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index f2cb6a30265..d86d5086f0d 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Laiškas išsiųstas",
+"Encryption" => "Šifravimas",
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
 "Authentication error" => "Autentikacijos klaida",
 "Group already exists" => "Grupė jau egzistuoja",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
 "Unable to change password" => "Nepavyksta pakeisti slaptažodžio",
+"User Documentation" => "Naudotojo dokumentacija",
 "Update to {appversion}" => "Atnaujinti iki {appversion}",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "Atnaujinta",
 "Select a profile picture" => "Pažymėkite profilio paveikslėlį",
 "Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
-"Saving..." => "Saugoma...",
 "deleted" => "ištrinta",
 "undo" => "anuliuoti",
 "Unable to remove user" => "Nepavyko ištrinti vartotojo",
@@ -46,6 +48,9 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Slaptažodis turi būti tinkamas",
 "Warning: Home directory for user \"{user}\" already exists" => "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
 "__language_name__" => "Kalba",
+"Fatal issues only" => "Tik kritinės problemos",
+"None" => "Nieko",
+"Login" => "Prisijungti",
 "Security Warning" => "Saugumo pranešimas",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
 "Setup Warning" => "Nustatyti perspėjimą",
@@ -77,6 +82,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Reikalauti HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
+"Server address" => "Serverio adresas",
+"Port" => "Prievadas",
 "Log" => "Žurnalas",
 "Log level" => "Žurnalo išsamumas",
 "More" => "Daugiau",
@@ -88,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Pasirinkite programą",
 "See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
-"User Documentation" => "Naudotojo dokumentacija",
 "Administrator Documentation" => "Administratoriaus dokumentacija",
 "Online Documentation" => "Dokumentacija tinkle",
 "Forum" => "Forumas",
@@ -103,21 +109,20 @@ $TRANSLATIONS = array(
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
 "Change password" => "Pakeisti slaptažodį",
+"Full Name" => "Pilnas vardas",
 "Email" => "El. Paštas",
 "Your email address" => "Jūsų el. pašto adresas",
-"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Profile picture" => "Profilio paveikslėlis",
 "Upload new" => "Įkelti naują",
 "Select new from Files" => "Pasirinkti naują iš failų",
 "Remove image" => "Pašalinti paveikslėlį",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
-"Abort" => "Atšaukti",
+"Cancel" => "Atšaukti",
 "Choose as profile image" => "Pasirinkite profilio paveiksliuką",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-"Encryption" => "Šifravimas",
 "Log-in password" => "Prisijungimo slaptažodis",
 "Decrypt all Files" => "Iššifruoti visus failus",
 "Login Name" => "Vartotojo vardas",
@@ -129,6 +134,7 @@ $TRANSLATIONS = array(
 "Other" => "Kita",
 "Username" => "Prisijungimo vardas",
 "Storage" => "Saugojimas",
+"change full name" => "keisti pilną vardą",
 "set new password" => "nustatyti naują slaptažodį",
 "Default" => "Numatytasis"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index de5d6460d6f..7d5f964a96e 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Vēstule nosūtīta",
+"Encryption" => "Šifrēšana",
 "Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Authentication error" => "Autentifikācijas kļūda",
 "Group already exists" => "Grupa jau eksistē",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
 "Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
 "Couldn't update app." => "Nevarēja atjaunināt lietotni.",
+"User Documentation" => "Lietotāja dokumentācija",
 "Update to {appversion}" => "Atjaunināt uz {appversion}",
 "Disable" => "Deaktivēt",
 "Enable" => "Aktivēt",
@@ -24,7 +27,6 @@ $TRANSLATIONS = array(
 "Update" => "Atjaunināt",
 "Updated" => "Atjaunināta",
 "Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-"Saving..." => "Saglabā...",
 "deleted" => "izdzests",
 "undo" => "atsaukt",
 "Unable to remove user" => "Nevar izņemt lietotāju",
@@ -36,6 +38,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Kļūda, veidojot lietotāju",
 "A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
+"None" => "Nav",
+"Login" => "Ierakstīties",
 "Security Warning" => "Brīdinājums par drošību",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
 "Setup Warning" => "Iestatīšanas brīdinājums",
@@ -63,6 +67,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Uzspiest HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
+"Server address" => "Servera adrese",
+"Port" => "Ports",
+"Credentials" => "Akreditācijas dati",
 "Log" => "Žurnāls",
 "Log level" => "Žurnāla līmenis",
 "More" => "Vairāk",
@@ -74,7 +81,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Izvēlies lietotni",
 "See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
-"User Documentation" => "Lietotāja dokumentācija",
 "Administrator Documentation" => "Administratora dokumentācija",
 "Online Documentation" => "Tiešsaistes dokumentācija",
 "Forum" => "Forums",
@@ -91,11 +97,10 @@ $TRANSLATIONS = array(
 "Change password" => "Mainīt paroli",
 "Email" => "E-pasts",
 "Your email address" => "Jūsu e-pasta adrese",
-"Fill in an email address to enable password recovery" => "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība",
+"Cancel" => "Atcelt",
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
-"Encryption" => "Šifrēšana",
 "Log-in password" => "Pieslēgšanās parole",
 "Decrypt all Files" => "Atšifrēt visus failus",
 "Login Name" => "Ierakstīšanās vārds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index f9b4bbc9427..00f2c7c2ad9 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Е-порака пратена",
+"Encryption" => "Енкрипција",
 "Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
 "Authentication error" => "Грешка во автентикација",
 "Group already exists" => "Групата веќе постои",
@@ -17,6 +19,7 @@ $TRANSLATIONS = array(
 "Wrong password" => "Погрешна лозинка",
 "No user supplied" => "Нема корисничко име",
 "Unable to change password" => "Вашата лозинка неможе да се смени",
+"User Documentation" => "Корисничка документација",
 "Update to {appversion}" => "Надгради на {appversion}",
 "Disable" => "Оневозможи",
 "Enable" => "Овозможи",
@@ -29,7 +32,6 @@ $TRANSLATIONS = array(
 "Update" => "Ажурирај",
 "Updated" => "Надграден",
 "Select a profile picture" => "Одбери фотографија за профилот",
-"Saving..." => "Снимам...",
 "deleted" => "избришан",
 "undo" => "врати",
 "Unable to remove user" => "Не можам да го одстранам корисникот",
@@ -41,6 +43,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при креирање на корисникот",
 "A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
 "__language_name__" => "__language_name__",
+"None" => "Ништо",
+"Login" => "Најава",
 "Security Warning" => "Безбедносно предупредување",
 "Setup Warning" => "Предупредување при подесување",
 "Locale not working" => "Локалето не функционира",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Овозможи корисник да испраќа известување по електронска пошта за споделени датотеки",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
+"Server address" => "Адреса на сервер",
+"Port" => "Порта",
 "Log" => "Записник",
 "Log level" => "Ниво на логирање",
 "More" => "Повеќе",
@@ -67,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Избери аппликација",
 "See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
-"User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Документација на интернет",
 "Forum" => "Форум",
@@ -82,18 +87,16 @@ $TRANSLATIONS = array(
 "Change password" => "Смени лозинка",
 "Email" => "Е-пошта",
 "Your email address" => "Вашата адреса за е-пошта",
-"Fill in an email address to enable password recovery" => "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката",
 "Profile picture" => "Фотографија за профил",
 "Upload new" => "Префрли нова",
 "Select new from Files" => "Одбери нова од датотеките",
 "Remove image" => "Отстрани ја фотографијата",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете.",
-"Abort" => "Прекини",
+"Cancel" => "Откажи",
 "Choose as profile image" => "Одбери фотографија за профилот",
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
-"Encryption" => "Енкрипција",
 "Log-in password" => "Лозинка за најавување",
 "Decrypt all Files" => "Дешифрирај ги сите датотеки",
 "Login Name" => "Име за најава",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 0ba601dd729..1c5d1189462 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -9,12 +9,13 @@ $TRANSLATIONS = array(
 "Enable" => "Aktif",
 "Error" => "Ralat",
 "Update" => "Kemaskini",
-"Saving..." => "Simpan...",
 "deleted" => "dihapus",
 "Groups" => "Kumpulan",
 "Delete" => "Padam",
 "__language_name__" => "_nama_bahasa_",
+"Login" => "Log masuk",
 "Security Warning" => "Amaran keselamatan",
+"Server address" => "Alamat pelayan",
 "Log" => "Log",
 "Log level" => "Tahap Log",
 "More" => "Lanjutan",
@@ -28,10 +29,11 @@ $TRANSLATIONS = array(
 "Change password" => "Ubah kata laluan",
 "Email" => "Email",
 "Your email address" => "Alamat emel anda",
-"Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Profile picture" => "Gambar profil",
+"Cancel" => "Batal",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
+"Login Name" => "Log masuk",
 "Create" => "Buat",
 "Other" => "Lain",
 "Username" => "Nama pengguna"
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index f49a9c18023..070e4dd73bc 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Password" => "စကားဝှက်",
 "New password" => "စကားဝှက်အသစ်",
+"Cancel" => "ပယ်ဖျက်မည်",
 "Username" => "သုံးစွဲသူအမည်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index cb3e7c670c5..40cca41638c 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post sendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Authentication error" => "Autentiseringsfeil",
+"Your full name has been changed." => "Ditt fulle navn er blitt endret.",
+"Unable to change full name" => "Klarte ikke å endre fullt navn",
 "Group already exists" => "Gruppen finnes allerede",
 "Unable to add group" => "Kan ikke legge til gruppe",
 "Email saved" => "Epost lagret",
@@ -14,16 +18,26 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
 "Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
 "Couldn't update app." => "Kunne ikke oppdatere app.",
+"Wrong password" => "Feil passord",
+"No user supplied" => "Ingen bruker angitt",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
+"Wrong admin recovery password. Please check the password and try again." => "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
+"Unable to change password" => "Kunne ikke endre passord",
+"User Documentation" => "Brukerdokumentasjon",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Aktiver",
 "Please wait...." => "Vennligst vent...",
+"Error while disabling app" => "Deaktivering av app feilet",
+"Error while enabling app" => "Aktivering av app feilet",
 "Updating...." => "Oppdaterer...",
 "Error while updating app" => "Feil ved oppdatering av app",
 "Error" => "Feil",
 "Update" => "Oppdater",
 "Updated" => "Oppdatert",
-"Saving..." => "Lagrer...",
+"Select a profile picture" => "Velg et profilbilde",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
 "deleted" => "slettet",
 "undo" => "angre",
 "Unable to remove user" => "Kunne ikke slette bruker",
@@ -34,27 +48,54 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Oppgi et gyldig brukernavn",
 "Error creating user" => "Feil ved oppretting av bruker",
 "A valid password must be provided" => "Oppgi et gyldig passord",
+"Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
 "__language_name__" => "__language_name__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Alt (fatale problemer, feil, advarsler, info, debug)",
+"Info, warnings, errors and fatal issues" => "Info, advarsler, feil og fatale problemer",
+"Warnings, errors and fatal issues" => "Advarsler, feil og fatale problemer",
+"Errors and fatal issues" => "Feil og fatale problemer",
+"Fatal issues only" => "Kun fatale problemer",
+"None" => "Ingen",
+"Login" => "Logg inn",
 "Security Warning" => "Sikkerhetsadvarsel",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe.",
 "Setup Warning" => "Installasjonsadvarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>.",
 "Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Your PHP version is outdated" => "Din PHP-versjon er udatert",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
 "Locale not working" => "Språk virker ikke",
+"System locale can not be set to a one which supports UTF-8." => "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
 "Internet connection not working" => "Ingen internettilkopling",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, slik som montering av ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt.",
 "Sharing" => "Deling",
 "Enable Share API" => "Aktiver API for Deling",
 "Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
 "Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
+"Allow public uploads" => "Tillat offentlig opplasting",
+"Allow users to enable others to upload into their publicly shared folders" => "Tillat at brukere lar andre laste opp til deres offentlig delte mapper",
 "Allow resharing" => "TIllat videredeling",
 "Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
 "Allow users to share with anyone" => "Tillat brukere å dele med alle",
 "Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Allow mail notification" => "Tillat påminnelser i e-post",
+"Allow user to send mail notification for shared files" => "Tillat at brukere sender epost-påminnelser for delte filer",
 "Security" => "Sikkerhet",
 "Enforce HTTPS" => "Tving HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
+"Server address" => "Server-adresse",
+"Port" => "Port",
 "Log" => "Logg",
 "Log level" => "Loggnivå",
 "More" => "Mer",
@@ -66,7 +107,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
-"User Documentation" => "Brukerdokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Online dokumentasjon",
 "Forum" => "Forum",
@@ -81,21 +121,35 @@ $TRANSLATIONS = array(
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
 "Change password" => "Endre passord",
+"Full Name" => "Fullt navn",
 "Email" => "Epost",
 "Your email address" => "Din e-postadresse",
-"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
 "Profile picture" => "Profilbilde",
+"Upload new" => "Last opp nytt",
+"Select new from Files" => "Velg nytt fra Filer",
+"Remove image" => "Fjern bilde",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Helst kvadratisk men du kan beskjære det.",
+"Your avatar is provided by your original account." => "Avataren din kommer fra din opprinnelige konto.",
+"Cancel" => "Avbryt",
+"Choose as profile image" => "Velg som profilbilde",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
-"Encryption" => "Kryptering",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filer",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
+"Admin Recovery Password" => "Administrativt gjenopprettingspassord",
+"Enter the recovery password in order to recover the users files during password change" => "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
 "Default Storage" => "Standard lager",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
 "Unlimited" => "Ubegrenset",
 "Other" => "Annet",
 "Username" => "Brukernavn",
 "Storage" => "Lager",
+"change full name" => "endre fullt navn",
 "set new password" => "sett nytt passord",
 "Default" => "Standard"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 9931063ac9a..826a6a77e00 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ongeldige waarde voor %s",
+"Saved" => "Bewaard",
+"test email settings" => "test e-mailinstellingen",
+"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
+"Email sent" => "E-mail verzonden",
+"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres instellen voordat u testberichten kunt versturen.",
+"Send mode" => "Verstuurmodus",
+"Encryption" => "Versleuteling",
+"Authentication method" => "Authenticatiemethode",
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
 "Your full name has been changed." => "Uw volledige naam is gewijzigd.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
 "Unable to change password" => "Kan wachtwoord niet wijzigen",
+"Sending..." => "Versturen...",
+"User Documentation" => "Gebruikersdocumentatie",
+"Admin Documentation" => "Beheerdocumentatie",
 "Update to {appversion}" => "Bijwerken naar {appversion}",
 "Disable" => "Uitschakelen",
 "Enable" => "Activeer",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Bijwerken",
 "Updated" => "Bijgewerkt",
 "Select a profile picture" => "Kies een profielafbeelding",
+"Very weak password" => "Zeer zwak wachtwoord",
+"Weak password" => "Zwak wachtwoord",
+"So-so password" => "Matig wachtwoord",
+"Good password" => "Goed wachtwoord",
+"Strong password" => "Sterk wachtwoord",
 "Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-"Saving..." => "Opslaan",
 "deleted" => "verwijderd",
 "undo" => "ongedaan maken",
 "Unable to remove user" => "Kon gebruiker niet verwijderen",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Waarschuwingen, fouten en fatale problemen",
 "Errors and fatal issues" => "Fouten en fatale problemen",
 "Fatal issues only" => "Alleen fatale problemen",
+"None" => "Geen",
+"Login" => "Login",
+"Plain" => "Gewoon",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Beveiligingswaarschuwing",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat allen HTTPS kan worden gebruikt.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Afdwingen HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
+"Email Server" => "E-mailserver",
+"This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
+"From address" => "Afzenderadres",
+"Authentication required" => "Authenticatie vereist",
+"Server address" => "Server adres",
+"Port" => "Poort",
+"Credentials" => "Inloggegevens",
+"SMTP Username" => "SMTP gebruikersnaam",
+"SMTP Password" => "SMTP wachtwoord",
+"Test email settings" => "Test e-mailinstellingen",
+"Send email" => "Versturen e-mail",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Meer",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "App toevoegen",
 "More Apps" => "Meer apps",
 "Select an App" => "Selecteer een app",
+"Documentation:" => "Documentatie:",
 "See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
+"See application website" => "Zie website van de applicatie",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
-"User Documentation" => "Gebruikersdocumentatie",
 "Administrator Documentation" => "Beheerdersdocumentatie",
 "Online Documentation" => "Online documentatie",
 "Forum" => "Forum",
@@ -119,25 +154,24 @@ $TRANSLATIONS = array(
 "Full Name" => "Volledige naam",
 "Email" => "E-mailadres",
 "Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
+"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailbericht in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
 "Profile picture" => "Profielafbeelding",
 "Upload new" => "Upload een nieuwe",
 "Select new from Files" => "Selecteer een nieuwe vanuit bestanden",
 "Remove image" => "Verwijder afbeelding",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden.",
 "Your avatar is provided by your original account." => "Uw avatar is verstrekt door uw originele account.",
-"Abort" => "Afbreken",
+"Cancel" => "Annuleer",
 "Choose as profile image" => "Kies als profielafbeelding",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-"Encryption" => "Versleuteling",
 "The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
 "Log-in password" => "Inlog-wachtwoord",
 "Decrypt all Files" => "Decodeer alle bestanden",
 "Login Name" => "Inlognaam",
-"Create" => "Creëer",
+"Create" => "Aanmaken",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
 "Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
 "Default Storage" => "Standaard Opslaglimiet",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 5fd2f57b5a8..7eacdbedfb0 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post sendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
 "Authentication error" => "Autentiseringsfeil",
 "Group already exists" => "Gruppa finst allereie",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
 "Unable to change password" => "Klarte ikkje å endra passordet",
+"User Documentation" => "Brukardokumentasjon",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "Oppdatert",
 "Select a profile picture" => "Vel eit profilbilete",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
-"Saving..." => "Lagrar …",
 "deleted" => "sletta",
 "undo" => "angra",
 "Unable to remove user" => "Klarte ikkje fjerna brukaren",
@@ -45,6 +47,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Feil ved oppretting av brukar",
 "A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
+"Login" => "Logg inn",
 "Security Warning" => "Tryggleiksåtvaring",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
 "Setup Warning" => "Oppsettsåtvaring",
@@ -72,6 +75,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Krev HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
+"Server address" => "Tenaradresse",
 "Log" => "Logg",
 "Log level" => "Log nivå",
 "More" => "Meir",
@@ -83,7 +87,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vel eit program",
 "See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
-"User Documentation" => "Brukardokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Dokumentasjon på nett",
 "Forum" => "Forum",
@@ -100,18 +103,16 @@ $TRANSLATIONS = array(
 "Change password" => "Endra passord",
 "Email" => "E-post",
 "Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
 "Profile picture" => "Profilbilete",
 "Upload new" => "Last opp ny",
 "Select new from Files" => "Vel ny frå Filer",
 "Remove image" => "Fjern bilete",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
-"Abort" => "Avbryt",
+"Cancel" => "Avbryt",
 "Choose as profile image" => "Vel som profilbilete",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
-"Encryption" => "Kryptering",
 "Log-in password" => "Innloggingspassord",
 "Decrypt all Files" => "Dekrypter alle filene",
 "Login Name" => "Innloggingsnamn",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 7606ac5992f..f6eab80bcb5 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -15,13 +15,13 @@ $TRANSLATIONS = array(
 "Disable" => "Desactiva",
 "Enable" => "Activa",
 "Error" => "Error",
-"Saving..." => "Enregistra...",
 "deleted" => "escafat",
 "undo" => "defar",
 "Groups" => "Grops",
 "Group Admin" => "Grop Admin",
 "Delete" => "Escafa",
 "__language_name__" => "__language_name__",
+"Login" => "Login",
 "Security Warning" => "Avertiment de securitat",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
@@ -41,9 +41,10 @@ $TRANSLATIONS = array(
 "Change password" => "Cambia lo senhal",
 "Email" => "Corrièl",
 "Your email address" => "Ton adreiça de corrièl",
-"Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
+"Cancel" => "Annula",
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
+"Login Name" => "Login",
 "Create" => "Crea",
 "Other" => "Autres",
 "Username" => "Non d'usancièr"
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
index 795a80f7d42..aa83e11266d 100644
--- a/settings/l10n/pa.php
+++ b/settings/l10n/pa.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
 "Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 "Error" => "ਗਲਤੀ",
 "Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
-"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
 "deleted" => "ਹਟਾਈ",
 "undo" => "ਵਾਪਸ",
 "Groups" => "ਗਰੁੱਪ",
@@ -15,10 +14,14 @@ $TRANSLATIONS = array(
 "Delete" => "ਹਟਾਓ",
 "add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ",
 "__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__",
+"Login" => "ਲਾਗਇਨ",
 "Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
 "Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+"Server address" => "ਸਰਵਰ ਐਡਰੈਸ",
 "Password" => "ਪਾਸਵਰ",
 "Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ",
+"Cancel" => "ਰੱਦ ਕਰੋ",
+"Login Name" => "ਲਾਗਇਨ",
 "Username" => "ਯੂਜ਼ਰ-ਨਾਂ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index bd6d3dbf1cd..33b22a147dc 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Nieprawidłowa wartość %s",
+"Saved" => "Zapisano",
+"test email settings" => "przetestuj ustawienia email",
+"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Pojawił się problem podczas wysyłania e-mail. Proszę sprawdzić ponownie ustawienia",
+"Email sent" => "E-mail wysłany",
+"You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+"Send mode" => "Tryb wysyłki",
+"Encryption" => "Szyfrowanie",
+"Authentication method" => "Metoda autentykacji",
 "Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
 "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
 "Unable to change password" => "Nie można zmienić hasła",
+"Sending..." => "Wysyłam...",
+"User Documentation" => "Dokumentacja użytkownika",
+"Admin Documentation" => "Dokumentacja Administratora",
 "Update to {appversion}" => "Aktualizacja do {appversion}",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aktualizuj",
 "Updated" => "Zaktualizowano",
 "Select a profile picture" => "Wybierz zdjęcie profilu",
+"Very weak password" => "Bardzo słabe hasło",
+"Weak password" => "Słabe hasło",
+"So-so password" => "Mało skomplikowane hasło",
+"Good password" => "Dobre hasło",
+"Strong password" => "Mocne hasło",
 "Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-"Saving..." => "Zapisywanie...",
 "deleted" => "usunięto",
 "undo" => "cofnij",
 "Unable to remove user" => "Nie można usunąć użytkownika",
@@ -53,7 +70,14 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Ostrzeżenia, błędy i poważne problemy",
 "Errors and fatal issues" => "Błędy i poważne problemy",
 "Fatal issues only" => "Tylko poważne problemy",
+"None" => "Nic",
+"Login" => "Login",
+"Plain" => "Czysty tekst",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "Setup Warning" => "Ostrzeżenia konfiguracji",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
@@ -64,6 +88,8 @@ $TRANSLATIONS = array(
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
 "Locale not working" => "Lokalizacja nie działa",
 "System locale can not be set to a one which supports UTF-8." => "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
 "Internet connection not working" => "Połączenie internetowe nie działa",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
 "Cron" => "Cron",
@@ -87,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Wymuś HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+"Email Server" => "Serwer pocztowy",
+"This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
+"From address" => "Z adresu",
+"Authentication required" => "Wymagana autoryzacja",
+"Server address" => "Adres Serwera",
+"Port" => "Port",
+"Credentials" => "Poświadczenia",
+"SMTP Username" => "Użytkownik SMTP",
+"SMTP Password" => "Hasło SMTP",
+"Test email settings" => "Ustawienia testowej wiadomości",
+"Send email" => "Wyślij email",
 "Log" => "Logi",
 "Log level" => "Poziom logów",
 "More" => "Więcej",
@@ -96,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Dodaj swoją aplikację",
 "More Apps" => "Więcej aplikacji",
 "Select an App" => "Zaznacz aplikację",
+"Documentation:" => "Dokumentacja:",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
+"See application website" => "Zobacz na stronie aplikacji",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"User Documentation" => "Dokumentacja użytkownika",
 "Administrator Documentation" => "Dokumentacja administratora",
 "Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
@@ -116,19 +154,20 @@ $TRANSLATIONS = array(
 "Full Name" => "Pełna nazwa",
 "Email" => "Email",
 "Your email address" => "Twój adres e-mail",
-"Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
+"Fill in an email address to enable password recovery and receive notifications" => "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
 "Profile picture" => "Zdjęcie profilu",
 "Upload new" => "Wczytaj nowe",
 "Select new from Files" => "Wybierz nowe z plików",
 "Remove image" => "Usuń zdjęcie",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć.",
-"Abort" => "Anuluj",
+"Your avatar is provided by your original account." => "Twój awatar jest ustawiony jako domyślny.",
+"Cancel" => "Anuluj",
 "Choose as profile image" => "Wybierz zdjęcie profilu",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-"Encryption" => "Szyfrowanie",
+"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
 "Log-in password" => "Hasło logowania",
 "Decrypt all Files" => "Odszyfruj wszystkie pliki",
 "Login Name" => "Login",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 7577ea1d5f7..4a7554499d5 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valor inválido fornecido para %s",
+"Saved" => "Salvo",
+"test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, reveja suas configurações.",
+"Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
+"Send mode" => "Modo enviar",
+"Encryption" => "Criptografia",
+"Authentication method" => "Método de autenticação",
 "Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
 "Authentication error" => "Erro de autenticação",
 "Your full name has been changed." => "Seu nome completo foi alterado.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
 "Unable to change password" => "Impossível modificar senha",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentação de Usuário",
+"Admin Documentation" => "Documentação de Administrador",
 "Update to {appversion}" => "Atualizar para {appversion}",
 "Disable" => "Desabilitar",
 "Enable" => "Habilitar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Atualizar",
 "Updated" => "Atualizado",
 "Select a profile picture" => "Selecione uma imagem para o perfil",
+"Very weak password" => "Senha muito fraca",
+"Weak password" => "Senha fraca",
+"So-so password" => "So-so senha",
+"Good password" => "Boa senha",
+"Strong password" => "Senha forte",
 "Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-"Saving..." => "Salvando...",
 "deleted" => "excluído",
 "undo" => "desfazer",
 "Unable to remove user" => "Impossível remover usuário",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
 "Errors and fatal issues" => "Erros e problemas fatais",
 "Fatal issues only" => "Somente questões fatais",
+"None" => "Nada",
+"Login" => "Login",
+"Plain" => "Plano",
+"NT LAN Manager" => "Gerenciador NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
+"Email Server" => "Servidor de Email",
+"This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
+"From address" => "Do Endereço",
+"Authentication required" => "Autenticação é requerida",
+"Server address" => "Endereço do servidor",
+"Port" => "Porta",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome do Usuário SMTP",
+"SMTP Password" => "Senha SMTP",
+"Test email settings" => "Configurações de e-mail de teste",
+"Send email" => "Enviar email",
 "Log" => "Registro",
 "Log level" => "Nível de registro",
 "More" => "Mais",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Adicione seu Aplicativo",
 "More Apps" => "Mais Apps",
 "Select an App" => "Selecione um Aplicativo",
+"Documentation:" => "Documentação:",
 "See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
+"See application website" => "Consulte o site aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"User Documentation" => "Documentação de Usuário",
 "Administrator Documentation" => "Documentação de Administrador",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome Completo",
 "Email" => "E-mail",
 "Your email address" => "Seu endereço de e-mail",
-"Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
+"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um e-mail para permitir a recuperação de senha e receber notificações",
 "Profile picture" => "Imagem para o perfil",
 "Upload new" => "Enviar nova foto",
 "Select new from Files" => "Selecinar uma nova dos Arquivos",
 "Remove image" => "Remover imagem",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
 "Your avatar is provided by your original account." => "Seu avatar é fornecido por sua conta original.",
-"Abort" => "Abortar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolha como imagem para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
-"Encryption" => "Criptografia",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
 "Log-in password" => "Senha de login",
 "Decrypt all Files" => "Decripti todos os Arquivos",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 89bed085972..ee8a9217f5d 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Guardado",
+"test email settings" => "testar configurações de email",
+"Email sent" => "E-mail enviado",
+"Send mode" => "Modo de envio",
+"Encryption" => "Encriptação",
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
@@ -22,6 +27,8 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
 "Unable to change password" => "Não foi possível alterar a sua password",
+"Sending..." => "A enviar...",
+"User Documentation" => "Documentação de Utilizador",
 "Update to {appversion}" => "Actualizar para a versão {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -35,7 +42,6 @@ $TRANSLATIONS = array(
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccione uma fotografia de perfil",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-"Saving..." => "A guardar...",
 "deleted" => "apagado",
 "undo" => "desfazer",
 "Unable to remove user" => "Não foi possível remover o utilizador",
@@ -53,6 +59,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
 "Errors and fatal issues" => "Erros e problemas fatais",
 "Fatal issues only" => "Apenas problemas fatais",
+"None" => "Nenhum",
+"Login" => "Login",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
@@ -90,6 +100,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
+"Email Server" => "Servidor de email",
+"This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
+"From address" => "Do endereço",
+"Authentication required" => "Autenticação necessária",
+"Server address" => "Endereço do servidor",
+"Port" => "Porto",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome de utilizador SMTP",
+"SMTP Password" => "Password SMTP",
+"Test email settings" => "Testar configurações de email",
+"Send email" => "Enviar email",
 "Log" => "Registo",
 "Log level" => "Nível do registo",
 "More" => "Mais",
@@ -99,9 +120,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Adicione a sua aplicação",
 "More Apps" => "Mais Aplicações",
 "Select an App" => "Selecione uma aplicação",
+"Documentation:" => "Documentação:",
 "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
+"See application website" => "Ver site da aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"User Documentation" => "Documentação de Utilizador",
 "Administrator Documentation" => "Documentação de administrador.",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -119,20 +141,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Email",
 "Your email address" => "O seu endereço de email",
-"Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
 "Profile picture" => "Foto do perfil",
 "Upload new" => "Carregar novo",
 "Select new from Files" => "Seleccionar novo a partir dos ficheiros",
 "Remove image" => "Remover imagem",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
 "Your avatar is provided by your original account." => "O seu avatar é fornecido pela sua conta original.",
-"Abort" => "Abortar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolha uma fotografia de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-"Encryption" => "Encriptação",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
 "Log-in password" => "Password de entrada",
 "Decrypt all Files" => "Desencriptar todos os ficheiros",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 14331854305..6754ae2557f 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Salvat",
+"Email sent" => "Mesajul a fost expediat",
+"Encryption" => "Încriptare",
 "Unable to load list from App Store" => "Imposibil de actualizat lista din  App Store.",
 "Authentication error" => "Eroare la autentificare",
 "Group already exists" => "Grupul există deja",
@@ -16,6 +19,7 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
 "Wrong password" => "Parolă greșită",
 "Unable to change password" => "Imposibil de schimbat parola",
+"User Documentation" => "Documentație utilizator",
 "Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}",
 "Disable" => "Dezactivați",
 "Enable" => "Activare",
@@ -25,7 +29,6 @@ $TRANSLATIONS = array(
 "Error" => "Eroare",
 "Update" => "Actualizare",
 "Updated" => "Actualizat",
-"Saving..." => "Se salvează...",
 "deleted" => "șters",
 "undo" => "Anulează ultima acțiune",
 "Unable to remove user" => "Imposibil de eliminat utilizatorul",
@@ -37,6 +40,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Eroare la crearea utilizatorului",
 "A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
 "__language_name__" => "_language_name_",
+"None" => "Niciuna",
+"Login" => "Autentificare",
 "Security Warning" => "Avertisment de securitate",
 "Setup Warning" => "Atenţie la implementare",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
@@ -57,6 +62,8 @@ $TRANSLATIONS = array(
 "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
 "Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
 "Security" => "Securitate",
+"Server address" => "Adresa server-ului",
+"Port" => "Portul",
 "Log" => "Jurnal de activitate",
 "Log level" => "Nivel jurnal",
 "More" => "Mai mult",
@@ -68,7 +75,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
-"User Documentation" => "Documentație utilizator",
 "Administrator Documentation" => "Documentație administrator",
 "Online Documentation" => "Documentație online",
 "Forum" => "Forum",
@@ -84,14 +90,14 @@ $TRANSLATIONS = array(
 "Change password" => "Schimbă parola",
 "Email" => "Email",
 "Your email address" => "Adresa ta de email",
-"Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
 "Profile picture" => "Imagine de profil",
 "Remove image" => "Înlătură imagine",
+"Cancel" => "Anulare",
 "Choose as profile image" => "Alege drept imagine de profil",
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
-"Encryption" => "Încriptare",
+"Login Name" => "Autentificare",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 8a9ae156f1a..49f3aeeb65d 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Письмо отправлено",
+"Encryption" => "Шифрование",
 "Unable to load list from App Store" => "Не удалось загрузить список из App Store",
 "Authentication error" => "Ошибка аутентификации",
 "Your full name has been changed." => "Ваше полное имя было изменено.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
 "Unable to change password" => "Невозможно изменить пароль",
+"User Documentation" => "Пользовательская документация",
 "Update to {appversion}" => "Обновить до {версия приложения}",
 "Disable" => "Выключить",
 "Enable" => "Включить",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Обновлено",
 "Select a profile picture" => "Выберите картинку профиля",
 "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
-"Saving..." => "Сохранение...",
 "deleted" => "удален",
 "undo" => "отмена",
 "Unable to remove user" => "Невозможно удалить пользователя",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Предупреждения, ошибки и критические проблемы",
 "Errors and fatal issues" => "Ошибки и критические проблемы",
 "Fatal issues only" => "Только критические проблемы",
+"None" => "Нет новостей",
+"Login" => "Логин",
 "Security Warning" => "Предупреждение безопасности",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
@@ -90,6 +94,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Принудить к HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL.",
+"Server address" => "Адрес сервера",
+"Port" => "Порт",
+"Credentials" => "Полномочия",
 "Log" => "Журнал",
 "Log level" => "Уровень детализации журнала",
 "More" => "Больше",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Выберите приложение",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
-"User Documentation" => "Пользовательская документация",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
 "Forum" => "Форум",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Полное имя",
 "Email" => "E-mail",
 "Your email address" => "Ваш адрес электронной почты",
-"Fill in an email address to enable password recovery" => "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля",
 "Profile picture" => "Фото профиля",
 "Upload new" => "Загрузить новую",
 "Select new from Files" => "Выберите новый из файлов",
 "Remove image" => "Удалить изображение",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.",
 "Your avatar is provided by your original account." => "Будет использован аватар вашей оригинальной учетной записи.",
-"Abort" => "Отмена",
+"Cancel" => "Отменить",
 "Choose as profile image" => "Выберите изображение профиля",
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адресс для <a href=\"%s\" target=\"_blank\">доступа к вашим файлам через WebDAV</a>",
-"Encryption" => "Шифрование",
 "The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
 "Log-in password" => "Пароль входа",
 "Decrypt all Files" => "Снять шифрование со всех файлов",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 8c90d1c9952..f9d912d180d 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "ගුප්ත කේතනය",
 "Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
 "Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
@@ -15,11 +16,12 @@ $TRANSLATIONS = array(
 "Enable" => "සක්‍රිය කරන්න",
 "Error" => "දෝෂයක්",
 "Update" => "යාවත්කාල කිරීම",
-"Saving..." => "සුරැකෙමින් පවතී...",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
 "Groups" => "කණ්ඩායම්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "Delete" => "මකා දමන්න",
+"None" => "කිසිවක් නැත",
+"Login" => "ප්‍රවිශ්ටය",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Sharing" => "හුවමාරු කිරීම",
 "Allow links" => "යොමු සලසන්න",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි",
 "Allow users to share with anyone" => "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි",
 "Allow users to only share with users in their groups" => "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි",
+"Server address" => "සේවාදායකයේ ලිපිනය",
+"Port" => "තොට",
 "Log" => "ලඝුව",
 "More" => "වැඩි",
 "Less" => "අඩු",
@@ -42,10 +46,10 @@ $TRANSLATIONS = array(
 "Change password" => "මුරපදය වෙනස් කිරීම",
 "Email" => "විද්‍යුත් තැපෑල",
 "Your email address" => "ඔබගේ විද්‍යුත් තැපෑල",
-"Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
+"Cancel" => "එපා",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
-"Encryption" => "ගුප්ත කේතනය",
+"Login Name" => "ප්‍රවිශ්ටය",
 "Create" => "තනන්න",
 "Other" => "වෙනත්",
 "Username" => "පරිශීලක නම"
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
index 6bde1c438e4..ab3a1bf5835 100644
--- a/settings/l10n/sk.php
+++ b/settings/l10n/sk.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Delete" => "Odstrániť",
+"Cancel" => "Zrušiť",
 "Other" => "Ostatné"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index fc3fe540751..eaa8552f9cf 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email odoslaný",
+"Encryption" => "Šifrovanie",
 "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
 "Authentication error" => "Chyba autentifikácie",
 "Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
@@ -22,11 +24,12 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
 "Unable to change password" => "Zmena hesla sa nepodarila",
+"User Documentation" => "Príručka používateľa",
 "Update to {appversion}" => "Aktualizovať na {appversion}",
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
-"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while disabling app" => "Chyba pri zakázaní aplikácie",
 "Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Aktualizované",
 "Select a profile picture" => "Vybrať avatara",
 "Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-"Saving..." => "Ukladám...",
 "deleted" => "zmazané",
 "undo" => "vrátiť",
 "Unable to remove user" => "Nemožno odobrať používateľa",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Upozornenia, chyby a fatálne problémy",
 "Errors and fatal issues" => "Chyby a fatálne problémy",
 "Fatal issues only" => "Len fatálne problémy",
+"None" => "Žiadny",
+"Login" => "Prihlásenie",
 "Security Warning" => "Bezpečnostné upozornenie",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
@@ -62,7 +66,7 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
 "Your PHP version is outdated" => "Vaša PHP verzia je zastaraná",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto instalácia nebude fungovat správne.",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
 "Locale not working" => "Lokalizácia nefunguje",
 "System locale can not be set to a one which supports UTF-8." => "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
@@ -84,12 +88,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
 "Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
 "Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
-"Allow mail notification" => "Povoliť upozornenia emailom",
-"Allow user to send mail notification for shared files" => "Povoliť používateľom upozornenia emailom pre svoje zdieľané súbory",
+"Allow mail notification" => "Povoliť odosielať upozornenia emailom",
+"Allow user to send mail notification for shared files" => "Povoliť používateľom odosielať upozornenia emailom pre svoje zdieľané súbory",
 "Security" => "Zabezpečenie",
 "Enforce HTTPS" => "Vynútiť HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
+"Server address" => "Adresa servera",
+"Port" => "Port",
+"Credentials" => "Prihlasovanie údaje",
 "Log" => "Záznam",
 "Log level" => "Úroveň záznamu",
 "More" => "Viac",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vyberte aplikáciu",
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
-"User Documentation" => "Príručka používateľa",
 "Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
 "Forum" => "Fórum",
@@ -111,7 +117,7 @@ $TRANSLATIONS = array(
 "Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Password" => "Heslo",
-"Your password was changed" => "Heslo bolo zmenené",
+"Your password was changed" => "Vaše heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
 "Current password" => "Aktuálne heslo",
 "New password" => "Nové heslo",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Meno a priezvisko",
 "Email" => "Email",
 "Your email address" => "Vaša emailová adresa",
-"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "Profile picture" => "Avatar",
 "Upload new" => "Nahrať nový",
 "Select new from Files" => "Vyberte nový zo súborov",
 "Remove image" => "Zmazať obrázok",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Buď png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
-"Your avatar is provided by your original account." => "Váš avatar je použiý z pôvodného účtu.",
-"Abort" => "Prerušiť",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
+"Your avatar is provided by your original account." => "Váš avatar je použitý z pôvodného účtu.",
+"Cancel" => "Zrušiť",
 "Choose as profile image" => "Vybrať ako avatara",
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-"Encryption" => "Šifrovanie",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
@@ -144,7 +148,7 @@ $TRANSLATIONS = array(
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
-"Username" => "Meno používateľa",
+"Username" => "Používateľské meno",
 "Storage" => "Úložisko",
 "change full name" => "zmeniť meno a priezvisko",
 "set new password" => "nastaviť nové heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 0bd4ef50fe6..fea2d4cc3ad 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Shranjeno",
+"Email sent" => "Elektronska pošta je poslana",
+"Send mode" => "Način pošiljanja",
+"Encryption" => "Šifriranje",
+"Authentication method" => "Način overitve",
 "Unable to load list from App Store" => "Ni mogoče naložiti seznama iz programskega središča",
 "Authentication error" => "Napaka med overjanjem",
 "Your full name has been changed." => "Vaše polno ime je spremenjeno.",
@@ -22,6 +27,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
 "Unable to change password" => "Ni mogoče spremeniti gesla",
+"Sending..." => "Poteka pošiljanje ...",
+"User Documentation" => "Uporabniška dokumentacija",
+"Admin Documentation" => "Skrbniška dokumentacija",
 "Update to {appversion}" => "Posodobi na {appversion}",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
@@ -34,8 +42,12 @@ $TRANSLATIONS = array(
 "Update" => "Posodobi",
 "Updated" => "Posodobljeno",
 "Select a profile picture" => "Izbor slike profila",
+"Very weak password" => "Zelo šibko geslo",
+"Weak password" => "Šibko geslo",
+"So-so password" => "Slabo geslo",
+"Good password" => "Dobro geslo",
+"Strong password" => "Odlično geslo",
 "Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-"Saving..." => "Poteka shranjevanje ...",
 "deleted" => "izbrisano",
 "undo" => "razveljavi",
 "Unable to remove user" => "Uporabnika ni mogoče odstraniti",
@@ -53,6 +65,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Opozorila, napake in usodne dogodke",
 "Errors and fatal issues" => "Napake in usodne dogodke",
 "Fatal issues only" => "Le usodne dogodke",
+"None" => "Brez",
+"Login" => "Prijava",
+"Plain" => "Besedilno",
+"NT LAN Manager" => "Upravljalnik NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Varnostno opozorilo",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
@@ -90,6 +108,15 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
+"Email Server" => "Poštni strežnik",
+"Authentication required" => "Zahtevana je overitev",
+"Server address" => "Naslov strežnika",
+"Port" => "Vrata",
+"Credentials" => "Poverila",
+"SMTP Username" => "Uporabniško ime SMTP",
+"SMTP Password" => "Geslo SMTP",
+"Test email settings" => "Preizkus nastavitev elektronske pošte",
+"Send email" => "Pošlji elektronsko sporočilo",
 "Log" => "Dnevnik",
 "Log level" => "Raven beleženja",
 "More" => "Več",
@@ -99,9 +126,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Dodaj program",
 "More Apps" => "Več programov",
 "Select an App" => "Izbor programa",
+"Documentation:" => "Dokumentacija:",
 "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
+"See application website" => "Oglejte si spletno stran programa",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
-"User Documentation" => "Uporabniška dokumentacija",
 "Administrator Documentation" => "Skrbniška dokumentacija",
 "Online Documentation" => "Spletna dokumentacija",
 "Forum" => "Forum",
@@ -119,20 +147,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Polno ime",
 "Email" => "Elektronski naslov",
 "Your email address" => "Osebni elektronski naslov",
-"Fill in an email address to enable password recovery" => "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla",
 "Profile picture" => "Slika profila",
 "Upload new" => "Pošlji novo",
 "Select new from Files" => "Izberi novo iz menija datotek",
 "Remove image" => "Odstrani sliko",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati.",
 "Your avatar is provided by your original account." => "Podoba je podana v izvornem računu.",
-"Abort" => "Prekini",
+"Cancel" => "Prekliči",
 "Choose as profile image" => "Izberi kot sliko profila",
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
-"Encryption" => "Šifriranje",
 "The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
 "Log-in password" => "Prijavno geslo",
 "Decrypt all Files" => "Odšifriraj vse datoteke",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 4bb2576a88d..29925683c0b 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email-i u dërgua",
 "Unable to load list from App Store" => "E pamundur të shkarkohet lista nga App Store",
 "Authentication error" => "Gabim autentifikimi",
 "Group already exists" => "Grupi ekziston",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "E pamundur t'i shtohet përdoruesi grupit %s",
 "Unable to remove user from group %s" => "E pamundur të hiqet përdoruesi nga grupi %s",
 "Couldn't update app." => "E pamundur të përditësohet app.",
+"User Documentation" => "Dokumentacion përdoruesi",
 "Update to {appversion}" => "Përditësim për {appversion}",
 "Disable" => "Çaktivizo",
 "Enable" => "Aktivizo",
@@ -23,7 +25,6 @@ $TRANSLATIONS = array(
 "Error" => "Gabim",
 "Update" => "Përditësim",
 "Updated" => "I përditësuar",
-"Saving..." => "Duke ruajtur...",
 "deleted" => "fshirë",
 "undo" => "anullo veprimin",
 "Unable to remove user" => "E pamundur të fshiet përdoruesi",
@@ -57,9 +58,11 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup",
 "Security" => "Siguria",
 "Enforce HTTPS" => "Detyro HTTPS",
+"Port" => "Porta",
 "Log" => "Historik aktiviteti",
 "Log level" => "Niveli i Historikut",
 "More" => "Më tepër",
+"Less" => "M'pak",
 "Version" => "Versioni",
 "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>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Shtoni apliakcionin tuaj",
@@ -67,7 +70,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Zgjidhni një Aplikacion",
 "See application page at apps.owncloud.com" => "Shihni faqen e aplikacionit tek apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensuar nga <span class=\"author\"></span>",
-"User Documentation" => "Dokumentacion përdoruesi",
 "Administrator Documentation" => "Dokumentacion administratori",
 "Online Documentation" => "Dokumentacion online",
 "Forum" => "Forumi",
@@ -84,7 +86,7 @@ $TRANSLATIONS = array(
 "Change password" => "Ndrysho fjalëkalimin",
 "Email" => "Email",
 "Your email address" => "Adresa juaj email",
-"Fill in an email address to enable password recovery" => "Jepni një adresë email për të aktivizuar rigjetjen e fjalëkalimit",
+"Cancel" => "Anullo",
 "Language" => "Gjuha",
 "Help translate" => "Ndihmoni në përkthim",
 "WebDAV" => "WebDAV",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index b521ad7ce54..3723ef3fe5f 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Порука је послата",
+"Encryption" => "Шифровање",
 "Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
 "Authentication error" => "Грешка при провери идентитета",
 "Group already exists" => "Група већ постоји",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не могу да додам корисника у групу %s",
 "Unable to remove user from group %s" => "Не могу да уклоним корисника из групе %s",
 "Couldn't update app." => "Не могу да ажурирам апликацију.",
+"User Documentation" => "Корисничка документација",
 "Update to {appversion}" => "Ажурирај на {appversion}",
 "Disable" => "Искључи",
 "Enable" => "Омогући",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "Грешка",
 "Update" => "Ажурирај",
 "Updated" => "Ажурирано",
-"Saving..." => "Чување у току...",
 "deleted" => "обрисано",
 "undo" => "опозови",
 "Unable to remove user" => "Не могу да уклоним корисника",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при прављењу корисника",
 "A valid password must be provided" => "Морате унети исправну лозинку",
 "__language_name__" => "__language_name__",
+"None" => "Ништа",
+"Login" => "Пријави ме",
 "Security Warning" => "Сигурносно упозорење",
 "Setup Warning" => "Упозорење о подешавању",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
@@ -54,6 +58,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Дозволи корисницима да деле само са корисницима у њиховим групама",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
+"Server address" => "Адреса сервера",
+"Port" => "Порт",
 "Log" => "Бележење",
 "Log level" => "Ниво бележења",
 "More" => "Више",
@@ -65,7 +71,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Изаберите програм",
 "See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
-"User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Мрежна документација",
 "Forum" => "Форум",
@@ -82,11 +87,10 @@ $TRANSLATIONS = array(
 "Change password" => "Измени лозинку",
 "Email" => "Е-пошта",
 "Your email address" => "Ваша адреса е-поште",
-"Fill in an email address to enable password recovery" => "Ун",
+"Cancel" => "Откажи",
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "WebDAV" => "WebDAV",
-"Encryption" => "Шифровање",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index b89f710c280..2ca3f37e109 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email poslat",
 "Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Invalid request" => "Neispravan zahtev",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "New password" => "Nova lozinka",
 "Change password" => "Izmeni lozinku",
 "Email" => "E-mail",
+"Cancel" => "Otkaži",
 "Language" => "Jezik",
 "Create" => "Napravi",
 "Other" => "Drugo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 9f83a18373b..43695d8b28f 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post skickat",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Fel vid autentisering",
 "Unable to change full name" => "Kunde inte ändra hela namnet",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
 "Unable to change password" => "Kunde inte ändra lösenord",
+"User Documentation" => "Användardokumentation",
 "Update to {appversion}" => "Uppdatera till {appversion}",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
@@ -34,7 +37,6 @@ $TRANSLATIONS = array(
 "Updated" => "Uppdaterad",
 "Select a profile picture" => "Välj en profilbild",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
-"Saving..." => "Sparar...",
 "deleted" => "raderad",
 "undo" => "ångra",
 "Unable to remove user" => "Kan inte ta bort användare",
@@ -47,6 +49,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Ett giltigt lösenord måste anges",
 "Warning: Home directory for user \"{user}\" already exists" => "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
 "__language_name__" => "__language_name__",
+"None" => "Ingen",
+"Login" => "Logga in",
 "Security Warning" => "Säkerhetsvarning",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
 "Setup Warning" => "Installationsvarning",
@@ -78,6 +82,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Kräv HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
+"Server address" => "Serveradress",
+"Port" => "Port",
+"Credentials" => "Inloggningsuppgifter",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
 "More" => "Mer",
@@ -89,7 +96,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Välj en App",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
-"User Documentation" => "Användardokumentation",
 "Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
 "Forum" => "Forum",
@@ -107,19 +113,17 @@ $TRANSLATIONS = array(
 "Full Name" => "Hela namnet",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
-"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
 "Profile picture" => "Profilbild",
 "Upload new" => "Ladda upp ny",
 "Select new from Files" => "Välj ny från filer",
 "Remove image" => "Radera bild",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
-"Abort" => "Avbryt",
+"Cancel" => "Avbryt",
 "Choose as profile image" => "Välj som profilbild",
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-"Encryption" => "Kryptering",
 "Log-in password" => "Inloggningslösenord",
 "Decrypt all Files" => "Dekryptera alla filer",
 "Login Name" => "Inloggningsnamn",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index bfb6cace999..1ce8e5b41d5 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "மறைக்குறியீடு",
 "Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
 "Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Group already exists" => "குழு ஏற்கனவே உள்ளது",
@@ -16,13 +17,17 @@ $TRANSLATIONS = array(
 "Enable" => "இயலுமைப்படுத்துக",
 "Error" => "வழு",
 "Update" => "இற்றைப்படுத்தல்",
-"Saving..." => "சேமிக்கப்படுகிறது...",
 "undo" => "முன் செயல் நீக்கம் ",
 "Groups" => "குழுக்கள்",
 "Group Admin" => "குழு நிர்வாகி",
 "Delete" => "நீக்குக",
 "__language_name__" => "_மொழி_பெயர்_",
+"None" => "ஒன்றுமில்லை",
+"Login" => "புகுபதிகை",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
+"Server address" => "சேவையக முகவரி",
+"Port" => "துறை ",
+"Credentials" => "சான்று ஆவணங்கள்",
 "More" => "மேலதிக",
 "Less" => "குறைவான",
 "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>." => "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>.",
@@ -40,10 +45,10 @@ $TRANSLATIONS = array(
 "Change password" => "கடவுச்சொல்லை மாற்றுக",
 "Email" => "மின்னஞ்சல்",
 "Your email address" => "உங்களுடைய மின்னஞ்சல் முகவரி",
-"Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
+"Cancel" => "இரத்து செய்க",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
-"Encryption" => "மறைக்குறியீடு",
+"Login Name" => "புகுபதிகை",
 "Create" => "உருவாக்குக",
 "Other" => "மற்றவை",
 "Username" => "பயனாளர் பெயர்"
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 21caa79912a..5161863f13f 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -2,11 +2,13 @@
 $TRANSLATIONS = array(
 "Error" => "పొరపాటు",
 "Delete" => "తొలగించు",
+"Server address" => "సేవకి చిరునామా",
 "More" => "మరిన్ని",
 "Password" => "సంకేతపదం",
 "New password" => "కొత్త సంకేతపదం",
 "Email" => "ఈమెయిలు",
 "Your email address" => "మీ ఈమెయిలు చిరునామా",
+"Cancel" => "రద్దుచేయి",
 "Language" => "భాష",
 "Username" => "వాడుకరి పేరు"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 60e53da3231..14000c59ca1 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ส่งอีเมล์แล้ว",
+"Encryption" => "การเข้ารหัส",
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Couldn't update app." => "ไม่สามารถอัพเดทแอปฯ",
+"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Update to {appversion}" => "อัพเดทไปเป็นรุ่น {appversion}",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
@@ -23,13 +26,14 @@ $TRANSLATIONS = array(
 "Error" => "ข้อผิดพลาด",
 "Update" => "อัพเดท",
 "Updated" => "อัพเดทแล้ว",
-"Saving..." => "กำลังบันทึกข้อมูล...",
 "deleted" => "ลบแล้ว",
 "undo" => "เลิกทำ",
 "Groups" => "กลุ่ม",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "Delete" => "ลบ",
 "__language_name__" => "ภาษาไทย",
+"None" => "ไม่มี",
+"Login" => "เข้าสู่ระบบ",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
@@ -42,6 +46,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น",
 "Allow users to share with anyone" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้",
 "Allow users to only share with users in their groups" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
+"Server address" => "ที่อยู่เซิร์ฟเวอร์",
+"Port" => "พอร์ต",
+"Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "Log level" => "ระดับการเก็บบันทึก log",
 "More" => "มาก",
@@ -53,7 +60,6 @@ $TRANSLATIONS = array(
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
-"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
 "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
 "Forum" => "กระดานสนทนา",
@@ -69,12 +75,11 @@ $TRANSLATIONS = array(
 "Change password" => "เปลี่ยนรหัสผ่าน",
 "Email" => "อีเมล",
 "Your email address" => "ที่อยู่อีเมล์ของคุณ",
-"Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
 "Profile picture" => "รูปภาพโปรไฟล์",
+"Cancel" => "ยกเลิก",
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
 "WebDAV" => "WebDAV",
-"Encryption" => "การเข้ารหัส",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 211b87d79d5..e02c6701a98 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s için geçersiz değer sağlandı",
+"Saved" => "Kaydedildi",
+"test email settings" => "e-posta ayarlarını sına",
+"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin.",
+"Email sent" => "E-posta gönderildi",
+"You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
+"Send mode" => "Gönderme kipi",
+"Encryption" => "Şifreleme",
+"Authentication method" => "Kimlik doğrulama yöntemi",
 "Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Your full name has been changed." => "Tam adınız değiştirildi.",
@@ -12,7 +22,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
-"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini yönetici grubundan kaldıramaz",
+"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
 "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
 "Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor",
 "Couldn't update app." => "Uygulama güncellenemedi.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
 "Unable to change password" => "Parola değiştirilemiyor",
+"Sending..." => "Gönderiliyor...",
+"User Documentation" => "Kullanıcı Belgelendirmesi",
+"Admin Documentation" => "Yönetici Belgelendirmesi",
 "Update to {appversion}" => "{appversion} Güncelle",
 "Disable" => "Devre dışı bırak",
 "Enable" => "Etkinleştir",
@@ -34,13 +47,17 @@ $TRANSLATIONS = array(
 "Update" => "Güncelleme",
 "Updated" => "Güncellendi",
 "Select a profile picture" => "Bir profil fotoğrafı seçin",
+"Very weak password" => "Çok güçsüz parola",
+"Weak password" => "Güçsüz parola",
+"So-so password" => "Normal parola",
+"Good password" => "İyi parola",
+"Strong password" => "Güçlü parola",
 "Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-"Saving..." => "Kaydediliyor...",
-"deleted" => "silindi",
+"deleted" => "silinen:",
 "undo" => "geri al",
 "Unable to remove user" => "Kullanıcı kaldırılamıyor",
 "Groups" => "Gruplar",
-"Group Admin" => "Yönetici Grubu ",
+"Group Admin" => "Grup Yöneticisi",
 "Delete" => "Sil",
 "add group" => "grup ekle",
 "A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ölümcül konular",
 "Errors and fatal issues" => "Hatalar ve ölümcül konular",
 "Fatal issues only" => "Sadece ölümcül konular",
+"None" => "Hiçbiri",
+"Login" => "Oturum Aç",
+"Plain" => "Düz",
+"NT LAN Manager" => "NT Ağ Yöneticisi",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Güvenlik Uyarısı",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS bağlantısına zorla",
 "Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s'a HTTPS ile bağlanın.",
+"Email Server" => "E-Posta Sunucusu",
+"This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
+"From address" => "Kimden adresi",
+"Authentication required" => "Kimlik doğrulama gerekli",
+"Server address" => "Sunucu adresi",
+"Port" => "Port",
+"Credentials" => "Kimlik Bilgileri",
+"SMTP Username" => "SMTP Kullanıcı Adı",
+"SMTP Password" => "SMTP Parolası",
+"Test email settings" => "E-posta ayarlarını sına",
+"Send email" => "E-posta gönder",
 "Log" => "Günlük",
 "Log level" => "Günlük seviyesi",
 "More" => "Daha fazla",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Uygulamanızı Ekleyin",
 "More Apps" => "Daha Fazla Uygulama",
 "Select an App" => "Bir Uygulama Seçin",
+"Documentation:" => "Belgelendirme:",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
+"See application website" => "Uygulama web sitesine bakın",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
-"User Documentation" => "Kullanıcı Belgelendirmesi",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
 "Online Documentation" => "Çevrimiçi Belgelendirme",
 "Forum" => "Forum",
@@ -119,20 +154,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Tam Adı",
 "Email" => "E-posta",
 "Your email address" => "E-posta adresiniz",
-"Fill in an email address to enable password recovery" => "Parola kurtarmayı etkinleştirmek için bir e-posta adresi girin",
+"Fill in an email address to enable password recovery and receive notifications" => "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
 "Profile picture" => "Profil resmi",
 "Upload new" => "Yeni yükle",
 "Select new from Files" => "Dosyalardan seç",
 "Remove image" => "Resmi kaldır",
 "Either png or jpg. Ideally square but you will be able to crop it." => "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz.",
 "Your avatar is provided by your original account." => "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
-"Abort" => "İptal Et",
+"Cancel" => "İptal",
 "Choose as profile image" => "Profil resmi olarak seç",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-"Encryption" => "Şifreleme",
 "The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
 "Log-in password" => "Oturum açma parolası",
 "Decrypt all Files" => "Tüm dosyaların şifresini çöz",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index e0e5e740058..c55834f7337 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "شىفىرلاش",
 "Unable to load list from App Store" => "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى",
 "Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
 "Group already exists" => "گۇرۇپپا مەۋجۇت",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
 "Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
 "Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
+"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Update to {appversion}" => "{appversion} غا يېڭىلايدۇ",
 "Disable" => "چەكلە",
 "Enable" => "قوزغات",
@@ -23,7 +25,6 @@ $TRANSLATIONS = array(
 "Error" => "خاتالىق",
 "Update" => "يېڭىلا",
 "Updated" => "يېڭىلاندى",
-"Saving..." => "ساقلاۋاتىدۇ…",
 "deleted" => "ئۆچۈرۈلگەن",
 "undo" => "يېنىۋال",
 "Unable to remove user" => "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ",
@@ -35,12 +36,16 @@ $TRANSLATIONS = array(
 "Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
 "A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
 "__language_name__" => "ئۇيغۇرچە",
+"None" => "يوق",
+"Login" => "تىزىمغا كىرىڭ",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
 "Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
 "Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
 "Sharing" => "ھەمبەھىر",
 "Security" => "بىخەتەرلىك",
+"Server address" => "مۇلازىمېتىر ئادرىسى",
+"Port" => "ئېغىز",
 "Log" => "خاتىرە",
 "Log level" => "خاتىرە دەرىجىسى",
 "More" => "تېخىمۇ كۆپ",
@@ -49,7 +54,6 @@ $TRANSLATIONS = array(
 "Add your App" => "ئەپىڭىزنى قوشۇڭ",
 "More Apps" => "تېخىمۇ كۆپ ئەپلەر",
 "Select an App" => "بىر ئەپ تاللاڭ",
-"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
 "Online Documentation" => "توردىكى قوللانما",
 "Forum" => "مۇنبەر",
@@ -61,11 +65,10 @@ $TRANSLATIONS = array(
 "Change password" => "ئىم ئۆزگەرت",
 "Email" => "تورخەت",
 "Your email address" => "تورخەت ئادرېسىڭىز",
-"Fill in an email address to enable password recovery" => "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ",
+"Cancel" => "ۋاز كەچ",
 "Language" => "تىل",
 "Help translate" => "تەرجىمىگە ياردەم",
 "WebDAV" => "WebDAV",
-"Encryption" => "شىفىرلاش",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 353e4f19882..7aadb1278d5 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Ел. пошта надіслана",
+"Encryption" => "Шифрування",
 "Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
 "Authentication error" => "Помилка автентифікації",
 "Group already exists" => "Група вже існує",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не вдалося додати користувача у групу %s",
 "Unable to remove user from group %s" => "Не вдалося видалити користувача із групи %s",
 "Couldn't update app." => "Не вдалося оновити програму. ",
+"User Documentation" => "Документація Користувача",
 "Update to {appversion}" => "Оновити до {appversion}",
 "Disable" => "Вимкнути",
 "Enable" => "Включити",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "Помилка",
 "Update" => "Оновити",
 "Updated" => "Оновлено",
-"Saving..." => "Зберігаю...",
 "deleted" => "видалені",
 "undo" => "відмінити",
 "Unable to remove user" => "Неможливо видалити користувача",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Помилка при створенні користувача",
 "A valid password must be provided" => "Потрібно задати вірний пароль",
 "__language_name__" => "__language_name__",
+"None" => "Жоден",
+"Login" => "Логін",
 "Security Warning" => "Попередження про небезпеку",
 "Setup Warning" => "Попередження при Налаштуванні",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
@@ -55,6 +59,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
 "Security" => "Безпека",
 "Enforce HTTPS" => "Примусове застосування HTTPS",
+"Server address" => "Адреса сервера",
+"Port" => "Порт",
+"Credentials" => "Облікові дані",
 "Log" => "Протокол",
 "Log level" => "Рівень протоколювання",
 "More" => "Більше",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Вибрати додаток",
 "See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"User Documentation" => "Документація Користувача",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
 "Forum" => "Форум",
@@ -83,11 +89,10 @@ $TRANSLATIONS = array(
 "Change password" => "Змінити пароль",
 "Email" => "Ел.пошта",
 "Your email address" => "Ваша адреса електронної пошти",
-"Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
+"Cancel" => "Відмінити",
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
-"Encryption" => "Шифрування",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index ff3eb3d11ca..0144e2b534c 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Error" => "ایرر",
 "Password" => "پاسورڈ",
 "New password" => "نیا پاسورڈ",
+"Cancel" => "منسوخ کریں",
 "Username" => "یوزر نیم"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index e2e1364902c..da9dbdf0a1f 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email đã được gửi",
+"Encryption" => "Mã hóa",
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
 "Authentication error" => "Lỗi xác thực",
+"Your full name has been changed." => "Họ và tên đã được thay đổi.",
+"Unable to change full name" => "Họ và tên không thể đổi ",
 "Group already exists" => "Nhóm đã tồn tại",
 "Unable to add group" => "Không thể thêm nhóm",
 "Email saved" => "Lưu email",
@@ -14,6 +18,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
 "Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
 "Couldn't update app." => "Không thể cập nhật ứng dụng",
+"User Documentation" => "Tài liệu người sử dụng",
 "Update to {appversion}" => "Cập nhật lên {appversion}",
 "Disable" => "Tắt",
 "Enable" => "Bật",
@@ -23,14 +28,17 @@ $TRANSLATIONS = array(
 "Error" => "Lỗi",
 "Update" => "Cập nhật",
 "Updated" => "Đã cập nhật",
-"Saving..." => "Đang lưu...",
 "deleted" => "đã xóa",
 "undo" => "lùi lại",
+"Unable to remove user" => "Không thể xóa người ",
 "Groups" => "Nhóm",
 "Group Admin" => "Nhóm quản trị",
 "Delete" => "Xóa",
 "__language_name__" => "__Ngôn ngữ___",
+"None" => "Không gì cả",
+"Login" => "Đăng nhập",
 "Security Warning" => "Cảnh bảo bảo mật",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
 "Sharing" => "Chia sẻ",
@@ -42,6 +50,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
 "Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
 "Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
+"Server address" => "Địa chỉ máy chủ",
+"Port" => "Cổng",
+"Credentials" => "Giấy chứng nhận",
 "Log" => "Log",
 "More" => "hơn",
 "Less" => "ít",
@@ -52,7 +63,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Chọn một ứng dụng",
 "See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
-"User Documentation" => "Tài liệu người sử dụng",
 "Administrator Documentation" => "Tài liệu quản trị",
 "Online Documentation" => "Tài liệu trực tuyến",
 "Forum" => "Diễn đàn",
@@ -67,13 +77,16 @@ $TRANSLATIONS = array(
 "Current password" => "Mật khẩu cũ",
 "New password" => "Mật khẩu mới",
 "Change password" => "Đổi mật khẩu",
+"Full Name" => "Họ và tên",
 "Email" => "Email",
 "Your email address" => "Email của bạn",
-"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
+"Upload new" => "Tải lên",
+"Remove image" => "Xóa ",
+"Cancel" => "Hủy",
+"Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "WebDAV" => "WebDAV",
-"Encryption" => "Mã hóa",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
@@ -81,6 +94,7 @@ $TRANSLATIONS = array(
 "Other" => "Khác",
 "Username" => "Tên đăng nhập",
 "Storage" => "Bộ nhớ",
+"change full name" => "Đổi họ và t",
 "set new password" => "đặt mật khẩu mới",
 "Default" => "Mặc định"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 4733a9e429a..25943b70207 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "邮件已发送",
+"Encryption" => "加密",
 "Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证出错",
+"Your full name has been changed." => "您的全名已修改。",
+"Unable to change full name" => "无法修改全名",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
 "Email saved" => "电子邮件已保存",
@@ -14,6 +18,10 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "无法把用户添加到组 %s",
 "Unable to remove user from group %s" => "无法从组%s中移除用户",
 "Couldn't update app." => "无法更新 app。",
+"Wrong password" => "错误密码",
+"No user supplied" => "没有满足的用户",
+"Unable to change password" => "不能更改密码",
+"User Documentation" => "用户文档",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "禁用",
 "Enable" => "开启",
@@ -26,7 +34,6 @@ $TRANSLATIONS = array(
 "Update" => "更新",
 "Updated" => "已更新",
 "Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
-"Saving..." => "保存中",
 "deleted" => "已经删除",
 "undo" => "撤销",
 "Unable to remove user" => "无法移除用户",
@@ -37,7 +44,15 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "必须提供合法的用户名",
 "Error creating user" => "创建用户出错",
 "A valid password must be provided" => "必须提供合法的密码",
+"Warning: Home directory for user \"{user}\" already exists" => "警告：用户 \"{user}\" 的家目录已存在",
 "__language_name__" => "简体中文",
+"Everything (fatal issues, errors, warnings, info, debug)" => "所有（灾难性问题，错误，警告，信息，调试）",
+"Info, warnings, errors and fatal issues" => "信息，警告，错误和灾难性问题",
+"Warnings, errors and fatal issues" => "警告，错误和灾难性问题",
+"Errors and fatal issues" => "错误和灾难性问题",
+"Fatal issues only" => "仅灾难性问题",
+"None" => "无",
+"Login" => "登录",
 "Security Warning" => "安全警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Setup Warning" => "设置警告",
@@ -45,11 +60,13 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "Module 'fileinfo' missing" => "模块'文件信息'丢失",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+"Your PHP version is outdated" => "您的 PHP 版本不是最新版",
 "Locale not working" => "本地化无法工作",
 "Internet connection not working" => "因特网连接无法工作",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
 "Cron" => "计划任务",
 "Execute one task with each page loaded" => "每个页面加载后执行一个任务",
+"Use systems cron service to call the cron.php file every 15 minutes." => "使用系统 cron 服务每15分钟调用一次 cron.php 文件。",
 "Sharing" => "共享",
 "Enable Share API" => "启用共享API",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
@@ -61,10 +78,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
 "Allow users to share with anyone" => "允许用户向任何人共享",
 "Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
+"Allow mail notification" => "允许邮件通知",
+"Allow user to send mail notification for shared files" => "允许用户为共享的文件发送邮件通知",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
+"Server address" => "服务器地址",
+"Port" => "端口",
+"Credentials" => "凭证",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
@@ -76,7 +98,6 @@ $TRANSLATIONS = array(
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
-"User Documentation" => "用户文档",
 "Administrator Documentation" => "管理员文档",
 "Online Documentation" => "在线文档",
 "Forum" => "论坛",
@@ -91,14 +112,19 @@ $TRANSLATIONS = array(
 "Current password" => "当前密码",
 "New password" => "新密码",
 "Change password" => "修改密码",
+"Full Name" => "全名",
 "Email" => "电子邮件",
 "Your email address" => "您的电子邮件",
-"Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能",
 "Profile picture" => "联系人图片",
+"Upload new" => "上传新的",
+"Select new from Files" => "从文件中选择一个新的",
+"Remove image" => "移除图片",
+"Your avatar is provided by your original account." => "您的头像由您的原始账户所提供。",
+"Cancel" => "取消",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
-"Encryption" => "加密",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
 "Log-in password" => "登录密码",
 "Decrypt all Files" => "解密所有文件",
 "Login Name" => "登录名称",
@@ -106,10 +132,12 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "管理恢复密码",
 "Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
 "Default Storage" => "默认存储",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
 "Unlimited" => "无限",
 "Other" => "其它",
 "Username" => "用户名",
 "Storage" => "存储",
+"change full name" => "更改全名",
 "set new password" => "设置新密码",
 "Default" => "默认"
 );
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 10fce11fb58..633b4252b67 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,12 +1,16 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "郵件已傳",
+"Encryption" => "加密",
 "Error" => "錯誤",
 "Groups" => "群組",
 "Delete" => "刪除",
+"None" => "空",
+"Port" => "連接埠",
 "Password" => "密碼",
 "New password" => "新密碼",
 "Email" => "電郵",
-"Encryption" => "加密",
+"Cancel" => "取消",
 "Username" => "用戶名稱"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 4f7d6ff9cf3..f7c834c5d82 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email 已寄出",
+"Encryption" => "加密",
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
 "Authentication error" => "認證錯誤",
 "Group already exists" => "群組已存在",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "錯誤的管理者還原密碼",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "後端不支援變更密碼，但成功更新使用者的加密金鑰",
 "Unable to change password" => "無法修改密碼",
+"User Documentation" => "用戶說明文件",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "停用",
 "Enable" => "啟用",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "已更新",
 "Select a profile picture" => "選擇大頭貼",
 "Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
-"Saving..." => "儲存中...",
 "deleted" => "已刪除",
 "undo" => "復原",
 "Unable to remove user" => "無法刪除用戶",
@@ -46,6 +48,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "一定要提供一個有效的密碼",
 "Warning: Home directory for user \"{user}\" already exists" => "警告：使用者 {user} 的家目錄已經存在",
 "__language_name__" => "__language_name__",
+"None" => "無",
+"Login" => "登入",
 "Security Warning" => "安全性警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
 "Setup Warning" => "設定警告",
@@ -77,6 +81,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "強制啟用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "強迫用戶端使用加密連線連接到 %s",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
+"Server address" => "伺服器位址",
+"Port" => "連接埠",
+"Credentials" => "認證",
 "Log" => "紀錄",
 "Log level" => "紀錄層級",
 "More" => "更多",
@@ -88,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "選擇一個應用程式",
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
-"User Documentation" => "用戶說明文件",
 "Administrator Documentation" => "管理者說明文件",
 "Online Documentation" => "線上說明文件",
 "Forum" => "論壇",
@@ -105,19 +111,17 @@ $TRANSLATIONS = array(
 "Change password" => "變更密碼",
 "Email" => "信箱",
 "Your email address" => "您的電子郵件信箱",
-"Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
 "Profile picture" => "個人資料照片",
 "Upload new" => "上傳新的",
 "Select new from Files" => "從已上傳的檔案中選一個",
 "Remove image" => "移除圖片",
 "Either png or jpg. Ideally square but you will be able to crop it." => "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它",
-"Abort" => "中斷",
+"Cancel" => "取消",
 "Choose as profile image" => "設定為大頭貼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-"Encryption" => "加密",
 "Log-in password" => "登入密碼",
 "Decrypt all Files" => "解密所有檔案",
 "Login Name" => "登入名稱",