update all translation files to js and json

244 files changed, 21588 insertions, 10890 deletions

diff --git a/settings/l10n/af_ZA.js b/settings/l10n/af_ZA.js
new file mode 100644
index 00000000000..ccc813a5590
--- /dev/null
+++ b/settings/l10n/af_ZA.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "settings",
+    {
+    "So-so password" : "So-so wagwoord",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Password" : "Wagwoord",
+    "New password" : "Nuwe wagwoord",
+    "Cancel" : "Kanseleer",
+    "Username" : "Gebruikersnaam"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/af_ZA.json b/settings/l10n/af_ZA.json
new file mode 100644
index 00000000000..73a78678732
--- /dev/null
+++ b/settings/l10n/af_ZA.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "So-so password" : "So-so wagwoord",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Password" : "Wagwoord",
+    "New password" : "Nuwe wagwoord",
+    "Cancel" : "Kanseleer",
+    "Username" : "Gebruikersnaam"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
deleted file mode 100644
index 90094e7855d..00000000000
--- a/settings/l10n/af_ZA.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"So-so password" => "So-so wagwoord",
-"Security Warning" => "Sekuriteits waarskuwing",
-"Password" => "Wagwoord",
-"New password" => "Nuwe wagwoord",
-"Cancel" => "Kanseleer",
-"Username" => "Gebruikersnaam"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
new file mode 100644
index 00000000000..f47285f6cdd
--- /dev/null
+++ b/settings/l10n/ar.js
@@ -0,0 +1,158 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "مفعلة",
+    "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" : "فشل إزالة المستخدم",
+    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
+    "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." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+    "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Saved" : "حفظ",
+    "test email settings" : "إعدادات البريد التجريبي",
+    "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
+    "Sending..." : "جاري الارسال ...",
+    "All" : "الكل",
+    "Please wait...." : "الرجاء الانتظار ...",
+    "Error while disabling app" : "خطا عند تعطيل البرنامج",
+    "Disable" : "إيقاف",
+    "Enable" : "تفعيل",
+    "Error while enabling app" : "خطا عند تفعيل البرنامج ",
+    "Updating...." : "جاري التحديث ...",
+    "Error while updating app" : "حصل خطأ أثناء تحديث التطبيق",
+    "Updated" : "تم التحديث بنجاح",
+    "Uninstalling ...." : "جاري إلغاء التثبيت ...",
+    "Uninstall" : "ألغاء التثبيت",
+    "Select a profile picture" : "اختر صورة الملف الشخصي ",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Delete" : "إلغاء",
+    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
+    "Groups" : "مجموعات",
+    "undo" : "تراجع",
+    "never" : "بتاتا",
+    "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__" : "__language_name__",
+    "Encryption" : "التشفير",
+    "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" : "تحذير في التنصيب",
+    "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.",
+    "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
+    "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 دقيقه",
+    "Sharing" : "مشاركة",
+    "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+    "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
+    "Allow public uploads" : "السماح بالرفع للعامة ",
+    "Expire after " : "ينتهي بعد",
+    "days" : "أيام",
+    "Allow resharing" : "السماح بإعادة المشاركة ",
+    "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" : "خادم البريد الالكتروني",
+    "Send mode" : "وضعية الإرسال",
+    "Authentication method" : "أسلوب التطابق",
+    "Server address" : "عنوان الخادم",
+    "Port" : "المنفذ",
+    "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\">رخصة أفيرو العمومية</abbr></a>.",
+    "by" : "من قبل",
+    "Documentation:" : "التوثيق",
+    "User Documentation" : "كتاب توثيق المستخدم",
+    "Uninstall App" : "أزالة تطبيق",
+    "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" : "كلمات السر الحالية",
+    "New password" : "كلمات سر جديدة",
+    "Change password" : "عدل كلمة السر",
+    "Full Name" : "اسمك الكامل",
+    "Email" : "البريد الإلكترونى",
+    "Your email address" : "عنوانك البريدي",
+    "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" : "ساعد في الترجمه",
+    "Valid until" : "صالح حتى",
+    "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" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
+    "Group" : "مجموعة",
+    "Everyone" : "الجميع",
+    "Default Quota" : "الحصة النسبية الإفتراضية",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
+    "Unlimited" : "غير محدود",
+    "Other" : "شيء آخر",
+    "Username" : "إسم المستخدم",
+    "Quota" : "حصه",
+    "Last Login" : "آخر تسجيل دخول",
+    "change full name" : "تغيير اسمك الكامل",
+    "set new password" : "اعداد كلمة مرور جديدة",
+    "Default" : "افتراضي"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
new file mode 100644
index 00000000000..3b5ea8da2b0
--- /dev/null
+++ b/settings/l10n/ar.json
@@ -0,0 +1,156 @@
+{ "translations": {
+    "Enabled" : "مفعلة",
+    "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" : "فشل إزالة المستخدم",
+    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
+    "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." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+    "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Saved" : "حفظ",
+    "test email settings" : "إعدادات البريد التجريبي",
+    "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
+    "Sending..." : "جاري الارسال ...",
+    "All" : "الكل",
+    "Please wait...." : "الرجاء الانتظار ...",
+    "Error while disabling app" : "خطا عند تعطيل البرنامج",
+    "Disable" : "إيقاف",
+    "Enable" : "تفعيل",
+    "Error while enabling app" : "خطا عند تفعيل البرنامج ",
+    "Updating...." : "جاري التحديث ...",
+    "Error while updating app" : "حصل خطأ أثناء تحديث التطبيق",
+    "Updated" : "تم التحديث بنجاح",
+    "Uninstalling ...." : "جاري إلغاء التثبيت ...",
+    "Uninstall" : "ألغاء التثبيت",
+    "Select a profile picture" : "اختر صورة الملف الشخصي ",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Delete" : "إلغاء",
+    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
+    "Groups" : "مجموعات",
+    "undo" : "تراجع",
+    "never" : "بتاتا",
+    "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__" : "__language_name__",
+    "Encryption" : "التشفير",
+    "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" : "تحذير في التنصيب",
+    "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.",
+    "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
+    "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 دقيقه",
+    "Sharing" : "مشاركة",
+    "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+    "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
+    "Allow public uploads" : "السماح بالرفع للعامة ",
+    "Expire after " : "ينتهي بعد",
+    "days" : "أيام",
+    "Allow resharing" : "السماح بإعادة المشاركة ",
+    "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" : "خادم البريد الالكتروني",
+    "Send mode" : "وضعية الإرسال",
+    "Authentication method" : "أسلوب التطابق",
+    "Server address" : "عنوان الخادم",
+    "Port" : "المنفذ",
+    "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\">رخصة أفيرو العمومية</abbr></a>.",
+    "by" : "من قبل",
+    "Documentation:" : "التوثيق",
+    "User Documentation" : "كتاب توثيق المستخدم",
+    "Uninstall App" : "أزالة تطبيق",
+    "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" : "كلمات السر الحالية",
+    "New password" : "كلمات سر جديدة",
+    "Change password" : "عدل كلمة السر",
+    "Full Name" : "اسمك الكامل",
+    "Email" : "البريد الإلكترونى",
+    "Your email address" : "عنوانك البريدي",
+    "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" : "ساعد في الترجمه",
+    "Valid until" : "صالح حتى",
+    "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" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
+    "Group" : "مجموعة",
+    "Everyone" : "الجميع",
+    "Default Quota" : "الحصة النسبية الإفتراضية",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
+    "Unlimited" : "غير محدود",
+    "Other" : "شيء آخر",
+    "Username" : "إسم المستخدم",
+    "Quota" : "حصه",
+    "Last Login" : "آخر تسجيل دخول",
+    "change full name" : "تغيير اسمك الكامل",
+    "set new password" : "اعداد كلمة مرور جديدة",
+    "Default" : "افتراضي"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
deleted file mode 100644
index bd62f1f1165..00000000000
--- a/settings/l10n/ar.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "مفعلة",
-"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" => "فشل إزالة المستخدم",
-"Backups restored successfully" => "تم إسترجاع النسخة الإحتياطية بنجاح",
-"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." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
-"Unable to change password" => "لا يمكن تغيير كلمة المرور",
-"Saved" => "حفظ",
-"test email settings" => "إعدادات البريد التجريبي",
-"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
-"Email sent" => "تم ارسال البريد الالكتروني",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
-"Sending..." => "جاري الارسال ...",
-"All" => "الكل",
-"Please wait...." => "الرجاء الانتظار ...",
-"Error while disabling app" => "خطا عند تعطيل البرنامج",
-"Disable" => "إيقاف",
-"Enable" => "تفعيل",
-"Error while enabling app" => "خطا عند تفعيل البرنامج ",
-"Updating...." => "جاري التحديث ...",
-"Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
-"Updated" => "تم التحديث بنجاح",
-"Uninstalling ...." => "جاري إلغاء التثبيت ...",
-"Uninstall" => "ألغاء التثبيت",
-"Select a profile picture" => "اختر صورة الملف الشخصي ",
-"Very weak password" => "كلمة السر ضعيفة جدا",
-"Weak password" => "كلمة السر ضعيفة",
-"Good password" => "كلمة السر جيدة",
-"Strong password" => "كلمة السر قوية",
-"Delete" => "إلغاء",
-"Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
-"Groups" => "مجموعات",
-"undo" => "تراجع",
-"never" => "بتاتا",
-"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__" => "__language_name__",
-"Encryption" => "التشفير",
-"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" => "تحذير في التنصيب",
-"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.",
-"Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
-"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 دقيقه",
-"Sharing" => "مشاركة",
-"Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
-"Allow users to share via link" => "السماح للمستخدم بمشاركة الملف عن طريق رابط",
-"Allow public uploads" => "السماح بالرفع للعامة ",
-"Expire after " => "ينتهي بعد",
-"days" => "أيام",
-"Allow resharing" => "السماح بإعادة المشاركة ",
-"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" => "خادم البريد الالكتروني",
-"Send mode" => "وضعية الإرسال",
-"Authentication method" => "أسلوب التطابق",
-"Server address" => "عنوان الخادم",
-"Port" => "المنفذ",
-"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\">رخصة أفيرو العمومية</abbr></a>.",
-"by" => "من قبل",
-"Documentation:" => "التوثيق",
-"User Documentation" => "كتاب توثيق المستخدم",
-"Uninstall App" => "أزالة تطبيق",
-"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" => "كلمات السر الحالية",
-"New password" => "كلمات سر جديدة",
-"Change password" => "عدل كلمة السر",
-"Full Name" => "اسمك الكامل",
-"Email" => "البريد الإلكترونى",
-"Your email address" => "عنوانك البريدي",
-"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" => "ساعد في الترجمه",
-"Valid until" => "صالح حتى",
-"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" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
-"Group" => "مجموعة",
-"Everyone" => "الجميع",
-"Default Quota" => "الحصة النسبية الإفتراضية",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
-"Unlimited" => "غير محدود",
-"Other" => "شيء آخر",
-"Username" => "إسم المستخدم",
-"Quota" => "حصه",
-"Last Login" => "آخر تسجيل دخول",
-"change full name" => "تغيير اسمك الكامل",
-"set new password" => "اعداد كلمة مرور جديدة",
-"Default" => "افتراضي"
-);
-$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
new file mode 100644
index 00000000000..e7a8cac47b8
--- /dev/null
+++ b/settings/l10n/ast.js
@@ -0,0 +1,214 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Fallu d'autenticación",
+    "Your full name has been changed." : "Camudóse'l nome completu.",
+    "Unable to change full name" : "Nun pue camudase'l nome completu",
+    "Group already exists" : "El grupu yá esiste",
+    "Unable to add group" : "Nun pudo amestase'l grupu",
+    "Files decrypted successfully" : "Descifráronse los ficheros",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
+    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
+    "Email saved" : "Corréu-e guardáu",
+    "Invalid email" : "Corréu electrónicu non válidu",
+    "Unable to delete group" : "Nun pudo desaniciase'l grupu",
+    "Unable to delete user" : "Nun pudo desaniciase l'usuariu",
+    "Backups restored successfully" : "Copia de seguridá restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Language changed" : "Camudóse la llingua",
+    "Invalid request" : "Solicitú inválida",
+    "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
+    "Unable to add user to group %s" : "Nun pudo amestase l'usuariu al grupu %s",
+    "Unable to remove user from group %s" : "Nun pudo desaniciase al usuariu del grupu %s",
+    "Couldn't update app." : "Nun pudo anovase l'aplicación.",
+    "Wrong password" : "Contraseña incorreuta",
+    "No user supplied" : "Nun s'especificó un usuariu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
+    "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Saved" : "Guardáu",
+    "test email settings" : "probar configuración de corréu",
+    "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "Email sent" : "Corréu-e unviáu",
+    "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Sending..." : "Unviando...",
+    "All" : "Toos",
+    "Please wait...." : "Espera, por favor....",
+    "Error while disabling app" : "Fallu mientres se desactivaba l'aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Fallu mientres s'activaba l'aplicación",
+    "Updating...." : "Anovando....",
+    "Error while updating app" : "Fallu mientres s'anovaba l'aplicación",
+    "Updated" : "Anováu",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Esbillar una imaxe de perfil",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Delete" : "Desaniciar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
+    "Restore encryption keys." : "Restaurar claves de cifráu.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
+    "Error creating group" : "Fallu creando grupu",
+    "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
+    "deleted {groupName}" : "desaniciáu {groupName}",
+    "undo" : "desfacer",
+    "never" : "enxamás",
+    "deleted {userName}" : "desaniciáu {userName}",
+    "add group" : "amestar Grupu",
+    "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
+    "Error creating user" : "Fallu al crear usuariu",
+    "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
+    "__language_name__" : "Asturianu",
+    "SSL root certificates" : "Certificaos raíz SSL",
+    "Encryption" : "Cifráu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
+    "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
+    "Errors and fatal issues" : "Fallos y problemes fatales",
+    "Fatal issues only" : "Namái problemes fatales",
+    "None" : "Dengún",
+    "Login" : "Entamar sesión",
+    "Plain" : "Planu",
+    "NT LAN Manager" : "Xestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avisu de seguridá",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar 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." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "Setup Warning" : "Avisu de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rindimientu de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
+    "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
+    "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ón de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "Locale not working" : "La configuración rexonal nun ta funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
+    "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
+    "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
+    "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
+    "Enforce password protection" : "Ameyora la proteición por contraseña.",
+    "Allow public uploads" : "Permitir xubes públiques",
+    "Set default expiration date" : "Afitar la data d'espiración predeterminada",
+    "Expire after " : "Caduca dempués de",
+    "days" : "díes",
+    "Enforce expiration date" : "Facer cumplir la data de caducidá",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
+    "Exclude groups from sharing" : "Esclúi grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
+    "Security" : "Seguridá",
+    "Enforce HTTPS" : "Forciar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
+    "Email Server" : "Sirvidor de corréu-e",
+    "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
+    "Send mode" : "Mou d'unviu",
+    "From address" : "Dende la direición",
+    "mail" : "corréu",
+    "Authentication method" : "Métodu d'autenticación",
+    "Authentication required" : "Necesítase autenticación",
+    "Server address" : "Direición del sirvidor",
+    "Port" : "Puertu",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nome d'usuariu SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Probar configuración de corréu electrónicu",
+    "Send email" : "Unviar mensaxe",
+    "Log" : "Rexistru",
+    "Log level" : "Nivel de rexistru",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación d'usuariu",
+    "Admin Documentation" : "Documentación p'alministradores",
+    "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación d'alministrador",
+    "Online Documentation" : "Documentación en llinia",
+    "Forum" : "Foru",
+    "Bugtracker" : "Rastrexador de fallos",
+    "Commercial Support" : "Sofitu comercial",
+    "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
+    "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Camudóse la contraseña",
+    "Unable to change your password" : "Nun pudo camudase la contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Contraseña nueva",
+    "Change password" : "Camudar contraseña",
+    "Full Name" : "Nome completu",
+    "Email" : "Corréu-e",
+    "Your email address" : "Direición de corréu-e",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
+    "Profile picture" : "Semeya de perfil",
+    "Upload new" : "Xubir otra",
+    "Select new from Files" : "Esbillar otra dende Ficheros",
+    "Remove image" : "Desaniciar imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
+    "Your avatar is provided by your original account." : "L'avatar ta proporcionáu pola to cuenta orixinal.",
+    "Cancel" : "Encaboxar",
+    "Choose as profile image" : "Esbillar como imaxe de perfil",
+    "Language" : "Llingua",
+    "Help translate" : "Ayúdanos nes traducciones",
+    "Import Root Certificate" : "Importar certificáu raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
+    "Log-in password" : "Contraseña d'accesu",
+    "Decrypt all Files" : "Descifrar ficheros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
+    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
+    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
+    "Login Name" : "Nome d'usuariu",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+    "Search Users and Groups" : "Guetar Usuarios y Grupos",
+    "Add Group" : "Amestar grupu",
+    "Group" : "Grupu",
+    "Everyone" : "Toos",
+    "Admins" : "Almins",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Non llendáu",
+    "Other" : "Otru",
+    "Username" : "Nome d'usuariu",
+    "Quota" : "Cuota",
+    "Storage Location" : "Llocalización d'almacenamientu",
+    "Last Login" : "Caberu aniciu de sesión",
+    "change full name" : "camudar el nome completu",
+    "set new password" : "afitar nueva contraseña",
+    "Default" : "Predetermináu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
new file mode 100644
index 00000000000..5524c431b0d
--- /dev/null
+++ b/settings/l10n/ast.json
@@ -0,0 +1,212 @@
+{ "translations": {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Fallu d'autenticación",
+    "Your full name has been changed." : "Camudóse'l nome completu.",
+    "Unable to change full name" : "Nun pue camudase'l nome completu",
+    "Group already exists" : "El grupu yá esiste",
+    "Unable to add group" : "Nun pudo amestase'l grupu",
+    "Files decrypted successfully" : "Descifráronse los ficheros",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
+    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
+    "Email saved" : "Corréu-e guardáu",
+    "Invalid email" : "Corréu electrónicu non válidu",
+    "Unable to delete group" : "Nun pudo desaniciase'l grupu",
+    "Unable to delete user" : "Nun pudo desaniciase l'usuariu",
+    "Backups restored successfully" : "Copia de seguridá restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Language changed" : "Camudóse la llingua",
+    "Invalid request" : "Solicitú inválida",
+    "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
+    "Unable to add user to group %s" : "Nun pudo amestase l'usuariu al grupu %s",
+    "Unable to remove user from group %s" : "Nun pudo desaniciase al usuariu del grupu %s",
+    "Couldn't update app." : "Nun pudo anovase l'aplicación.",
+    "Wrong password" : "Contraseña incorreuta",
+    "No user supplied" : "Nun s'especificó un usuariu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
+    "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Saved" : "Guardáu",
+    "test email settings" : "probar configuración de corréu",
+    "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "Email sent" : "Corréu-e unviáu",
+    "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Sending..." : "Unviando...",
+    "All" : "Toos",
+    "Please wait...." : "Espera, por favor....",
+    "Error while disabling app" : "Fallu mientres se desactivaba l'aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Fallu mientres s'activaba l'aplicación",
+    "Updating...." : "Anovando....",
+    "Error while updating app" : "Fallu mientres s'anovaba l'aplicación",
+    "Updated" : "Anováu",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Esbillar una imaxe de perfil",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Delete" : "Desaniciar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
+    "Restore encryption keys." : "Restaurar claves de cifráu.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
+    "Error creating group" : "Fallu creando grupu",
+    "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
+    "deleted {groupName}" : "desaniciáu {groupName}",
+    "undo" : "desfacer",
+    "never" : "enxamás",
+    "deleted {userName}" : "desaniciáu {userName}",
+    "add group" : "amestar Grupu",
+    "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
+    "Error creating user" : "Fallu al crear usuariu",
+    "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
+    "__language_name__" : "Asturianu",
+    "SSL root certificates" : "Certificaos raíz SSL",
+    "Encryption" : "Cifráu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
+    "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
+    "Errors and fatal issues" : "Fallos y problemes fatales",
+    "Fatal issues only" : "Namái problemes fatales",
+    "None" : "Dengún",
+    "Login" : "Entamar sesión",
+    "Plain" : "Planu",
+    "NT LAN Manager" : "Xestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avisu de seguridá",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar 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." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "Setup Warning" : "Avisu de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rindimientu de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
+    "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
+    "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ón de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "Locale not working" : "La configuración rexonal nun ta funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
+    "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
+    "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
+    "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
+    "Enforce password protection" : "Ameyora la proteición por contraseña.",
+    "Allow public uploads" : "Permitir xubes públiques",
+    "Set default expiration date" : "Afitar la data d'espiración predeterminada",
+    "Expire after " : "Caduca dempués de",
+    "days" : "díes",
+    "Enforce expiration date" : "Facer cumplir la data de caducidá",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
+    "Exclude groups from sharing" : "Esclúi grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
+    "Security" : "Seguridá",
+    "Enforce HTTPS" : "Forciar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
+    "Email Server" : "Sirvidor de corréu-e",
+    "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
+    "Send mode" : "Mou d'unviu",
+    "From address" : "Dende la direición",
+    "mail" : "corréu",
+    "Authentication method" : "Métodu d'autenticación",
+    "Authentication required" : "Necesítase autenticación",
+    "Server address" : "Direición del sirvidor",
+    "Port" : "Puertu",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nome d'usuariu SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Probar configuración de corréu electrónicu",
+    "Send email" : "Unviar mensaxe",
+    "Log" : "Rexistru",
+    "Log level" : "Nivel de rexistru",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación d'usuariu",
+    "Admin Documentation" : "Documentación p'alministradores",
+    "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación d'alministrador",
+    "Online Documentation" : "Documentación en llinia",
+    "Forum" : "Foru",
+    "Bugtracker" : "Rastrexador de fallos",
+    "Commercial Support" : "Sofitu comercial",
+    "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
+    "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Camudóse la contraseña",
+    "Unable to change your password" : "Nun pudo camudase la contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Contraseña nueva",
+    "Change password" : "Camudar contraseña",
+    "Full Name" : "Nome completu",
+    "Email" : "Corréu-e",
+    "Your email address" : "Direición de corréu-e",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
+    "Profile picture" : "Semeya de perfil",
+    "Upload new" : "Xubir otra",
+    "Select new from Files" : "Esbillar otra dende Ficheros",
+    "Remove image" : "Desaniciar imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
+    "Your avatar is provided by your original account." : "L'avatar ta proporcionáu pola to cuenta orixinal.",
+    "Cancel" : "Encaboxar",
+    "Choose as profile image" : "Esbillar como imaxe de perfil",
+    "Language" : "Llingua",
+    "Help translate" : "Ayúdanos nes traducciones",
+    "Import Root Certificate" : "Importar certificáu raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
+    "Log-in password" : "Contraseña d'accesu",
+    "Decrypt all Files" : "Descifrar ficheros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
+    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
+    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
+    "Login Name" : "Nome d'usuariu",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+    "Search Users and Groups" : "Guetar Usuarios y Grupos",
+    "Add Group" : "Amestar grupu",
+    "Group" : "Grupu",
+    "Everyone" : "Toos",
+    "Admins" : "Almins",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Non llendáu",
+    "Other" : "Otru",
+    "Username" : "Nome d'usuariu",
+    "Quota" : "Cuota",
+    "Storage Location" : "Llocalización d'almacenamientu",
+    "Last Login" : "Caberu aniciu de sesión",
+    "change full name" : "camudar el nome completu",
+    "set new password" : "afitar nueva contraseña",
+    "Default" : "Predetermináu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
deleted file mode 100644
index d6a56328ff9..00000000000
--- a/settings/l10n/ast.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitar",
-"Authentication error" => "Fallu d'autenticación",
-"Your full name has been changed." => "Camudóse'l nome completu.",
-"Unable to change full name" => "Nun pue camudase'l nome completu",
-"Group already exists" => "El grupu yá esiste",
-"Unable to add group" => "Nun pudo amestase'l grupu",
-"Files decrypted successfully" => "Descifráronse los ficheros",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
-"Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
-"Encryption keys deleted permanently" => "Desaniciaes dafechu les claves de cifráu",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
-"Couldn't remove app." => "Nun pudo desaniciase l'aplicación.",
-"Email saved" => "Corréu-e guardáu",
-"Invalid email" => "Corréu electrónicu non válidu",
-"Unable to delete group" => "Nun pudo desaniciase'l grupu",
-"Unable to delete user" => "Nun pudo desaniciase l'usuariu",
-"Backups restored successfully" => "Copia de seguridá restaurada",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
-"Language changed" => "Camudóse la llingua",
-"Invalid request" => "Solicitú inválida",
-"Admins can't remove themself from the admin group" => "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
-"Unable to add user to group %s" => "Nun pudo amestase l'usuariu al grupu %s",
-"Unable to remove user from group %s" => "Nun pudo desaniciase al usuariu del grupu %s",
-"Couldn't update app." => "Nun pudo anovase l'aplicación.",
-"Wrong password" => "Contraseña incorreuta",
-"No user supplied" => "Nun s'especificó un usuariu",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
-"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
-"Unable to change password" => "Nun pudo camudase la contraseña",
-"Saved" => "Guardáu",
-"test email settings" => "probar configuración de corréu",
-"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
-"Email sent" => "Corréu-e unviáu",
-"You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
-"Sending..." => "Unviando...",
-"All" => "Toos",
-"Please wait...." => "Espera, por favor....",
-"Error while disabling app" => "Fallu mientres se desactivaba l'aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Fallu mientres s'activaba l'aplicación",
-"Updating...." => "Anovando....",
-"Error while updating app" => "Fallu mientres s'anovaba l'aplicación",
-"Updated" => "Anováu",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Fallu mientres se desinstalaba l'aplicación",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Esbillar una imaxe de perfil",
-"Very weak password" => "Contraseña mui feble",
-"Weak password" => "Contraseña feble",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña bona",
-"Strong password" => "Contraseña mui bona",
-"Delete" => "Desaniciar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
-"Delete encryption keys permanently." => "Desaniciar dafechu les claves de cifráu.",
-"Restore encryption keys." => "Restaurar claves de cifráu.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Nun pue desaniciase {objName}",
-"Error creating group" => "Fallu creando grupu",
-"A valid group name must be provided" => "Hai d'escribir un nome de grupu válidu",
-"deleted {groupName}" => "desaniciáu {groupName}",
-"undo" => "desfacer",
-"never" => "enxamás",
-"deleted {userName}" => "desaniciáu {userName}",
-"add group" => "amestar Grupu",
-"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
-"Error creating user" => "Fallu al crear usuariu",
-"A valid password must be provided" => "Tien d'apurrise una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
-"__language_name__" => "Asturianu",
-"SSL root certificates" => "Certificaos raíz SSL",
-"Encryption" => "Cifráu",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Too (Información, Avisos, Fallos, debug y problemes fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Fallos y problemes fatales",
-"Warnings, errors and fatal issues" => "Avisos, fallos y problemes fatales",
-"Errors and fatal issues" => "Fallos y problemes fatales",
-"Fatal issues only" => "Namái problemes fatales",
-"None" => "Dengún",
-"Login" => "Entamar sesión",
-"Plain" => "Planu",
-"NT LAN Manager" => "Xestor de NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avisu de seguridá",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar 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." => "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
-"Setup Warning" => "Avisu de configuración",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Información de rindimientu de la base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Nun s'atopó'l módulu \"fileinfo\"",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
-"Your PHP version is outdated" => "La versión de PHP nun ta anovada",
-"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ón de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
-"Locale not working" => "La configuración rexonal nun ta funcionando",
-"System locale can not be set to a one which supports UTF-8." => "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron executóse per cabera vegada a les %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
-"Cron was not executed yet!" => "¡Cron entá nun s'executó!",
-"Execute one task with each page loaded" => "Executar una xera con cada páxina cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a les aplicaciones usar la API de Compartición",
-"Allow users to share via link" => "Permitir a los usuarios compartir vía enllaz",
-"Enforce password protection" => "Ameyora la proteición por contraseña.",
-"Allow public uploads" => "Permitir xubes públiques",
-"Set default expiration date" => "Afitar la data d'espiración predeterminada",
-"Expire after " => "Caduca dempués de",
-"days" => "díes",
-"Enforce expiration date" => "Facer cumplir la data de caducidá",
-"Allow resharing" => "Permitir re-compartición",
-"Restrict users to only share with users in their groups" => "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
-"Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
-"Exclude groups from sharing" => "Esclúi grupos de compartir",
-"These groups will still be able to receive shares, but not to initiate them." => "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
-"Security" => "Seguridá",
-"Enforce HTTPS" => "Forciar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
-"Email Server" => "Sirvidor de corréu-e",
-"This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
-"Send mode" => "Mou d'unviu",
-"From address" => "Dende la direición",
-"mail" => "corréu",
-"Authentication method" => "Métodu d'autenticación",
-"Authentication required" => "Necesítase autenticación",
-"Server address" => "Direición del sirvidor",
-"Port" => "Puertu",
-"Credentials" => "Credenciales",
-"SMTP Username" => "Nome d'usuariu SMTP",
-"SMTP Password" => "Contraseña SMTP",
-"Test email settings" => "Probar configuración de corréu electrónicu",
-"Send email" => "Unviar mensaxe",
-"Log" => "Rexistru",
-"Log level" => "Nivel de rexistru",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación d'usuariu",
-"Admin Documentation" => "Documentación p'alministradores",
-"Enable only for specific groups" => "Habilitar namái pa grupos específicos",
-"Uninstall App" => "Desinstalar aplicación",
-"Administrator Documentation" => "Documentación d'alministrador",
-"Online Documentation" => "Documentación en llinia",
-"Forum" => "Foru",
-"Bugtracker" => "Rastrexador de fallos",
-"Commercial Support" => "Sofitu comercial",
-"Get the apps to sync your files" => "Obtener les aplicaciones pa sincronizar ficheros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
-"Show First Run Wizard again" => "Amosar nuevamente l'Encontu d'execución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Camudóse la contraseña",
-"Unable to change your password" => "Nun pudo camudase la contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Contraseña nueva",
-"Change password" => "Camudar contraseña",
-"Full Name" => "Nome completu",
-"Email" => "Corréu-e",
-"Your email address" => "Direición de corréu-e",
-"Fill in an email address to enable password recovery and receive notifications" => "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
-"Profile picture" => "Semeya de perfil",
-"Upload new" => "Xubir otra",
-"Select new from Files" => "Esbillar otra dende Ficheros",
-"Remove image" => "Desaniciar imaxe",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
-"Your avatar is provided by your original account." => "L'avatar ta proporcionáu pola to cuenta orixinal.",
-"Cancel" => "Encaboxar",
-"Choose as profile image" => "Esbillar como imaxe de perfil",
-"Language" => "Llingua",
-"Help translate" => "Ayúdanos nes traducciones",
-"Import Root Certificate" => "Importar certificáu raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
-"Log-in password" => "Contraseña d'accesu",
-"Decrypt all Files" => "Descifrar ficheros",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
-"Restore Encryption Keys" => "Restaurar claves de cifráu.",
-"Delete Encryption Keys" => "Desaniciar claves de cifráu",
-"Login Name" => "Nome d'usuariu",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
-"Search Users and Groups" => "Guetar Usuarios y Grupos",
-"Add Group" => "Amestar grupu",
-"Group" => "Grupu",
-"Everyone" => "Toos",
-"Admins" => "Almins",
-"Default Quota" => "Cuota predeterminada",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Non llendáu",
-"Other" => "Otru",
-"Username" => "Nome d'usuariu",
-"Quota" => "Cuota",
-"Storage Location" => "Llocalización d'almacenamientu",
-"Last Login" => "Caberu aniciu de sesión",
-"change full name" => "camudar el nome completu",
-"set new password" => "afitar nueva contraseña",
-"Default" => "Predetermináu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
new file mode 100644
index 00000000000..1150aecda59
--- /dev/null
+++ b/settings/l10n/az.js
@@ -0,0 +1,107 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Təyinat metodikası",
+    "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
+    "Unable to change full name" : "Tam adı dəyişmək olmur",
+    "Group already exists" : "Qrup artıq mövcuddur",
+    "Unable to add group" : "Qrupu əlavə etmək olmur",
+    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
+    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
+    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
+    "Email saved" : "Məktub yadda saxlanıldı",
+    "Invalid email" : "Yalnış məktub",
+    "Unable to delete group" : "Qrupu silmək olmur",
+    "Unable to delete user" : "İstifadəçini silmək olmur",
+    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Language changed" : "Dil dəyişdirildi",
+    "Invalid request" : "Səhv müraciət",
+    "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
+    "Unable to add user to group %s" : "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
+    "Unable to remove user from group %s" : "İstifadəçini %s qrupundan silmək mümkün olmadı",
+    "Couldn't update app." : "Proqram təminatını yeniləmək mümkün deyil.",
+    "Wrong password" : "Yalnış şifrə",
+    "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
+    "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
+    "Unable to change password" : "Şifrəni dəyişmək olmur",
+    "Saved" : "Saxlanıldı",
+    "test email settings" : "sınaq məktubu quraşdırmaları",
+    "If you received this email, the settings seem to be correct." : "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
+    "Email sent" : "Məktub göndərildi",
+    "You need to set your user email before being able to send test emails." : "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
+    "Add trusted domain" : "İnamlı domainlərə əlavə et",
+    "Sending..." : "Göndərilir...",
+    "Please wait...." : "Xahiş olunur gözləyəsiniz.",
+    "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi",
+    "Disable" : "Dayandır",
+    "Enable" : "İşə sal",
+    "Error while enabling app" : "Proqram təminatını işə saldıqda səhv baş verdi",
+    "Updating...." : "Yenilənir...",
+    "Error while updating app" : "Proqram təminatı yeniləndikdə səhv baş verdi",
+    "Updated" : "Yeniləndi",
+    "Uninstalling ...." : "Silinir...",
+    "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi",
+    "Uninstall" : "Sil",
+    "Select a profile picture" : "Profil üçün şəkli seç",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
+    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
+    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
+    "Groups" : "Qruplar",
+    "Unable to delete {objName}" : "{objName} silmək olmur",
+    "Error creating group" : "Qrup yaranmasında səhv baş verdi",
+    "A valid group name must be provided" : "Düzgün qrup adı təyin edilməlidir",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geriyə",
+    "never" : "heç vaxt",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "qrupu əlavə et",
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "Error creating user" : "İstifadəçi yaratdıqda səhv baş verdi",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir",
+    "Warning: Home directory for user \"{user}\" already exists" : "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
+    "__language_name__" : "__AZ_Azerbaijan__",
+    "Encryption" : "Şifrələnmə",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
+    "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Errors and fatal issues" : "Səhvlər və ən pis hadisələr",
+    "Fatal issues only" : "Yalnız ən pis hadisələr",
+    "None" : "Heç bir",
+    "Login" : "Giriş",
+    "Plain" : "Adi",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Setup Warning" : "Quruluş xəbərdarlığı",
+    "Database Performance Info" : "Verilənlər  bazasının davamiyyəti məlumatı",
+    "Module 'fileinfo' missing" : "'fileinfo' modulu çatışmır",
+    "Your PHP version is outdated" : "Sizin PHP versiyası köhnəlib",
+    "PHP charset is not set to UTF-8" : "PHP simvol tipi UTF-8 deyil",
+    "Send mode" : "Göndərmə rejimi",
+    "Authentication method" : "Qeydiyyat metodikası",
+    "More" : "Yenə",
+    "by" : "onunla",
+    "User Documentation" : "İstifadəçi sənədləri",
+    "Admin Documentation" : "İnzibatçı sənədləri",
+    "Uninstall App" : "Proqram təminatını sil",
+    "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
+    "Password" : "Şifrə",
+    "Change password" : "Şifrəni dəyiş",
+    "Cancel" : "Dayandır",
+    "Username" : "İstifadəçi adı"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
new file mode 100644
index 00000000000..6325a20b196
--- /dev/null
+++ b/settings/l10n/az.json
@@ -0,0 +1,105 @@
+{ "translations": {
+    "Authentication error" : "Təyinat metodikası",
+    "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
+    "Unable to change full name" : "Tam adı dəyişmək olmur",
+    "Group already exists" : "Qrup artıq mövcuddur",
+    "Unable to add group" : "Qrupu əlavə etmək olmur",
+    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
+    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
+    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
+    "Email saved" : "Məktub yadda saxlanıldı",
+    "Invalid email" : "Yalnış məktub",
+    "Unable to delete group" : "Qrupu silmək olmur",
+    "Unable to delete user" : "İstifadəçini silmək olmur",
+    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Language changed" : "Dil dəyişdirildi",
+    "Invalid request" : "Səhv müraciət",
+    "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
+    "Unable to add user to group %s" : "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
+    "Unable to remove user from group %s" : "İstifadəçini %s qrupundan silmək mümkün olmadı",
+    "Couldn't update app." : "Proqram təminatını yeniləmək mümkün deyil.",
+    "Wrong password" : "Yalnış şifrə",
+    "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
+    "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
+    "Unable to change password" : "Şifrəni dəyişmək olmur",
+    "Saved" : "Saxlanıldı",
+    "test email settings" : "sınaq məktubu quraşdırmaları",
+    "If you received this email, the settings seem to be correct." : "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
+    "Email sent" : "Məktub göndərildi",
+    "You need to set your user email before being able to send test emails." : "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
+    "Add trusted domain" : "İnamlı domainlərə əlavə et",
+    "Sending..." : "Göndərilir...",
+    "Please wait...." : "Xahiş olunur gözləyəsiniz.",
+    "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi",
+    "Disable" : "Dayandır",
+    "Enable" : "İşə sal",
+    "Error while enabling app" : "Proqram təminatını işə saldıqda səhv baş verdi",
+    "Updating...." : "Yenilənir...",
+    "Error while updating app" : "Proqram təminatı yeniləndikdə səhv baş verdi",
+    "Updated" : "Yeniləndi",
+    "Uninstalling ...." : "Silinir...",
+    "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi",
+    "Uninstall" : "Sil",
+    "Select a profile picture" : "Profil üçün şəkli seç",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
+    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
+    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
+    "Groups" : "Qruplar",
+    "Unable to delete {objName}" : "{objName} silmək olmur",
+    "Error creating group" : "Qrup yaranmasında səhv baş verdi",
+    "A valid group name must be provided" : "Düzgün qrup adı təyin edilməlidir",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geriyə",
+    "never" : "heç vaxt",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "qrupu əlavə et",
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "Error creating user" : "İstifadəçi yaratdıqda səhv baş verdi",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir",
+    "Warning: Home directory for user \"{user}\" already exists" : "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
+    "__language_name__" : "__AZ_Azerbaijan__",
+    "Encryption" : "Şifrələnmə",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
+    "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Errors and fatal issues" : "Səhvlər və ən pis hadisələr",
+    "Fatal issues only" : "Yalnız ən pis hadisələr",
+    "None" : "Heç bir",
+    "Login" : "Giriş",
+    "Plain" : "Adi",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Setup Warning" : "Quruluş xəbərdarlığı",
+    "Database Performance Info" : "Verilənlər  bazasının davamiyyəti məlumatı",
+    "Module 'fileinfo' missing" : "'fileinfo' modulu çatışmır",
+    "Your PHP version is outdated" : "Sizin PHP versiyası köhnəlib",
+    "PHP charset is not set to UTF-8" : "PHP simvol tipi UTF-8 deyil",
+    "Send mode" : "Göndərmə rejimi",
+    "Authentication method" : "Qeydiyyat metodikası",
+    "More" : "Yenə",
+    "by" : "onunla",
+    "User Documentation" : "İstifadəçi sənədləri",
+    "Admin Documentation" : "İnzibatçı sənədləri",
+    "Uninstall App" : "Proqram təminatını sil",
+    "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
+    "Password" : "Şifrə",
+    "Change password" : "Şifrəni dəyiş",
+    "Cancel" : "Dayandır",
+    "Username" : "İstifadəçi adı"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
deleted file mode 100644
index 24c06054c7b..00000000000
--- a/settings/l10n/az.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Təyinat metodikası",
-"Your full name has been changed." => "Sizin tam adınız dəyişdirildi.",
-"Unable to change full name" => "Tam adı dəyişmək olmur",
-"Group already exists" => "Qrup artıq mövcuddur",
-"Unable to add group" => "Qrupu əlavə etmək olmur",
-"Files decrypted successfully" => "Fayllar uğurla deşifrə edildi",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
-"Couldn't decrypt your files, check your password and try again" => "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
-"Encryption keys deleted permanently" => "Şifrələmə açarları həmişəlik silindi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
-"Couldn't remove app." => "Proqram təminatını silmək mümkün olmadı.",
-"Email saved" => "Məktub yadda saxlanıldı",
-"Invalid email" => "Yalnış məktub",
-"Unable to delete group" => "Qrupu silmək olmur",
-"Unable to delete user" => "İstifadəçini silmək olmur",
-"Backups restored successfully" => "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
-"Language changed" => "Dil dəyişdirildi",
-"Invalid request" => "Səhv müraciət",
-"Admins can't remove themself from the admin group" => "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
-"Unable to add user to group %s" => "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
-"Unable to remove user from group %s" => "İstifadəçini %s qrupundan silmək mümkün olmadı",
-"Couldn't update app." => "Proqram təminatını yeniləmək mümkün deyil.",
-"Wrong password" => "Yalnış şifrə",
-"No user supplied" => "Heç bir istifadəçiyə mənimsədilmir",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
-"Wrong admin recovery password. Please check the password and try again." => "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
-"Unable to change password" => "Şifrəni dəyişmək olmur",
-"Saved" => "Saxlanıldı",
-"test email settings" => "sınaq məktubu quraşdırmaları",
-"If you received this email, the settings seem to be correct." => "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
-"Email sent" => "Məktub göndərildi",
-"You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
-"Add trusted domain" => "İnamlı domainlərə əlavə et",
-"Sending..." => "Göndərilir...",
-"Please wait...." => "Xahiş olunur gözləyəsiniz.",
-"Error while disabling app" => "Proqram təminatını dayandırdıqda səhv baş verdi",
-"Disable" => "Dayandır",
-"Enable" => "İşə sal",
-"Error while enabling app" => "Proqram təminatını işə saldıqda səhv baş verdi",
-"Updating...." => "Yenilənir...",
-"Error while updating app" => "Proqram təminatı yeniləndikdə səhv baş verdi",
-"Updated" => "Yeniləndi",
-"Uninstalling ...." => "Silinir...",
-"Error while uninstalling app" => "Proqram təminatını sildikdə səhv baş verdi",
-"Uninstall" => "Sil",
-"Select a profile picture" => "Profil üçün şəkli seç",
-"Very weak password" => "Çox asan şifrə",
-"Weak password" => "Asan şifrə",
-"So-so password" => "Elə-belə şifrə",
-"Good password" => "Yaxşı şifrə",
-"Strong password" => "Çətin şifrə",
-"Delete" => "Sil",
-"Decrypting files... Please wait, this can take some time." => "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
-"Delete encryption keys permanently." => "Şifrələnmə açarlarını həmişəlik sil.",
-"Restore encryption keys." => "Şifrələnmə açarlarını geri qaytar",
-"Groups" => "Qruplar",
-"Unable to delete {objName}" => "{objName} silmək olmur",
-"Error creating group" => "Qrup yaranmasında səhv baş verdi",
-"A valid group name must be provided" => "Düzgün qrup adı təyin edilməlidir",
-"deleted {groupName}" => "{groupName} silindi",
-"undo" => "geriyə",
-"never" => "heç vaxt",
-"deleted {userName}" => "{userName} silindi",
-"add group" => "qrupu əlavə et",
-"A valid username must be provided" => "Düzgün istifadəçi adı daxil edilməlidir",
-"Error creating user" => "İstifadəçi yaratdıqda səhv baş verdi",
-"A valid password must be provided" => "Düzgün şifrə daxil edilməlidir",
-"Warning: Home directory for user \"{user}\" already exists" => "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
-"__language_name__" => "__AZ_Azerbaijan__",
-"Encryption" => "Şifrələnmə",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
-"Info, warnings, errors and fatal issues" => "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
-"Warnings, errors and fatal issues" => "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
-"Errors and fatal issues" => "Səhvlər və ən pis hadisələr",
-"Fatal issues only" => "Yalnız ən pis hadisələr",
-"None" => "Heç bir",
-"Login" => "Giriş",
-"Plain" => "Adi",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Təhlükəsizlik xəbərdarlığı",
-"Setup Warning" => "Quruluş xəbərdarlığı",
-"Database Performance Info" => "Verilənlər  bazasının davamiyyəti məlumatı",
-"Module 'fileinfo' missing" => "'fileinfo' modulu çatışmır",
-"Your PHP version is outdated" => "Sizin PHP versiyası köhnəlib",
-"PHP charset is not set to UTF-8" => "PHP simvol tipi UTF-8 deyil",
-"Send mode" => "Göndərmə rejimi",
-"Authentication method" => "Qeydiyyat metodikası",
-"More" => "Yenə",
-"by" => "onunla",
-"User Documentation" => "İstifadəçi sənədləri",
-"Admin Documentation" => "İnzibatçı sənədləri",
-"Uninstall App" => "Proqram təminatını sil",
-"Get the apps to sync your files" => "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
-"Password" => "Şifrə",
-"Change password" => "Şifrəni dəyiş",
-"Cancel" => "Dayandır",
-"Username" => "İstifadəçi adı"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/be.php b/settings/l10n/be.php
deleted file mode 100644
index 6a34f1fe246..00000000000
--- a/settings/l10n/be.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Памылка"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
new file mode 100644
index 00000000000..b6ef50d19a0
--- /dev/null
+++ b/settings/l10n/bg_BG.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
+    "Authentication error" : "Възникна проблем с идентификацията",
+    "Your full name has been changed." : "Пълното ти име е променено.",
+    "Unable to change full name" : "Неуспешна промяна на пълното име.",
+    "Group already exists" : "Групата вече съществува",
+    "Unable to add group" : "Неуспешно добавяне на група",
+    "Files decrypted successfully" : "Успешно разшифроването на файловете.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
+    "Couldn't decrypt your files, check your password and try again" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
+    "Couldn't remove app." : "Неуспешно премахване на приложението.",
+    "Email saved" : "Имейла запазен",
+    "Invalid email" : "Невалиден имейл",
+    "Unable to delete group" : "Неуспешно изтриване на група",
+    "Unable to delete user" : "Неуспешно изтриване на потребител",
+    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+    "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" : "Неуспешна смяна на паролата.",
+    "Saved" : "Запис",
+    "test email settings" : "провери имейл настройките",
+    "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
+    "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+    "Email sent" : "Имейлът е изпратен",
+    "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
+    "Add trusted domain" : "Добави сигурен домейн",
+    "Sending..." : "Изпращане...",
+    "All" : "Всички",
+    "Please wait...." : "Моля изчакайте....",
+    "Error while disabling app" : "Грешка при изключването на приложението",
+    "Disable" : "Изключено",
+    "Enable" : "Включено",
+    "Error while enabling app" : "Грешка при включване на приложението",
+    "Updating...." : "Обновява се...",
+    "Error while updating app" : "Грешка при обновяване на приложението.",
+    "Updated" : "Обновено",
+    "Uninstalling ...." : "Премахване ...",
+    "Error while uninstalling app" : "Грешка при премахването на приложението.",
+    "Uninstall" : "Премахване",
+    "Select a profile picture" : "Избери аватар",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Valid until {date}" : "Валиден до {date}",
+    "Delete" : "Изтрий",
+    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
+    "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
+    "Restore encryption keys." : "Възстанови криптиращите ключове.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
+    "Error creating group" : "Грешка при създаване на група.",
+    "A valid group name must be provided" : "Очаква се валидно име на група",
+    "deleted {groupName}" : "{groupName} изтрит",
+    "undo" : "възтановяване",
+    "never" : "никога",
+    "deleted {userName}" : "{userName} изтрит",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Криптиране",
+    "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 Manager",
+    "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" : "Предупреждение за Настройките",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.",
+    "Database Performance Info" : "Информацията за Прозиводителност на Базата Данни",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+    "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-type откриването.",
+    "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 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
+    "PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-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.",
+    "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity checks" : "Проверка за свързаност",
+    "No problems found" : "Не са открити проблеми",
+    "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
+    "Cron" : "Крон",
+    "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
+    "Cron was not executed yet!" : "Cron oще не е изпълнен!",
+    "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 минути по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
+    "Sharing" : "Споделяне",
+    "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
+    "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
+    "Enforce password protection" : "Изискай защита с парола.",
+    "Allow public uploads" : "Разреши общодостъпно качване",
+    "Set default expiration date" : "Заложи дата на изтичане по подразбиране",
+    "Expire after " : "Изтечи след",
+    "days" : "дена",
+    "Enforce expiration date" : "Изисквай дата на изтичане",
+    "Allow resharing" : "Разреши пресподеляне.",
+    "Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+    "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
+    "Exclude groups from sharing" : "Забрани групи да споделят",
+    "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
+    "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 задължаването.",
+    "Email Server" : "Имейл Сървър",
+    "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
+    "Send mode" : "Режим на изпращане",
+    "From address" : "От адрес",
+    "mail" : "поща",
+    "Authentication method" : "Метод за отризиране",
+    "Authentication required" : "Нужна е идентификация",
+    "Server address" : "Адрес на сървъра",
+    "Port" : "Порт",
+    "Credentials" : "Потр. име и парола",
+    "SMTP Username" : "SMTP Потребителско Име",
+    "SMTP Password" : "SMTP Парола",
+    "Store credentials" : "Запазвай креденциите",
+    "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>.",
+    "More apps" : "Още приложения",
+    "Add your app" : "Добавете Ваше приложение",
+    "by" : "от",
+    "licensed" : "лицензирано",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Потребителска Документация",
+    "Admin Documentation" : "Админ Документация",
+    "Update to %s" : "Обнови до %s",
+    "Enable only for specific groups" : "Включи само за определени групи",
+    "Uninstall App" : "Премахни Приложението",
+    "Administrator Documentation" : "Административна Документация",
+    "Online Documentation" : "Документация в Интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Докладвани грешки",
+    "Commercial Support" : "Платена Поддръжка",
+    "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
+    "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" : "Текуща парола",
+    "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" : "Помогни с превода",
+    "Common Name" : "Познато Име",
+    "Valid until" : "Валиден до",
+    "Issued By" : "Издаден От",
+    "Valid until %s" : "Валиден до %s",
+    "Import Root Certificate" : "Внасяне на Root Сертификат",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
+    "Log-in password" : "Парола за вписване",
+    "Decrypt all Files" : "Разшифровай всички Файлове",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
+    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
+    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
+    "Show storage location" : "Покажи място за запис",
+    "Show last log in" : "Покажи последно вписване",
+    "Login Name" : "Потребителско Име",
+    "Create" : "Създаване",
+    "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
+    "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+    "Search Users and Groups" : "Търси Потребители и Групи",
+    "Add Group" : "Добави Група",
+    "Group" : "Група",
+    "Everyone" : "Всички",
+    "Admins" : "Администратори",
+    "Default Quota" : "Квота по подразбиране",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друга...",
+    "Username" : "Потребителско Име",
+    "Quota" : "Квота",
+    "Storage Location" : "Място за Запис",
+    "Last Login" : "Последно Вписване",
+    "change full name" : "промени пълното име",
+    "set new password" : "сложи нова парола",
+    "Default" : "По подразбиране"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
new file mode 100644
index 00000000000..363cbe9b374
--- /dev/null
+++ b/settings/l10n/bg_BG.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
+    "Authentication error" : "Възникна проблем с идентификацията",
+    "Your full name has been changed." : "Пълното ти име е променено.",
+    "Unable to change full name" : "Неуспешна промяна на пълното име.",
+    "Group already exists" : "Групата вече съществува",
+    "Unable to add group" : "Неуспешно добавяне на група",
+    "Files decrypted successfully" : "Успешно разшифроването на файловете.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
+    "Couldn't decrypt your files, check your password and try again" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
+    "Couldn't remove app." : "Неуспешно премахване на приложението.",
+    "Email saved" : "Имейла запазен",
+    "Invalid email" : "Невалиден имейл",
+    "Unable to delete group" : "Неуспешно изтриване на група",
+    "Unable to delete user" : "Неуспешно изтриване на потребител",
+    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+    "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" : "Неуспешна смяна на паролата.",
+    "Saved" : "Запис",
+    "test email settings" : "провери имейл настройките",
+    "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
+    "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+    "Email sent" : "Имейлът е изпратен",
+    "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
+    "Add trusted domain" : "Добави сигурен домейн",
+    "Sending..." : "Изпращане...",
+    "All" : "Всички",
+    "Please wait...." : "Моля изчакайте....",
+    "Error while disabling app" : "Грешка при изключването на приложението",
+    "Disable" : "Изключено",
+    "Enable" : "Включено",
+    "Error while enabling app" : "Грешка при включване на приложението",
+    "Updating...." : "Обновява се...",
+    "Error while updating app" : "Грешка при обновяване на приложението.",
+    "Updated" : "Обновено",
+    "Uninstalling ...." : "Премахване ...",
+    "Error while uninstalling app" : "Грешка при премахването на приложението.",
+    "Uninstall" : "Премахване",
+    "Select a profile picture" : "Избери аватар",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Valid until {date}" : "Валиден до {date}",
+    "Delete" : "Изтрий",
+    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
+    "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
+    "Restore encryption keys." : "Възстанови криптиращите ключове.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
+    "Error creating group" : "Грешка при създаване на група.",
+    "A valid group name must be provided" : "Очаква се валидно име на група",
+    "deleted {groupName}" : "{groupName} изтрит",
+    "undo" : "възтановяване",
+    "never" : "никога",
+    "deleted {userName}" : "{userName} изтрит",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Криптиране",
+    "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 Manager",
+    "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" : "Предупреждение за Настройките",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.",
+    "Database Performance Info" : "Информацията за Прозиводителност на Базата Данни",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+    "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-type откриването.",
+    "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 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
+    "PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-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.",
+    "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity checks" : "Проверка за свързаност",
+    "No problems found" : "Не са открити проблеми",
+    "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
+    "Cron" : "Крон",
+    "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
+    "Cron was not executed yet!" : "Cron oще не е изпълнен!",
+    "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 минути по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
+    "Sharing" : "Споделяне",
+    "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
+    "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
+    "Enforce password protection" : "Изискай защита с парола.",
+    "Allow public uploads" : "Разреши общодостъпно качване",
+    "Set default expiration date" : "Заложи дата на изтичане по подразбиране",
+    "Expire after " : "Изтечи след",
+    "days" : "дена",
+    "Enforce expiration date" : "Изисквай дата на изтичане",
+    "Allow resharing" : "Разреши пресподеляне.",
+    "Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+    "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
+    "Exclude groups from sharing" : "Забрани групи да споделят",
+    "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
+    "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 задължаването.",
+    "Email Server" : "Имейл Сървър",
+    "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
+    "Send mode" : "Режим на изпращане",
+    "From address" : "От адрес",
+    "mail" : "поща",
+    "Authentication method" : "Метод за отризиране",
+    "Authentication required" : "Нужна е идентификация",
+    "Server address" : "Адрес на сървъра",
+    "Port" : "Порт",
+    "Credentials" : "Потр. име и парола",
+    "SMTP Username" : "SMTP Потребителско Име",
+    "SMTP Password" : "SMTP Парола",
+    "Store credentials" : "Запазвай креденциите",
+    "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>.",
+    "More apps" : "Още приложения",
+    "Add your app" : "Добавете Ваше приложение",
+    "by" : "от",
+    "licensed" : "лицензирано",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Потребителска Документация",
+    "Admin Documentation" : "Админ Документация",
+    "Update to %s" : "Обнови до %s",
+    "Enable only for specific groups" : "Включи само за определени групи",
+    "Uninstall App" : "Премахни Приложението",
+    "Administrator Documentation" : "Административна Документация",
+    "Online Documentation" : "Документация в Интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Докладвани грешки",
+    "Commercial Support" : "Платена Поддръжка",
+    "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
+    "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" : "Текуща парола",
+    "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" : "Помогни с превода",
+    "Common Name" : "Познато Име",
+    "Valid until" : "Валиден до",
+    "Issued By" : "Издаден От",
+    "Valid until %s" : "Валиден до %s",
+    "Import Root Certificate" : "Внасяне на Root Сертификат",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
+    "Log-in password" : "Парола за вписване",
+    "Decrypt all Files" : "Разшифровай всички Файлове",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
+    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
+    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
+    "Show storage location" : "Покажи място за запис",
+    "Show last log in" : "Покажи последно вписване",
+    "Login Name" : "Потребителско Име",
+    "Create" : "Създаване",
+    "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
+    "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+    "Search Users and Groups" : "Търси Потребители и Групи",
+    "Add Group" : "Добави Група",
+    "Group" : "Група",
+    "Everyone" : "Всички",
+    "Admins" : "Администратори",
+    "Default Quota" : "Квота по подразбиране",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друга...",
+    "Username" : "Потребителско Име",
+    "Quota" : "Квота",
+    "Storage Location" : "Място за Запис",
+    "Last Login" : "Последно Вписване",
+    "change full name" : "промени пълното име",
+    "set new password" : "сложи нова парола",
+    "Default" : "По подразбиране"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
deleted file mode 100644
index 786ad676868..00000000000
--- a/settings/l10n/bg_BG.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Включено",
-"Not enabled" => "Изключено",
-"Recommended" => "Препоръчано",
-"Authentication error" => "Възникна проблем с идентификацията",
-"Your full name has been changed." => "Пълното ти име е променено.",
-"Unable to change full name" => "Неуспешна промяна на пълното име.",
-"Group already exists" => "Групата вече съществува",
-"Unable to add group" => "Неуспешно добавяне на група",
-"Files decrypted successfully" => "Успешно разшифроването на файловете.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
-"Couldn't decrypt your files, check your password and try again" => "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
-"Encryption keys deleted permanently" => "Ключовете за криптиране са безвъзвратно изтрити",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
-"Couldn't remove app." => "Неуспешно премахване на приложението.",
-"Email saved" => "Имейла запазен",
-"Invalid email" => "Невалиден имейл",
-"Unable to delete group" => "Неуспешно изтриване на група",
-"Unable to delete user" => "Неуспешно изтриване на потребител",
-"Backups restored successfully" => "Резервното копие е успешно възстановено.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
-"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" => "Неуспешна смяна на паролата.",
-"Saved" => "Запис",
-"test email settings" => "провери имейл настройките",
-"If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.",
-"A problem occurred while sending the email. Please revise your settings." => "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
-"Email sent" => "Имейлът е изпратен",
-"You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
-"Add trusted domain" => "Добави сигурен домейн",
-"Sending..." => "Изпращане...",
-"All" => "Всички",
-"Please wait...." => "Моля изчакайте....",
-"Error while disabling app" => "Грешка при изключването на приложението",
-"Disable" => "Изключено",
-"Enable" => "Включено",
-"Error while enabling app" => "Грешка при включване на приложението",
-"Updating...." => "Обновява се...",
-"Error while updating app" => "Грешка при обновяване на приложението.",
-"Updated" => "Обновено",
-"Uninstalling ...." => "Премахване ...",
-"Error while uninstalling app" => "Грешка при премахването на приложението.",
-"Uninstall" => "Премахване",
-"Select a profile picture" => "Избери аватар",
-"Very weak password" => "Много слаба парола",
-"Weak password" => "Слаба парола",
-"So-so password" => "Не особено добра парола",
-"Good password" => "Добра парола",
-"Strong password" => "Сигурна парола",
-"Valid until {date}" => "Валиден до {date}",
-"Delete" => "Изтрий",
-"Decrypting files... Please wait, this can take some time." => "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
-"Delete encryption keys permanently." => "Изтрий криптиращите ключове безвъзвратно.",
-"Restore encryption keys." => "Възстанови криптиращите ключове.",
-"Groups" => "Групи",
-"Unable to delete {objName}" => "Неуспешно изтриване на {objName}.",
-"Error creating group" => "Грешка при създаване на група.",
-"A valid group name must be provided" => "Очаква се валидно име на група",
-"deleted {groupName}" => "{groupName} изтрит",
-"undo" => "възтановяване",
-"no group" => "няма група",
-"never" => "никога",
-"deleted {userName}" => "{userName} изтрит",
-"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__" => "__language_name__",
-"Personal Info" => "Лична Информация",
-"SSL root certificates" => "SSL root сертификати",
-"Encryption" => "Криптиране",
-"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 Manager",
-"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" => "Предупреждение за Настройките",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.",
-"Database Performance Info" => "Информацията за Прозиводителност на Базата Данни",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
-"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-type откриването.",
-"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 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
-"PHP charset is not set to UTF-8" => "PHP таблицата от символи не е настроена за UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-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.",
-"URL generation in notification emails" => "Генериране на URL в имейлите за известяване",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
-"Connectivity checks" => "Проверка за свързаност",
-"No problems found" => "Не са открити проблеми",
-"Please double check the <a href='%s'>installation guides</a>." => "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
-"Cron" => "Крон",
-"Last cron was executed at %s." => "Последният cron се изпълни в %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
-"Cron was not executed yet!" => "Cron oще не е изпълнен!",
-"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 минути по http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-"Sharing" => "Споделяне",
-"Allow apps to use the Share API" => "Разреши приложенията да използват Share API.",
-"Allow users to share via link" => "Разреши потребителите да споделят с връзка",
-"Enforce password protection" => "Изискай защита с парола.",
-"Allow public uploads" => "Разреши общодостъпно качване",
-"Set default expiration date" => "Заложи дата на изтичане по подразбиране",
-"Expire after " => "Изтечи след",
-"days" => "дена",
-"Enforce expiration date" => "Изисквай дата на изтичане",
-"Allow resharing" => "Разреши пресподеляне.",
-"Restrict users to only share with users in their groups" => "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
-"Allow users to send mail notification for shared files" => "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
-"Exclude groups from sharing" => "Забрани групи да споделят",
-"These groups will still be able to receive shares, but not to initiate them." => "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
-"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 задължаването.",
-"Email Server" => "Имейл Сървър",
-"This is used for sending out notifications." => "Това се използва за изпращане на уведомления.",
-"Send mode" => "Режим на изпращане",
-"From address" => "От адрес",
-"mail" => "поща",
-"Authentication method" => "Метод за отризиране",
-"Authentication required" => "Нужна е идентификация",
-"Server address" => "Адрес на сървъра",
-"Port" => "Порт",
-"Credentials" => "Потр. име и парола",
-"SMTP Username" => "SMTP Потребителско Име",
-"SMTP Password" => "SMTP Парола",
-"Store credentials" => "Запазвай креденциите",
-"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>.",
-"More apps" => "Още приложения",
-"Add your app" => "Добавете Ваше приложение",
-"by" => "от",
-"licensed" => "лицензирано",
-"Documentation:" => "Документация:",
-"User Documentation" => "Потребителска Документация",
-"Admin Documentation" => "Админ Документация",
-"Update to %s" => "Обнови до %s",
-"Enable only for specific groups" => "Включи само за определени групи",
-"Uninstall App" => "Премахни Приложението",
-"Administrator Documentation" => "Административна Документация",
-"Online Documentation" => "Документация в Интернет",
-"Forum" => "Форум",
-"Bugtracker" => "Докладвани грешки",
-"Commercial Support" => "Платена Поддръжка",
-"Get the apps to sync your files" => "Изтегли програми за синхронизиране на файловете ти",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
-"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" => "Текуща парола",
-"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" => "Помогни с превода",
-"Common Name" => "Познато Име",
-"Valid until" => "Валиден до",
-"Issued By" => "Издаден От",
-"Valid until %s" => "Валиден до %s",
-"Import Root Certificate" => "Внасяне на Root Сертификат",
-"The encryption app is no longer enabled, please decrypt all your files" => "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
-"Log-in password" => "Парола за вписване",
-"Decrypt all Files" => "Разшифровай всички Файлове",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
-"Restore Encryption Keys" => "Възстанови Криптиращи Ключове",
-"Delete Encryption Keys" => "Изтрий Криптиращи Ключове",
-"Show storage location" => "Покажи място за запис",
-"Show last log in" => "Покажи последно вписване",
-"Login Name" => "Потребителско Име",
-"Create" => "Създаване",
-"Admin Recovery Password" => "Възстановяване на Администраторска Парола",
-"Enter the recovery password in order to recover the users files during password change" => "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-"Search Users and Groups" => "Търси Потребители и Групи",
-"Add Group" => "Добави Група",
-"Group" => "Група",
-"Everyone" => "Всички",
-"Admins" => "Администратори",
-"Default Quota" => "Квота по подразбиране",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограничено",
-"Other" => "Друга...",
-"Username" => "Потребителско Име",
-"Group Admin for" => "Групов администратор за",
-"Quota" => "Квота",
-"Storage Location" => "Място за Запис",
-"Last Login" => "Последно Вписване",
-"change full name" => "промени пълното име",
-"set new password" => "сложи нова парола",
-"Default" => "По подразбиране"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
new file mode 100644
index 00000000000..ea607b32c8a
--- /dev/null
+++ b/settings/l10n/bn_BD.js
@@ -0,0 +1,107 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "কার্যকর",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
+    "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
+    "Unable to add group" : "গোষ্ঠী যোগ করা সম্ভব হলো না",
+    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
+    "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
+    "Email saved" : "ই-মেইল সংরক্ষন করা হয়েছে",
+    "Invalid email" : "ই-মেইলটি সঠিক নয়",
+    "Unable to delete group" : "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
+    "Unable to delete user" : "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
+    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
+    "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" : "ব্যবহারকারী দেয়া হয়নি",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+    "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "All" : "সবাই",
+    "Error while disabling app" : "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Disable" : "নিষ্ক্রিয়",
+    "Enable" : "সক্রিয় ",
+    "Error while enabling app" : "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Updating...." : "নবায়ন করা হচ্ছে....",
+    "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
+    "Updated" : "নবায়নকৃত",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
+    "Delete" : "মুছে",
+    "Groups" : "গোষ্ঠীসমূহ",
+    "undo" : "ক্রিয়া প্রত্যাহার",
+    "never" : "কখনোই নয়",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL  রুট সনদপত্র",
+    "Encryption" : "সংকেতায়ন",
+    "None" : "কোনটিই নয়",
+    "Login" : "প্রবেশ",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
+    "No problems found" : "কোন সমস্যা পাওয়া গেল না",
+    "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
+    "Sharing" : "ভাগাভাগিরত",
+    "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
+    "days" : "দিনগুলি",
+    "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
+    "Send mode" : "পাঠানো মোড",
+    "From address" : "হইতে ঠিকানা",
+    "mail" : "মেইল",
+    "Server address" : "সার্ভার ঠিকানা",
+    "Port" : "পোর্ট",
+    "Send email" : "ইমেইল পাঠান ",
+    "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 href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+    "by" : "কর্তৃক",
+    "User Documentation" : "ব্যবহারকারী সহায়িকা",
+    "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" : "বর্তমান কূটশব্দ",
+    "New password" : "নতুন কূটশব্দ",
+    "Change password" : "কূটশব্দ পরিবর্তন করুন",
+    "Email" : "ইমেইল",
+    "Your email address" : "আপনার ই-মেইল ঠিকানা",
+    "Cancel" : "বাতির",
+    "Language" : "ভাষা",
+    "Help translate" : "অনুবাদ করতে সহায়তা করুন",
+    "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
+    "Login Name" : "প্রবেশ",
+    "Create" : "তৈরী কর",
+    "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
+    "Add Group" : "গ্রুপ যোগ কর",
+    "Group" : "গোষ্ঠীসমূহ",
+    "Everyone" : "সকলে",
+    "Admins" : "প্রশাসন",
+    "Unlimited" : "অসীম",
+    "Other" : "অন্যান্য",
+    "Username" : "ব্যবহারকারী",
+    "Quota" : "কোটা",
+    "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
+    "Last Login" : "শেষ লগইন",
+    "change full name" : "পুরোনাম পরিবর্তন করুন",
+    "set new password" : "নতুন কূটশব্দ নির্ধারণ করুন",
+    "Default" : "পূর্বনির্ধারিত"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
new file mode 100644
index 00000000000..337df4cb4bc
--- /dev/null
+++ b/settings/l10n/bn_BD.json
@@ -0,0 +1,105 @@
+{ "translations": {
+    "Enabled" : "কার্যকর",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
+    "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
+    "Unable to add group" : "গোষ্ঠী যোগ করা সম্ভব হলো না",
+    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
+    "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
+    "Email saved" : "ই-মেইল সংরক্ষন করা হয়েছে",
+    "Invalid email" : "ই-মেইলটি সঠিক নয়",
+    "Unable to delete group" : "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
+    "Unable to delete user" : "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
+    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
+    "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" : "ব্যবহারকারী দেয়া হয়নি",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+    "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "All" : "সবাই",
+    "Error while disabling app" : "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Disable" : "নিষ্ক্রিয়",
+    "Enable" : "সক্রিয় ",
+    "Error while enabling app" : "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Updating...." : "নবায়ন করা হচ্ছে....",
+    "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
+    "Updated" : "নবায়নকৃত",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
+    "Delete" : "মুছে",
+    "Groups" : "গোষ্ঠীসমূহ",
+    "undo" : "ক্রিয়া প্রত্যাহার",
+    "never" : "কখনোই নয়",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL  রুট সনদপত্র",
+    "Encryption" : "সংকেতায়ন",
+    "None" : "কোনটিই নয়",
+    "Login" : "প্রবেশ",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
+    "No problems found" : "কোন সমস্যা পাওয়া গেল না",
+    "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
+    "Sharing" : "ভাগাভাগিরত",
+    "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
+    "days" : "দিনগুলি",
+    "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
+    "Send mode" : "পাঠানো মোড",
+    "From address" : "হইতে ঠিকানা",
+    "mail" : "মেইল",
+    "Server address" : "সার্ভার ঠিকানা",
+    "Port" : "পোর্ট",
+    "Send email" : "ইমেইল পাঠান ",
+    "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 href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+    "by" : "কর্তৃক",
+    "User Documentation" : "ব্যবহারকারী সহায়িকা",
+    "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" : "বর্তমান কূটশব্দ",
+    "New password" : "নতুন কূটশব্দ",
+    "Change password" : "কূটশব্দ পরিবর্তন করুন",
+    "Email" : "ইমেইল",
+    "Your email address" : "আপনার ই-মেইল ঠিকানা",
+    "Cancel" : "বাতির",
+    "Language" : "ভাষা",
+    "Help translate" : "অনুবাদ করতে সহায়তা করুন",
+    "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
+    "Login Name" : "প্রবেশ",
+    "Create" : "তৈরী কর",
+    "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
+    "Add Group" : "গ্রুপ যোগ কর",
+    "Group" : "গোষ্ঠীসমূহ",
+    "Everyone" : "সকলে",
+    "Admins" : "প্রশাসন",
+    "Unlimited" : "অসীম",
+    "Other" : "অন্যান্য",
+    "Username" : "ব্যবহারকারী",
+    "Quota" : "কোটা",
+    "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
+    "Last Login" : "শেষ লগইন",
+    "change full name" : "পুরোনাম পরিবর্তন করুন",
+    "set new password" : "নতুন কূটশব্দ নির্ধারণ করুন",
+    "Default" : "পূর্বনির্ধারিত"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
deleted file mode 100644
index 58839489eab..00000000000
--- a/settings/l10n/bn_BD.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "কার্যকর",
-"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
-"Your full name has been changed." => "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
-"Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
-"Unable to add group" => "গোষ্ঠী যোগ করা সম্ভব হলো না",
-"Files decrypted successfully" => "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
-"Couldn't remove app." => "অ্যাপ অপসারণ করা গেলনা",
-"Email saved" => "ই-মেইল সংরক্ষন করা হয়েছে",
-"Invalid email" => "ই-মেইলটি সঠিক নয়",
-"Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
-"Unable to delete user" => "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
-"Backups restored successfully" => "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
-"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" => "ব্যবহারকারী দেয়া হয়নি",
-"Saved" => "সংরক্ষণ করা হলো",
-"test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
-"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
-"Email sent" => "ই-মেইল পাঠানো হয়েছে",
-"All" => "সবাই",
-"Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
-"Disable" => "নিষ্ক্রিয়",
-"Enable" => "সক্রিয় ",
-"Error while enabling app" => "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
-"Updating...." => "নবায়ন করা হচ্ছে....",
-"Error while updating app" => "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
-"Updated" => "নবায়নকৃত",
-"Strong password" => "শক্তিশালী কুটশব্দ",
-"Valid until {date}" => "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
-"Delete" => "মুছে",
-"Groups" => "গোষ্ঠীসমূহ",
-"undo" => "ক্রিয়া প্রত্যাহার",
-"never" => "কখনোই নয়",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL  রুট সনদপত্র",
-"Encryption" => "সংকেতায়ন",
-"None" => "কোনটিই নয়",
-"Login" => "প্রবেশ",
-"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
-"Module 'fileinfo' missing" => "'fileinfo' মডিউল নেই",
-"No problems found" => "কোন সমস্যা পাওয়া গেল না",
-"Please double check the <a href='%s'>installation guides</a>." => "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
-"Sharing" => "ভাগাভাগিরত",
-"Expire after " => "এরপর মেয়াদোত্তীর্ণ হও",
-"days" => "দিনগুলি",
-"Enforce expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
-"Security" => "নিরাপত্তা",
-"Email Server" => "ইমেইল সার্ভার",
-"Send mode" => "পাঠানো মোড",
-"From address" => "হইতে ঠিকানা",
-"mail" => "মেইল",
-"Server address" => "সার্ভার ঠিকানা",
-"Port" => "পোর্ট",
-"Send email" => "ইমেইল পাঠান ",
-"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 href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
-"by" => "কর্তৃক",
-"User Documentation" => "ব্যবহারকারী সহায়িকা",
-"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" => "বর্তমান কূটশব্দ",
-"New password" => "নতুন কূটশব্দ",
-"Change password" => "কূটশব্দ পরিবর্তন করুন",
-"Email" => "ইমেইল",
-"Your email address" => "আপনার ই-মেইল ঠিকানা",
-"Cancel" => "বাতির",
-"Language" => "ভাষা",
-"Help translate" => "অনুবাদ করতে সহায়তা করুন",
-"Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন",
-"Login Name" => "প্রবেশ",
-"Create" => "তৈরী কর",
-"Admin Recovery Password" => "প্রশাসক পূণরূদ্ধার কুটশব্দ",
-"Add Group" => "গ্রুপ যোগ কর",
-"Group" => "গোষ্ঠীসমূহ",
-"Everyone" => "সকলে",
-"Admins" => "প্রশাসন",
-"Unlimited" => "অসীম",
-"Other" => "অন্যান্য",
-"Username" => "ব্যবহারকারী",
-"Quota" => "কোটা",
-"Storage Location" => "সংরক্ষণাগার এর অবস্থান",
-"Last Login" => "শেষ লগইন",
-"change full name" => "পুরোনাম পরিবর্তন করুন",
-"set new password" => "নতুন কূটশব্দ নির্ধারণ করুন",
-"Default" => "পূর্বনির্ধারিত"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_IN.js b/settings/l10n/bn_IN.js
new file mode 100644
index 00000000000..7552436f21f
--- /dev/null
+++ b/settings/l10n/bn_IN.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Saved" : "সংরক্ষিত",
+    "Delete" : "মুছে ফেলা",
+    "by" : "দ্বারা",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
+    "Cancel" : "বাতিল করা",
+    "Username" : "ইউজারনেম"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bn_IN.json b/settings/l10n/bn_IN.json
new file mode 100644
index 00000000000..7ec4ea67aa4
--- /dev/null
+++ b/settings/l10n/bn_IN.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Saved" : "সংরক্ষিত",
+    "Delete" : "মুছে ফেলা",
+    "by" : "দ্বারা",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
+    "Cancel" : "বাতিল করা",
+    "Username" : "ইউজারনেম"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php
deleted file mode 100644
index 160df13779d..00000000000
--- a/settings/l10n/bn_IN.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Saved" => "সংরক্ষিত",
-"Delete" => "মুছে ফেলা",
-"by" => "দ্বারা",
-"Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
-"Cancel" => "বাতিল করা",
-"Username" => "ইউজারনেম"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
deleted file mode 100644
index 708e045adeb..00000000000
--- a/settings/l10n/bs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Saving..." => "Spašavam..."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
new file mode 100644
index 00000000000..a234364aeb9
--- /dev/null
+++ b/settings/l10n/ca.js
@@ -0,0 +1,214 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activat",
+    "Authentication error" : "Error d'autenticació",
+    "Your full name has been changed." : "El vostre nom complet ha canviat.",
+    "Unable to change full name" : "No s'ha pogut canviar el nom complet",
+    "Group already exists" : "El grup ja existeix",
+    "Unable to add group" : "No es pot afegir el grup",
+    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
+    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
+    "Email saved" : "S'ha desat el correu electrònic",
+    "Invalid email" : "El correu electrònic no és vàlid",
+    "Unable to delete group" : "No es pot eliminar el grup",
+    "Unable to delete user" : "No es pot eliminar l'usuari",
+    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Language changed" : "S'ha canviat l'idioma",
+    "Invalid request" : "Sol·licitud no vàlida",
+    "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
+    "Unable to add user to group %s" : "No es pot afegir l'usuari al grup %s",
+    "Unable to remove user from group %s" : "No es pot eliminar l'usuari del grup %s",
+    "Couldn't update app." : "No s'ha pogut actualitzar l'aplicació.",
+    "Wrong password" : "Contrasenya incorrecta",
+    "No user supplied" : "No heu proporcionat cap usuari",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
+    "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",
+    "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.",
+    "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.",
+    "Sending..." : "Enviant...",
+    "All" : "Tots",
+    "Please wait...." : "Espereu...",
+    "Error while disabling app" : "Error en desactivar l'aplicació",
+    "Disable" : "Desactiva",
+    "Enable" : "Habilita",
+    "Error while enabling app" : "Error en activar l'aplicació",
+    "Updating...." : "Actualitzant...",
+    "Error while updating app" : "Error en actualitzar l'aplicació",
+    "Updated" : "Actualitzada",
+    "Uninstalling ...." : "Desintal·lant ...",
+    "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
+    "Uninstall" : "Desinstal·la",
+    "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",
+    "Delete" : "Esborra",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
+    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
+    "Restore encryption keys." : "Esborra les claus d'encripació.",
+    "Groups" : "Grups",
+    "Unable to delete {objName}" : "No es pot eliminar {objName}",
+    "Error creating group" : "Error en crear el grup",
+    "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
+    "deleted {groupName}" : "eliminat {groupName}",
+    "undo" : "desfés",
+    "never" : "mai",
+    "deleted {userName}" : "eliminat {userName}",
+    "add group" : "afegeix grup",
+    "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
+    "Error creating user" : "Error en crear l'usuari",
+    "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
+    "__language_name__" : "Català",
+    "SSL root certificates" : "Certificats SSL root",
+    "Encryption" : "Xifrat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
+    "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
+    "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.",
+    "Setup Warning" : "Avís de configuració",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informació del rendiment de la base de dades",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
+    "Cron was not executed yet!" : "El cron encara no s'ha executat!",
+    "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Sharing" : "Compartir",
+    "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
+    "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
+    "Enforce password protection" : "Reforça la protecció amb contrasenya",
+    "Allow public uploads" : "Permet pujada pública",
+    "Set default expiration date" : "Estableix la data de venciment",
+    "Expire after " : "Venciment després de",
+    "days" : "dies",
+    "Enforce expiration date" : "Força la data de venciment",
+    "Allow resharing" : "Permet compartir de nou",
+    "Restrict users to only share with users in their groups" : "Permet als usuaris compartir només amb usuaris del seu grup",
+    "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
+    "Exclude groups from sharing" : "Exclou grups de compartició",
+    "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
+    "Security" : "Seguretat",
+    "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.",
+    "Send mode" : "Mode d'enviament",
+    "From address" : "Des de l'adreça",
+    "mail" : "correu electrònic",
+    "Authentication method" : "Mètode d'autenticació",
+    "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",
+    "Less" : "Menys",
+    "Version" : "Versió",
+    "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Més aplicacions",
+    "by" : "per",
+    "Documentation:" : "Documentació:",
+    "User Documentation" : "Documentació d'usuari",
+    "Admin Documentation" : "Documentació d'administrador",
+    "Enable only for specific groups" : "Activa només per grups específics",
+    "Uninstall App" : "Desinstal·la l'aplicació",
+    "Administrator Documentation" : "Documentació d'administrador",
+    "Online Documentation" : "Documentació en línia",
+    "Forum" : "Fòrum",
+    "Bugtracker" : "Seguiment d'errors",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
+    "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
+    "Password" : "Contrasenya",
+    "Your password was changed" : "La seva contrasenya s'ha canviat",
+    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
+    "Current password" : "Contrasenya actual",
+    "New password" : "Contrasenya nova",
+    "Change password" : "Canvia la contrasenya",
+    "Full Name" : "Nom complet",
+    "Email" : "Correu electrònic",
+    "Your email address" : "Correu electrònic",
+    "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.",
+    "Cancel" : "Cancel·la",
+    "Choose as profile image" : "Selecciona com a imatge de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajudeu-nos amb la traducció",
+    "Import Root Certificate" : "Importa certificat root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
+    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
+    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Login Name" : "Nom d'accés",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users and Groups" : "Cerca usuaris i grups",
+    "Add Group" : "Afegeix grup",
+    "Group" : "Grup",
+    "Everyone" : "Tothom",
+    "Admins" : "Administradors",
+    "Default Quota" : "Quota per defecte",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Il·limitat",
+    "Other" : "Un altre",
+    "Username" : "Nom d'usuari",
+    "Quota" : "Quota",
+    "Storage Location" : "Ubicació de l'emmagatzemament",
+    "Last Login" : "Últim accés",
+    "change full name" : "canvia el nom complet",
+    "set new password" : "estableix nova contrasenya",
+    "Default" : "Per defecte"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
new file mode 100644
index 00000000000..47847ab92b1
--- /dev/null
+++ b/settings/l10n/ca.json
@@ -0,0 +1,212 @@
+{ "translations": {
+    "Enabled" : "Activat",
+    "Authentication error" : "Error d'autenticació",
+    "Your full name has been changed." : "El vostre nom complet ha canviat.",
+    "Unable to change full name" : "No s'ha pogut canviar el nom complet",
+    "Group already exists" : "El grup ja existeix",
+    "Unable to add group" : "No es pot afegir el grup",
+    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
+    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
+    "Email saved" : "S'ha desat el correu electrònic",
+    "Invalid email" : "El correu electrònic no és vàlid",
+    "Unable to delete group" : "No es pot eliminar el grup",
+    "Unable to delete user" : "No es pot eliminar l'usuari",
+    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Language changed" : "S'ha canviat l'idioma",
+    "Invalid request" : "Sol·licitud no vàlida",
+    "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
+    "Unable to add user to group %s" : "No es pot afegir l'usuari al grup %s",
+    "Unable to remove user from group %s" : "No es pot eliminar l'usuari del grup %s",
+    "Couldn't update app." : "No s'ha pogut actualitzar l'aplicació.",
+    "Wrong password" : "Contrasenya incorrecta",
+    "No user supplied" : "No heu proporcionat cap usuari",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
+    "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",
+    "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.",
+    "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.",
+    "Sending..." : "Enviant...",
+    "All" : "Tots",
+    "Please wait...." : "Espereu...",
+    "Error while disabling app" : "Error en desactivar l'aplicació",
+    "Disable" : "Desactiva",
+    "Enable" : "Habilita",
+    "Error while enabling app" : "Error en activar l'aplicació",
+    "Updating...." : "Actualitzant...",
+    "Error while updating app" : "Error en actualitzar l'aplicació",
+    "Updated" : "Actualitzada",
+    "Uninstalling ...." : "Desintal·lant ...",
+    "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
+    "Uninstall" : "Desinstal·la",
+    "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",
+    "Delete" : "Esborra",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
+    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
+    "Restore encryption keys." : "Esborra les claus d'encripació.",
+    "Groups" : "Grups",
+    "Unable to delete {objName}" : "No es pot eliminar {objName}",
+    "Error creating group" : "Error en crear el grup",
+    "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
+    "deleted {groupName}" : "eliminat {groupName}",
+    "undo" : "desfés",
+    "never" : "mai",
+    "deleted {userName}" : "eliminat {userName}",
+    "add group" : "afegeix grup",
+    "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
+    "Error creating user" : "Error en crear l'usuari",
+    "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
+    "__language_name__" : "Català",
+    "SSL root certificates" : "Certificats SSL root",
+    "Encryption" : "Xifrat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
+    "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
+    "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.",
+    "Setup Warning" : "Avís de configuració",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informació del rendiment de la base de dades",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
+    "Cron was not executed yet!" : "El cron encara no s'ha executat!",
+    "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Sharing" : "Compartir",
+    "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
+    "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
+    "Enforce password protection" : "Reforça la protecció amb contrasenya",
+    "Allow public uploads" : "Permet pujada pública",
+    "Set default expiration date" : "Estableix la data de venciment",
+    "Expire after " : "Venciment després de",
+    "days" : "dies",
+    "Enforce expiration date" : "Força la data de venciment",
+    "Allow resharing" : "Permet compartir de nou",
+    "Restrict users to only share with users in their groups" : "Permet als usuaris compartir només amb usuaris del seu grup",
+    "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
+    "Exclude groups from sharing" : "Exclou grups de compartició",
+    "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
+    "Security" : "Seguretat",
+    "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.",
+    "Send mode" : "Mode d'enviament",
+    "From address" : "Des de l'adreça",
+    "mail" : "correu electrònic",
+    "Authentication method" : "Mètode d'autenticació",
+    "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",
+    "Less" : "Menys",
+    "Version" : "Versió",
+    "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Més aplicacions",
+    "by" : "per",
+    "Documentation:" : "Documentació:",
+    "User Documentation" : "Documentació d'usuari",
+    "Admin Documentation" : "Documentació d'administrador",
+    "Enable only for specific groups" : "Activa només per grups específics",
+    "Uninstall App" : "Desinstal·la l'aplicació",
+    "Administrator Documentation" : "Documentació d'administrador",
+    "Online Documentation" : "Documentació en línia",
+    "Forum" : "Fòrum",
+    "Bugtracker" : "Seguiment d'errors",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
+    "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
+    "Password" : "Contrasenya",
+    "Your password was changed" : "La seva contrasenya s'ha canviat",
+    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
+    "Current password" : "Contrasenya actual",
+    "New password" : "Contrasenya nova",
+    "Change password" : "Canvia la contrasenya",
+    "Full Name" : "Nom complet",
+    "Email" : "Correu electrònic",
+    "Your email address" : "Correu electrònic",
+    "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.",
+    "Cancel" : "Cancel·la",
+    "Choose as profile image" : "Selecciona com a imatge de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajudeu-nos amb la traducció",
+    "Import Root Certificate" : "Importa certificat root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
+    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
+    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Login Name" : "Nom d'accés",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users and Groups" : "Cerca usuaris i grups",
+    "Add Group" : "Afegeix grup",
+    "Group" : "Grup",
+    "Everyone" : "Tothom",
+    "Admins" : "Administradors",
+    "Default Quota" : "Quota per defecte",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Il·limitat",
+    "Other" : "Un altre",
+    "Username" : "Nom d'usuari",
+    "Quota" : "Quota",
+    "Storage Location" : "Ubicació de l'emmagatzemament",
+    "Last Login" : "Últim accés",
+    "change full name" : "canvia el nom complet",
+    "set new password" : "estableix nova contrasenya",
+    "Default" : "Per defecte"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
deleted file mode 100644
index 19fb76d29a2..00000000000
--- a/settings/l10n/ca.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activat",
-"Authentication error" => "Error d'autenticació",
-"Your full name has been changed." => "El vostre nom complet ha canviat.",
-"Unable to change full name" => "No s'ha pogut canviar el nom complet",
-"Group already exists" => "El grup ja existeix",
-"Unable to add group" => "No es pot afegir el grup",
-"Files decrypted successfully" => "Els fitxers s'han desencriptat amb èxit",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Couldn't decrypt your files, check your password and try again" => "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
-"Encryption keys deleted permanently" => "Les claus d'encriptació s'han esborrat permanentment",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Couldn't remove app." => "No s'ha pogut eliminar l'aplicació",
-"Email saved" => "S'ha desat el correu electrònic",
-"Invalid email" => "El correu electrònic no és vàlid",
-"Unable to delete group" => "No es pot eliminar el grup",
-"Unable to delete user" => "No es pot eliminar l'usuari",
-"Backups restored successfully" => "Les còpies de seguretat s'han restablert correctament",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Language changed" => "S'ha canviat l'idioma",
-"Invalid request" => "Sol·licitud no vàlida",
-"Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
-"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
-"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
-"Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.",
-"Wrong password" => "Contrasenya incorrecta",
-"No user supplied" => "No heu proporcionat cap usuari",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
-"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",
-"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.",
-"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.",
-"Sending..." => "Enviant...",
-"All" => "Tots",
-"Please wait...." => "Espereu...",
-"Error while disabling app" => "Error en desactivar l'aplicació",
-"Disable" => "Desactiva",
-"Enable" => "Habilita",
-"Error while enabling app" => "Error en activar l'aplicació",
-"Updating...." => "Actualitzant...",
-"Error while updating app" => "Error en actualitzar l'aplicació",
-"Updated" => "Actualitzada",
-"Uninstalling ...." => "Desintal·lant ...",
-"Error while uninstalling app" => "Error en desinstal·lar l'aplicació",
-"Uninstall" => "Desinstal·la",
-"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",
-"Delete" => "Esborra",
-"Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-"Delete encryption keys permanently." => "Esborra les claus d'encriptació permanentment.",
-"Restore encryption keys." => "Esborra les claus d'encripació.",
-"Groups" => "Grups",
-"Unable to delete {objName}" => "No es pot eliminar {objName}",
-"Error creating group" => "Error en crear el grup",
-"A valid group name must be provided" => "Heu de facilitar un nom de grup vàlid",
-"deleted {groupName}" => "eliminat {groupName}",
-"undo" => "desfés",
-"never" => "mai",
-"deleted {userName}" => "eliminat {userName}",
-"add group" => "afegeix grup",
-"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
-"Error creating user" => "Error en crear l'usuari",
-"A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
-"__language_name__" => "Català",
-"SSL root certificates" => "Certificats SSL root",
-"Encryption" => "Xifrat",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tot (problemes fatals, errors, avisos, informació, depuració)",
-"Info, warnings, errors and fatal issues" => "Informació, avisos, errors i problemes fatals",
-"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.",
-"Setup Warning" => "Avís de configuració",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Informació del rendiment de la base de dades",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
-"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.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
-"Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "L'últim cron s'ha executat el %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
-"Cron was not executed yet!" => "El cron encara no s'ha executat!",
-"Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
-"Sharing" => "Compartir",
-"Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
-"Allow users to share via link" => "Permet als usuaris compartir a través d'enllaços",
-"Enforce password protection" => "Reforça la protecció amb contrasenya",
-"Allow public uploads" => "Permet pujada pública",
-"Set default expiration date" => "Estableix la data de venciment",
-"Expire after " => "Venciment després de",
-"days" => "dies",
-"Enforce expiration date" => "Força la data de venciment",
-"Allow resharing" => "Permet compartir de nou",
-"Restrict users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
-"Allow users to send mail notification for shared files" => "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
-"Exclude groups from sharing" => "Exclou grups de compartició",
-"These groups will still be able to receive shares, but not to initiate them." => "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
-"Security" => "Seguretat",
-"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.",
-"Send mode" => "Mode d'enviament",
-"From address" => "Des de l'adreça",
-"mail" => "correu electrònic",
-"Authentication method" => "Mètode d'autenticació",
-"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",
-"Less" => "Menys",
-"Version" => "Versió",
-"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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Més aplicacions",
-"by" => "per",
-"Documentation:" => "Documentació:",
-"User Documentation" => "Documentació d'usuari",
-"Admin Documentation" => "Documentació d'administrador",
-"Enable only for specific groups" => "Activa només per grups específics",
-"Uninstall App" => "Desinstal·la l'aplicació",
-"Administrator Documentation" => "Documentació d'administrador",
-"Online Documentation" => "Documentació en línia",
-"Forum" => "Fòrum",
-"Bugtracker" => "Seguiment d'errors",
-"Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
-"Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
-"Password" => "Contrasenya",
-"Your password was changed" => "La seva contrasenya s'ha canviat",
-"Unable to change your password" => "No s'ha pogut canviar la contrasenya",
-"Current password" => "Contrasenya actual",
-"New password" => "Contrasenya nova",
-"Change password" => "Canvia la contrasenya",
-"Full Name" => "Nom complet",
-"Email" => "Correu electrònic",
-"Your email address" => "Correu electrònic",
-"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.",
-"Cancel" => "Cancel·la",
-"Choose as profile image" => "Selecciona com a imatge de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajudeu-nos amb la traducció",
-"Import Root Certificate" => "Importa certificat root",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
-"Restore Encryption Keys" => "Restableix les claus d'encriptació",
-"Delete Encryption Keys" => "Esborra les claus d'encriptació",
-"Login Name" => "Nom d'accés",
-"Create" => "Crea",
-"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-"Search Users and Groups" => "Cerca usuaris i grups",
-"Add Group" => "Afegeix grup",
-"Group" => "Grup",
-"Everyone" => "Tothom",
-"Admins" => "Administradors",
-"Default Quota" => "Quota per defecte",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Il·limitat",
-"Other" => "Un altre",
-"Username" => "Nom d'usuari",
-"Quota" => "Quota",
-"Storage Location" => "Ubicació de l'emmagatzemament",
-"Last Login" => "Últim accés",
-"change full name" => "canvia el nom complet",
-"set new password" => "estableix nova contrasenya",
-"Default" => "Per defecte"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
new file mode 100644
index 00000000000..df2c43b6b8d
--- /dev/null
+++ b/settings/l10n/cs_CZ.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
+    "Authentication error" : "Chyba přihlášení",
+    "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
+    "Unable to change full name" : "Nelze změnit celé jméno",
+    "Group already exists" : "Skupina již existuje",
+    "Unable to add group" : "Nelze přidat skupinu",
+    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
+    "Email saved" : "E-mail uložen",
+    "Invalid email" : "Neplatný e-mail",
+    "Unable to delete group" : "Nelze smazat skupinu",
+    "Unable to delete user" : "Nelze smazat uživatele",
+    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Language changed" : "Jazyk byl změněn",
+    "Invalid request" : "Neplatný požadavek",
+    "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
+    "Unable to add user to group %s" : "Nelze přidat uživatele do skupiny %s",
+    "Unable to remove user from group %s" : "Nelze odebrat uživatele ze skupiny %s",
+    "Couldn't update app." : "Nelze aktualizovat aplikaci.",
+    "Wrong password" : "Nesprávné heslo",
+    "No user supplied" : "Nebyl uveden uživatel",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
+    "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",
+    "Saved" : "Uloženo",
+    "test email settings" : "otestovat nastavení e-mailu",
+    "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+    "A problem occurred while sending the email. Please revise your settings." : "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
+    "Email sent" : "E-mail odeslán",
+    "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
+    "Add trusted domain" : "Přidat důvěryhodnou doménu",
+    "Sending..." : "Odesílání...",
+    "All" : "Vše",
+    "Please wait...." : "Čekejte prosím...",
+    "Error while disabling app" : "Chyba při zakazování aplikace",
+    "Disable" : "Zakázat",
+    "Enable" : "Povolit",
+    "Error while enabling app" : "Chyba při povolování aplikace",
+    "Updating...." : "Aktualizuji...",
+    "Error while updating app" : "Chyba při aktualizaci aplikace",
+    "Updated" : "Aktualizováno",
+    "Uninstalling ...." : "Probíhá odinstalace ...",
+    "Error while uninstalling app" : "Chyba při odinstalaci aplikace",
+    "Uninstall" : "Odinstalovat",
+    "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",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Smazat",
+    "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.",
+    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
+    "Restore encryption keys." : "Obnovit šifrovací klíče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nelze smazat {objName}",
+    "Error creating group" : "Chyba při vytváření skupiny",
+    "A valid group name must be provided" : "Musíte zadat platný název skupiny",
+    "deleted {groupName}" : "smazána {groupName}",
+    "undo" : "vrátit zpět",
+    "no group" : "není ve skupině",
+    "never" : "nikdy",
+    "deleted {userName}" : "smazán {userName}",
+    "add group" : "přidat skupinu",
+    "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
+    "Error creating user" : "Chyba při vytváření užiatele",
+    "A valid password must be provided" : "Musíte zadat platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varování: Osobní složka uživatele \"{user}\" již existuje.",
+    "__language_name__" : "Česky",
+    "Personal Info" : "Osobní informace",
+    "SSL root certificates" : "Kořenové certifikáty SSL",
+    "Encryption" : "Šifrování",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "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",
+    "Plain" : "Čistý text",
+    "NT LAN Manager" : "Správce NT LAN",
+    "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.",
+    "Setup Warning" : "Upozornění nastavení",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
+    "Database Performance Info" : "Informace o výkonu databáze",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+    "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" : "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ě.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP není nastavena na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
+    "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ů.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
+    "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity checks" : "Ověřování připojení",
+    "No problems found" : "Nebyly nalezeny žádné problémy",
+    "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
+    "Sharing" : "Sdílení",
+    "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
+    "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
+    "Enforce password protection" : "Vynutit ochranu heslem",
+    "Allow public uploads" : "Povolit veřejné nahrávání souborů",
+    "Set default expiration date" : "Nastavit výchozí datum vypršení platnosti",
+    "Expire after " : "Vyprší po",
+    "days" : "dnech",
+    "Enforce expiration date" : "Vynutit datum vypršení",
+    "Allow resharing" : "Povolit znovu-sdílení",
+    "Restrict users to only share with users in their groups" : "Povolit sdílení pouze mezi uživateli v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
+    "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
+    "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
+    "Security" : "Zabezpečení",
+    "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 přes HTTPS pro povolení nebo zakázání vynucení SSL.",
+    "Email Server" : "E-mailový server",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "From address" : "Adresa odesílatele",
+    "mail" : "e-mail",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Otestovat nastavení e-mailu",
+    "Send email" : "Odeslat e-mail",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň zaznamenávání",
+    "More" : "Více",
+    "Less" : "Méně",
+    "Version" : "Verze",
+    "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>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Více aplikací",
+    "Add your app" : "Přidat vlastní aplikaci",
+    "by" : "sdílí",
+    "licensed" : "licencováno",
+    "Documentation:" : "Dokumentace:",
+    "User Documentation" : "Uživatelská dokumentace",
+    "Admin Documentation" : "Dokumentace pro administrátory",
+    "Update to %s" : "Aktualizovat na %s",
+    "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
+    "Uninstall App" : "Odinstalovat aplikaci",
+    "Administrator Documentation" : "Dokumentace správce",
+    "Online Documentation" : "Online dokumentace",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Placená podpora",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bylo změněno",
+    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
+    "Current password" : "Současné heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Změnit heslo",
+    "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 and receive notifications" : "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
+    "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.",
+    "Cancel" : "Zrušit",
+    "Choose as profile image" : "Vybrat jako profilový obrázek",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomoci s překladem",
+    "Common Name" : "Common Name",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Import kořenového certifikátu",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
+    "Delete Encryption Keys" : "Smazat šifrovací klíče",
+    "Show storage location" : "Zobrazit umístění úložiště",
+    "Show last log in" : "Zobrazit poslední přihlášení",
+    "Login Name" : "Přihlašovací jméno",
+    "Create" : "Vytvořit",
+    "Admin Recovery Password" : "Heslo obnovy správce",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users and Groups" : "Prohledat uživatele a skupiny",
+    "Add Group" : "Přidat skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všichni",
+    "Admins" : "Administrátoři",
+    "Default Quota" : "Výchozí kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
+    "Unlimited" : "Neomezeně",
+    "Other" : "Jiný",
+    "Username" : "Uživatelské jméno",
+    "Group Admin for" : "Administrátor skupiny ",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umístění úložiště",
+    "Last Login" : "Poslední přihlášení",
+    "change full name" : "změnit celé jméno",
+    "set new password" : "nastavit nové heslo",
+    "Default" : "Výchozí"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
new file mode 100644
index 00000000000..cb124e02c6a
--- /dev/null
+++ b/settings/l10n/cs_CZ.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
+    "Authentication error" : "Chyba přihlášení",
+    "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
+    "Unable to change full name" : "Nelze změnit celé jméno",
+    "Group already exists" : "Skupina již existuje",
+    "Unable to add group" : "Nelze přidat skupinu",
+    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
+    "Email saved" : "E-mail uložen",
+    "Invalid email" : "Neplatný e-mail",
+    "Unable to delete group" : "Nelze smazat skupinu",
+    "Unable to delete user" : "Nelze smazat uživatele",
+    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Language changed" : "Jazyk byl změněn",
+    "Invalid request" : "Neplatný požadavek",
+    "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
+    "Unable to add user to group %s" : "Nelze přidat uživatele do skupiny %s",
+    "Unable to remove user from group %s" : "Nelze odebrat uživatele ze skupiny %s",
+    "Couldn't update app." : "Nelze aktualizovat aplikaci.",
+    "Wrong password" : "Nesprávné heslo",
+    "No user supplied" : "Nebyl uveden uživatel",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
+    "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",
+    "Saved" : "Uloženo",
+    "test email settings" : "otestovat nastavení e-mailu",
+    "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+    "A problem occurred while sending the email. Please revise your settings." : "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
+    "Email sent" : "E-mail odeslán",
+    "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
+    "Add trusted domain" : "Přidat důvěryhodnou doménu",
+    "Sending..." : "Odesílání...",
+    "All" : "Vše",
+    "Please wait...." : "Čekejte prosím...",
+    "Error while disabling app" : "Chyba při zakazování aplikace",
+    "Disable" : "Zakázat",
+    "Enable" : "Povolit",
+    "Error while enabling app" : "Chyba při povolování aplikace",
+    "Updating...." : "Aktualizuji...",
+    "Error while updating app" : "Chyba při aktualizaci aplikace",
+    "Updated" : "Aktualizováno",
+    "Uninstalling ...." : "Probíhá odinstalace ...",
+    "Error while uninstalling app" : "Chyba při odinstalaci aplikace",
+    "Uninstall" : "Odinstalovat",
+    "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",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Smazat",
+    "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.",
+    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
+    "Restore encryption keys." : "Obnovit šifrovací klíče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nelze smazat {objName}",
+    "Error creating group" : "Chyba při vytváření skupiny",
+    "A valid group name must be provided" : "Musíte zadat platný název skupiny",
+    "deleted {groupName}" : "smazána {groupName}",
+    "undo" : "vrátit zpět",
+    "no group" : "není ve skupině",
+    "never" : "nikdy",
+    "deleted {userName}" : "smazán {userName}",
+    "add group" : "přidat skupinu",
+    "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
+    "Error creating user" : "Chyba při vytváření užiatele",
+    "A valid password must be provided" : "Musíte zadat platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varování: Osobní složka uživatele \"{user}\" již existuje.",
+    "__language_name__" : "Česky",
+    "Personal Info" : "Osobní informace",
+    "SSL root certificates" : "Kořenové certifikáty SSL",
+    "Encryption" : "Šifrování",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "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",
+    "Plain" : "Čistý text",
+    "NT LAN Manager" : "Správce NT LAN",
+    "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.",
+    "Setup Warning" : "Upozornění nastavení",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
+    "Database Performance Info" : "Informace o výkonu databáze",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+    "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" : "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ě.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP není nastavena na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
+    "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ů.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
+    "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity checks" : "Ověřování připojení",
+    "No problems found" : "Nebyly nalezeny žádné problémy",
+    "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
+    "Sharing" : "Sdílení",
+    "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
+    "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
+    "Enforce password protection" : "Vynutit ochranu heslem",
+    "Allow public uploads" : "Povolit veřejné nahrávání souborů",
+    "Set default expiration date" : "Nastavit výchozí datum vypršení platnosti",
+    "Expire after " : "Vyprší po",
+    "days" : "dnech",
+    "Enforce expiration date" : "Vynutit datum vypršení",
+    "Allow resharing" : "Povolit znovu-sdílení",
+    "Restrict users to only share with users in their groups" : "Povolit sdílení pouze mezi uživateli v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
+    "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
+    "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
+    "Security" : "Zabezpečení",
+    "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 přes HTTPS pro povolení nebo zakázání vynucení SSL.",
+    "Email Server" : "E-mailový server",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "From address" : "Adresa odesílatele",
+    "mail" : "e-mail",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Otestovat nastavení e-mailu",
+    "Send email" : "Odeslat e-mail",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň zaznamenávání",
+    "More" : "Více",
+    "Less" : "Méně",
+    "Version" : "Verze",
+    "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>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Více aplikací",
+    "Add your app" : "Přidat vlastní aplikaci",
+    "by" : "sdílí",
+    "licensed" : "licencováno",
+    "Documentation:" : "Dokumentace:",
+    "User Documentation" : "Uživatelská dokumentace",
+    "Admin Documentation" : "Dokumentace pro administrátory",
+    "Update to %s" : "Aktualizovat na %s",
+    "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
+    "Uninstall App" : "Odinstalovat aplikaci",
+    "Administrator Documentation" : "Dokumentace správce",
+    "Online Documentation" : "Online dokumentace",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Placená podpora",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bylo změněno",
+    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
+    "Current password" : "Současné heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Změnit heslo",
+    "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 and receive notifications" : "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
+    "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.",
+    "Cancel" : "Zrušit",
+    "Choose as profile image" : "Vybrat jako profilový obrázek",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomoci s překladem",
+    "Common Name" : "Common Name",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Import kořenového certifikátu",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
+    "Delete Encryption Keys" : "Smazat šifrovací klíče",
+    "Show storage location" : "Zobrazit umístění úložiště",
+    "Show last log in" : "Zobrazit poslední přihlášení",
+    "Login Name" : "Přihlašovací jméno",
+    "Create" : "Vytvořit",
+    "Admin Recovery Password" : "Heslo obnovy správce",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users and Groups" : "Prohledat uživatele a skupiny",
+    "Add Group" : "Přidat skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všichni",
+    "Admins" : "Administrátoři",
+    "Default Quota" : "Výchozí kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
+    "Unlimited" : "Neomezeně",
+    "Other" : "Jiný",
+    "Username" : "Uživatelské jméno",
+    "Group Admin for" : "Administrátor skupiny ",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umístění úložiště",
+    "Last Login" : "Poslední přihlášení",
+    "change full name" : "změnit celé jméno",
+    "set new password" : "nastavit nové heslo",
+    "Default" : "Výchozí"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
deleted file mode 100644
index 0b003082c50..00000000000
--- a/settings/l10n/cs_CZ.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Povoleno",
-"Not enabled" => "Vypnuto",
-"Recommended" => "Doporučeno",
-"Authentication error" => "Chyba přihlášení",
-"Your full name has been changed." => "Vaše celé jméno bylo změněno.",
-"Unable to change full name" => "Nelze změnit celé jméno",
-"Group already exists" => "Skupina již existuje",
-"Unable to add group" => "Nelze přidat skupinu",
-"Files decrypted successfully" => "Soubory úspěšně dešifrovány",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
-"Couldn't decrypt your files, check your password and try again" => "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
-"Encryption keys deleted permanently" => "Šifrovací klíče trvale smazány",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
-"Couldn't remove app." => "Nepodařilo se odebrat aplikaci.",
-"Email saved" => "E-mail uložen",
-"Invalid email" => "Neplatný e-mail",
-"Unable to delete group" => "Nelze smazat skupinu",
-"Unable to delete user" => "Nelze smazat uživatele",
-"Backups restored successfully" => "Zálohy úspěšně obnoveny",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
-"Language changed" => "Jazyk byl změněn",
-"Invalid request" => "Neplatný požadavek",
-"Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
-"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
-"Unable to remove user from group %s" => "Nelze odebrat uživatele ze skupiny %s",
-"Couldn't update app." => "Nelze aktualizovat aplikaci.",
-"Wrong password" => "Nesprávné heslo",
-"No user supplied" => "Nebyl uveden uživatel",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
-"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",
-"Saved" => "Uloženo",
-"test email settings" => "otestovat nastavení e-mailu",
-"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
-"A problem occurred while sending the email. Please revise your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
-"Email sent" => "E-mail odeslán",
-"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
-"Add trusted domain" => "Přidat důvěryhodnou doménu",
-"Sending..." => "Odesílání...",
-"All" => "Vše",
-"Please wait...." => "Čekejte prosím...",
-"Error while disabling app" => "Chyba při zakazování aplikace",
-"Disable" => "Zakázat",
-"Enable" => "Povolit",
-"Error while enabling app" => "Chyba při povolování aplikace",
-"Updating...." => "Aktualizuji...",
-"Error while updating app" => "Chyba při aktualizaci aplikace",
-"Updated" => "Aktualizováno",
-"Uninstalling ...." => "Probíhá odinstalace ...",
-"Error while uninstalling app" => "Chyba při odinstalaci aplikace",
-"Uninstall" => "Odinstalovat",
-"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",
-"Valid until {date}" => "Platný do {date}",
-"Delete" => "Smazat",
-"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.",
-"Delete encryption keys permanently." => "Trvale smazat šifrovací klíče.",
-"Restore encryption keys." => "Obnovit šifrovací klíče.",
-"Groups" => "Skupiny",
-"Unable to delete {objName}" => "Nelze smazat {objName}",
-"Error creating group" => "Chyba při vytváření skupiny",
-"A valid group name must be provided" => "Musíte zadat platný název skupiny",
-"deleted {groupName}" => "smazána {groupName}",
-"undo" => "vrátit zpět",
-"no group" => "není ve skupině",
-"never" => "nikdy",
-"deleted {userName}" => "smazán {userName}",
-"add group" => "přidat skupinu",
-"A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
-"Error creating user" => "Chyba při vytváření užiatele",
-"A valid password must be provided" => "Musíte zadat platné heslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Varování: Osobní složka uživatele \"{user}\" již existuje.",
-"__language_name__" => "Česky",
-"Personal Info" => "Osobní informace",
-"SSL root certificates" => "Kořenové certifikáty SSL",
-"Encryption" => "Šifrování",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Vše (fatální problémy, chyby, varování, informační, ladící)",
-"Info, warnings, errors and fatal issues" => "Informace, varování, chyby a fatální problémy",
-"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",
-"Plain" => "Čistý text",
-"NT LAN Manager" => "Správce NT LAN",
-"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.",
-"Setup Warning" => "Upozornění nastavení",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
-"Database Performance Info" => "Informace o výkonu databáze",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
-"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" => "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ě.",
-"PHP charset is not set to UTF-8" => "Znaková sada PHP není nastavena na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
-"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ů.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
-"URL generation in notification emails" => "Generování adresy URL v oznamovacích e-mailech",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwritewebroot\" (Doporučujeme: \"%s\")",
-"Connectivity checks" => "Ověřování připojení",
-"No problems found" => "Nebyly nalezeny žádné problémy",
-"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
-"Cron was not executed yet!" => "Cron ještě nebyl spuštěn!",
-"Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-"Sharing" => "Sdílení",
-"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
-"Allow users to share via link" => "Povolit uživatelům sdílení pomocí odkazů",
-"Enforce password protection" => "Vynutit ochranu heslem",
-"Allow public uploads" => "Povolit veřejné nahrávání souborů",
-"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
-"Expire after " => "Vyprší po",
-"days" => "dnech",
-"Enforce expiration date" => "Vynutit datum vypršení",
-"Allow resharing" => "Povolit znovu-sdílení",
-"Restrict users to only share with users in their groups" => "Povolit sdílení pouze mezi uživateli v rámci skupiny",
-"Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
-"Exclude groups from sharing" => "Vyjmout skupiny ze sdílení",
-"These groups will still be able to receive shares, but not to initiate them." => "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
-"Security" => "Zabezpečení",
-"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 přes HTTPS pro povolení nebo zakázání vynucení SSL.",
-"Email Server" => "E-mailový server",
-"This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
-"Send mode" => "Mód odesílání",
-"From address" => "Adresa odesílatele",
-"mail" => "e-mail",
-"Authentication method" => "Metoda ověření",
-"Authentication required" => "Vyžadováno ověření",
-"Server address" => "Adresa serveru",
-"Port" => "Port",
-"Credentials" => "Přihlašovací údaje",
-"SMTP Username" => "SMTP uživatelské jméno ",
-"SMTP Password" => "SMTP heslo",
-"Store credentials" => "Ukládat přihlašovací údaje",
-"Test email settings" => "Otestovat nastavení e-mailu",
-"Send email" => "Odeslat e-mail",
-"Log" => "Záznam",
-"Log level" => "Úroveň zaznamenávání",
-"More" => "Více",
-"Less" => "Méně",
-"Version" => "Verze",
-"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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Více aplikací",
-"Add your app" => "Přidat vlastní aplikaci",
-"by" => "sdílí",
-"licensed" => "licencováno",
-"Documentation:" => "Dokumentace:",
-"User Documentation" => "Uživatelská dokumentace",
-"Admin Documentation" => "Dokumentace pro administrátory",
-"Update to %s" => "Aktualizovat na %s",
-"Enable only for specific groups" => "Povolit pouze pro vybrané skupiny",
-"Uninstall App" => "Odinstalovat aplikaci",
-"Administrator Documentation" => "Dokumentace správce",
-"Online Documentation" => "Online dokumentace",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Placená podpora",
-"Get the apps to sync your files" => "Získat aplikace pro synchronizaci vašich souborů",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
-"Show First Run Wizard again" => "Znovu zobrazit průvodce prvním spuštěním",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
-"Password" => "Heslo",
-"Your password was changed" => "Vaše heslo bylo změněno",
-"Unable to change your password" => "Změna vašeho hesla se nezdařila",
-"Current password" => "Současné heslo",
-"New password" => "Nové heslo",
-"Change password" => "Změnit heslo",
-"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 and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
-"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.",
-"Cancel" => "Zrušit",
-"Choose as profile image" => "Vybrat jako profilový obrázek",
-"Language" => "Jazyk",
-"Help translate" => "Pomoci s překladem",
-"Common Name" => "Common Name",
-"Valid until" => "Platný do",
-"Issued By" => "Vydal",
-"Valid until %s" => "Platný do %s",
-"Import Root Certificate" => "Import kořenového certifikátu",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-"Restore Encryption Keys" => "Obnovit šifrovací klíče",
-"Delete Encryption Keys" => "Smazat šifrovací klíče",
-"Show storage location" => "Zobrazit umístění úložiště",
-"Show last log in" => "Zobrazit poslední přihlášení",
-"Login Name" => "Přihlašovací jméno",
-"Create" => "Vytvořit",
-"Admin Recovery Password" => "Heslo obnovy správce",
-"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-"Search Users and Groups" => "Prohledat uživatele a skupiny",
-"Add Group" => "Přidat skupinu",
-"Group" => "Skupina",
-"Everyone" => "Všichni",
-"Admins" => "Administrátoři",
-"Default Quota" => "Výchozí kvóta",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
-"Unlimited" => "Neomezeně",
-"Other" => "Jiný",
-"Username" => "Uživatelské jméno",
-"Group Admin for" => "Administrátor skupiny ",
-"Quota" => "Kvóta",
-"Storage Location" => "Umístění úložiště",
-"Last Login" => "Poslední přihlášení",
-"change full name" => "změnit celé jméno",
-"set new password" => "nastavit nové heslo",
-"Default" => "Výchozí"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/cy_GB.js b/settings/l10n/cy_GB.js
new file mode 100644
index 00000000000..b51574b8130
--- /dev/null
+++ b/settings/l10n/cy_GB.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Gwall dilysu",
+    "Invalid request" : "Cais annilys",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Delete" : "Dileu",
+    "Groups" : "Grwpiau",
+    "undo" : "dadwneud",
+    "never" : "byth",
+    "Encryption" : "Amgryptiad",
+    "None" : "Dim",
+    "Login" : "Mewngofnodi",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Please double check the <a href='%s'>installation guides</a>." : "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+    "by" : "gan",
+    "Password" : "Cyfrinair",
+    "New password" : "Cyfrinair newydd",
+    "Email" : "E-bost",
+    "Cancel" : "Diddymu",
+    "Login Name" : "Mewngofnodi",
+    "Other" : "Arall",
+    "Username" : "Enw defnyddiwr"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/settings/l10n/cy_GB.json b/settings/l10n/cy_GB.json
new file mode 100644
index 00000000000..67709cc704d
--- /dev/null
+++ b/settings/l10n/cy_GB.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Authentication error" : "Gwall dilysu",
+    "Invalid request" : "Cais annilys",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Delete" : "Dileu",
+    "Groups" : "Grwpiau",
+    "undo" : "dadwneud",
+    "never" : "byth",
+    "Encryption" : "Amgryptiad",
+    "None" : "Dim",
+    "Login" : "Mewngofnodi",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Please double check the <a href='%s'>installation guides</a>." : "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+    "by" : "gan",
+    "Password" : "Cyfrinair",
+    "New password" : "Cyfrinair newydd",
+    "Email" : "E-bost",
+    "Cancel" : "Diddymu",
+    "Login Name" : "Mewngofnodi",
+    "Other" : "Arall",
+    "Username" : "Enw defnyddiwr"
+},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
deleted file mode 100644
index 22f740c86b7..00000000000
--- a/settings/l10n/cy_GB.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Gwall dilysu",
-"Invalid request" => "Cais annilys",
-"Email sent" => "Anfonwyd yr e-bost",
-"Delete" => "Dileu",
-"Groups" => "Grwpiau",
-"undo" => "dadwneud",
-"never" => "byth",
-"Encryption" => "Amgryptiad",
-"None" => "Dim",
-"Login" => "Mewngofnodi",
-"Security Warning" => "Rhybudd Diogelwch",
-"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
-"by" => "gan",
-"Password" => "Cyfrinair",
-"New password" => "Cyfrinair newydd",
-"Email" => "E-bost",
-"Cancel" => "Diddymu",
-"Login Name" => "Mewngofnodi",
-"Other" => "Arall",
-"Username" => "Enw defnyddiwr"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
new file mode 100644
index 00000000000..a0c4b88e131
--- /dev/null
+++ b/settings/l10n/da.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
+    "Authentication error" : "Adgangsfejl",
+    "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
+    "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
+    "Group already exists" : "Gruppen findes allerede",
+    "Unable to add group" : "Gruppen kan ikke oprettes",
+    "Files decrypted successfully" : "Filer dekrypteret med succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
+    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
+    "Couldn't remove app." : "Kunne ikke fjerne app'en.",
+    "Email saved" : "E-mailadressen er gemt",
+    "Invalid email" : "Ugyldig e-mailadresse",
+    "Unable to delete group" : "Gruppen kan ikke slettes",
+    "Unable to delete user" : "Bruger kan ikke slettes",
+    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
+    "Language changed" : "Sprog ændret",
+    "Invalid request" : "Ugyldig forespørgsel",
+    "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
+    "Unable to add user to group %s" : "Brugeren kan ikke tilføjes til gruppen %s",
+    "Unable to remove user from group %s" : "Brugeren kan ikke fjernes fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke opdatere app'en.",
+    "Wrong password" : "Forkert kodeord",
+    "No user supplied" : "Intet brugernavn givet",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
+    "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",
+    "Saved" : "Gemt",
+    "test email settings" : "test e-mailindstillinger",
+    "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
+    "Email sent" : "E-mail afsendt",
+    "You need to set your user email before being able to send test emails." : "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
+    "Add trusted domain" : "Tilføj et domæne som du har tillid til",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vent venligst...",
+    "Error while disabling app" : "Kunne ikke deaktivere app",
+    "Disable" : "Deaktiver",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Kunne ikke aktivere app",
+    "Updating...." : "Opdaterer....",
+    "Error while updating app" : "Der opstod en fejl under app opgraderingen",
+    "Updated" : "Opdateret",
+    "Uninstalling ...." : "Afinstallerer...",
+    "Error while uninstalling app" : "Fejl under afinstallering af app",
+    "Uninstall" : "Afinstallér",
+    "Select a profile picture" : "Vælg et profilbillede",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Valid until {date}" : "Gyldig indtil {date}",
+    "Delete" : "Slet",
+    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
+    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
+    "Restore encryption keys." : "Genopret krypteringsnøgler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunne ikke slette {objName}",
+    "Error creating group" : "Fejl ved oprettelse af gruppe",
+    "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
+    "deleted {groupName}" : "slettede {groupName}",
+    "undo" : "fortryd",
+    "never" : "aldrig",
+    "deleted {userName}" : "slettede {userName}",
+    "add group" : "Tilføj gruppe",
+    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
+    "Error creating user" : "Fejl ved oprettelse af bruger",
+    "A valid password must be provided" : "En gyldig adgangskode skal angives",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
+    "__language_name__" : "Dansk",
+    "Personal Info" : "Personlige oplysninger",
+    "SSL root certificates" : "SSL-rodcertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
+    "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",
+    "Plain" : "Klartekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.  ",
+    "Setup Warning" : "Opsætnings Advarsel",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
+    "Database Performance Info" : "Database Performance Oplysninger",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
+    "Your PHP version is outdated" : "Din PHP-version er forældet",
+    "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." : "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Landestandard fungerer ikke",
+    "System locale can not be set to a one which supports UTF-8." : "Systemets locale kan ikke sættes til et der bruger UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
+    "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity checks" : "Tjek for forbindelsen",
+    "No problems found" : "Der blev ikke fundet problemer",
+    "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
+    "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
+    "Allow users to share via link" : "Tillad brugere at dele via link",
+    "Enforce password protection" : "tving kodeords beskyttelse",
+    "Allow public uploads" : "Tillad offentlig upload",
+    "Set default expiration date" : "Vælg standard udløbsdato",
+    "Expire after " : "Udløber efter",
+    "days" : "dage",
+    "Enforce expiration date" : "Påtving udløbsdato",
+    "Allow resharing" : "Tillad videredeling",
+    "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+    "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
+    "Exclude groups from sharing" : "Ekskluder grupper fra at dele",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
+    "Security" : "Sikkerhed",
+    "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.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
+    "Send mode" : "Tilstand for afsendelse",
+    "From address" : "Fra adresse",
+    "mail" : "mail",
+    "Authentication method" : "Godkendelsesmetode",
+    "Authentication required" : "Godkendelse påkrævet",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Brugeroplysninger",
+    "SMTP Username" : "SMTP Brugernavn",
+    "SMTP Password" : "SMTP Kodeord",
+    "Store credentials" : "Gem brugeroplysninger",
+    "Test email settings" : "Test e-mail-indstillinger",
+    "Send email" : "Send e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Mere",
+    "Less" : "Mindre",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Flere programmer",
+    "Add your app" : "Tilføj din app",
+    "by" : "af",
+    "licensed" : "licenseret",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Brugerdokumentation",
+    "Admin Documentation" : "Administrator Dokumentation",
+    "Update to %s" : "Opdatér til %s",
+    "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
+    "Uninstall App" : "Afinstallér app",
+    "Administrator Documentation" : "Administrator Dokumentation",
+    "Online Documentation" : "Online dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerciel support",
+    "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
+    "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+    "Password" : "Kodeord",
+    "Your password was changed" : "Din adgangskode blev ændret",
+    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
+    "Current password" : "Nuværende adgangskode",
+    "New password" : "Nyt kodeord",
+    "Change password" : "Skift kodeord",
+    "Full Name" : "Fulde navn",
+    "Email" : "E-mail",
+    "Your email address" : "Din e-mailadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+    "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.",
+    "Cancel" : "Annuller",
+    "Choose as profile image" : "Vælg som profilbillede",
+    "Language" : "Sprog",
+    "Help translate" : "Hjælp med oversættelsen",
+    "Common Name" : "Almindeligt navn",
+    "Valid until" : "Gyldig indtil",
+    "Issued By" : "Udstedt af",
+    "Valid until %s" : "Gyldig indtil %s",
+    "Import Root Certificate" : "Importer rodcertifikat",
+    "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 ",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
+    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
+    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
+    "Show storage location" : "Vis placering af lageret",
+    "Show last log in" : "Vis seneste login",
+    "Login Name" : "Loginnavn",
+    "Create" : "Ny",
+    "Admin Recovery Password" : "Administrator gendannelse kodeord",
+    "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users and Groups" : "Søg efter brugere og grupper",
+    "Add Group" : "Tilføj Gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratore",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrænset",
+    "Other" : "Andet",
+    "Username" : "Brugernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Placering af lageret",
+    "Last Login" : "Seneste login",
+    "change full name" : "ændre fulde navn",
+    "set new password" : "skift kodeord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
new file mode 100644
index 00000000000..328acf78808
--- /dev/null
+++ b/settings/l10n/da.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
+    "Authentication error" : "Adgangsfejl",
+    "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
+    "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
+    "Group already exists" : "Gruppen findes allerede",
+    "Unable to add group" : "Gruppen kan ikke oprettes",
+    "Files decrypted successfully" : "Filer dekrypteret med succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
+    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
+    "Couldn't remove app." : "Kunne ikke fjerne app'en.",
+    "Email saved" : "E-mailadressen er gemt",
+    "Invalid email" : "Ugyldig e-mailadresse",
+    "Unable to delete group" : "Gruppen kan ikke slettes",
+    "Unable to delete user" : "Bruger kan ikke slettes",
+    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
+    "Language changed" : "Sprog ændret",
+    "Invalid request" : "Ugyldig forespørgsel",
+    "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
+    "Unable to add user to group %s" : "Brugeren kan ikke tilføjes til gruppen %s",
+    "Unable to remove user from group %s" : "Brugeren kan ikke fjernes fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke opdatere app'en.",
+    "Wrong password" : "Forkert kodeord",
+    "No user supplied" : "Intet brugernavn givet",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
+    "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",
+    "Saved" : "Gemt",
+    "test email settings" : "test e-mailindstillinger",
+    "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
+    "Email sent" : "E-mail afsendt",
+    "You need to set your user email before being able to send test emails." : "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
+    "Add trusted domain" : "Tilføj et domæne som du har tillid til",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vent venligst...",
+    "Error while disabling app" : "Kunne ikke deaktivere app",
+    "Disable" : "Deaktiver",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Kunne ikke aktivere app",
+    "Updating...." : "Opdaterer....",
+    "Error while updating app" : "Der opstod en fejl under app opgraderingen",
+    "Updated" : "Opdateret",
+    "Uninstalling ...." : "Afinstallerer...",
+    "Error while uninstalling app" : "Fejl under afinstallering af app",
+    "Uninstall" : "Afinstallér",
+    "Select a profile picture" : "Vælg et profilbillede",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Valid until {date}" : "Gyldig indtil {date}",
+    "Delete" : "Slet",
+    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
+    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
+    "Restore encryption keys." : "Genopret krypteringsnøgler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunne ikke slette {objName}",
+    "Error creating group" : "Fejl ved oprettelse af gruppe",
+    "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
+    "deleted {groupName}" : "slettede {groupName}",
+    "undo" : "fortryd",
+    "never" : "aldrig",
+    "deleted {userName}" : "slettede {userName}",
+    "add group" : "Tilføj gruppe",
+    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
+    "Error creating user" : "Fejl ved oprettelse af bruger",
+    "A valid password must be provided" : "En gyldig adgangskode skal angives",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
+    "__language_name__" : "Dansk",
+    "Personal Info" : "Personlige oplysninger",
+    "SSL root certificates" : "SSL-rodcertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
+    "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",
+    "Plain" : "Klartekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.  ",
+    "Setup Warning" : "Opsætnings Advarsel",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
+    "Database Performance Info" : "Database Performance Oplysninger",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
+    "Your PHP version is outdated" : "Din PHP-version er forældet",
+    "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." : "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Landestandard fungerer ikke",
+    "System locale can not be set to a one which supports UTF-8." : "Systemets locale kan ikke sættes til et der bruger UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
+    "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity checks" : "Tjek for forbindelsen",
+    "No problems found" : "Der blev ikke fundet problemer",
+    "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
+    "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
+    "Allow users to share via link" : "Tillad brugere at dele via link",
+    "Enforce password protection" : "tving kodeords beskyttelse",
+    "Allow public uploads" : "Tillad offentlig upload",
+    "Set default expiration date" : "Vælg standard udløbsdato",
+    "Expire after " : "Udløber efter",
+    "days" : "dage",
+    "Enforce expiration date" : "Påtving udløbsdato",
+    "Allow resharing" : "Tillad videredeling",
+    "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+    "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
+    "Exclude groups from sharing" : "Ekskluder grupper fra at dele",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
+    "Security" : "Sikkerhed",
+    "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.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
+    "Send mode" : "Tilstand for afsendelse",
+    "From address" : "Fra adresse",
+    "mail" : "mail",
+    "Authentication method" : "Godkendelsesmetode",
+    "Authentication required" : "Godkendelse påkrævet",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Brugeroplysninger",
+    "SMTP Username" : "SMTP Brugernavn",
+    "SMTP Password" : "SMTP Kodeord",
+    "Store credentials" : "Gem brugeroplysninger",
+    "Test email settings" : "Test e-mail-indstillinger",
+    "Send email" : "Send e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Mere",
+    "Less" : "Mindre",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Flere programmer",
+    "Add your app" : "Tilføj din app",
+    "by" : "af",
+    "licensed" : "licenseret",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Brugerdokumentation",
+    "Admin Documentation" : "Administrator Dokumentation",
+    "Update to %s" : "Opdatér til %s",
+    "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
+    "Uninstall App" : "Afinstallér app",
+    "Administrator Documentation" : "Administrator Dokumentation",
+    "Online Documentation" : "Online dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerciel support",
+    "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
+    "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+    "Password" : "Kodeord",
+    "Your password was changed" : "Din adgangskode blev ændret",
+    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
+    "Current password" : "Nuværende adgangskode",
+    "New password" : "Nyt kodeord",
+    "Change password" : "Skift kodeord",
+    "Full Name" : "Fulde navn",
+    "Email" : "E-mail",
+    "Your email address" : "Din e-mailadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+    "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.",
+    "Cancel" : "Annuller",
+    "Choose as profile image" : "Vælg som profilbillede",
+    "Language" : "Sprog",
+    "Help translate" : "Hjælp med oversættelsen",
+    "Common Name" : "Almindeligt navn",
+    "Valid until" : "Gyldig indtil",
+    "Issued By" : "Udstedt af",
+    "Valid until %s" : "Gyldig indtil %s",
+    "Import Root Certificate" : "Importer rodcertifikat",
+    "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 ",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
+    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
+    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
+    "Show storage location" : "Vis placering af lageret",
+    "Show last log in" : "Vis seneste login",
+    "Login Name" : "Loginnavn",
+    "Create" : "Ny",
+    "Admin Recovery Password" : "Administrator gendannelse kodeord",
+    "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users and Groups" : "Søg efter brugere og grupper",
+    "Add Group" : "Tilføj Gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratore",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrænset",
+    "Other" : "Andet",
+    "Username" : "Brugernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Placering af lageret",
+    "Last Login" : "Seneste login",
+    "change full name" : "ændre fulde navn",
+    "set new password" : "skift kodeord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
deleted file mode 100644
index 814f809e10e..00000000000
--- a/settings/l10n/da.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiveret",
-"Not enabled" => "Slået fra",
-"Recommended" => "Anbefalet",
-"Authentication error" => "Adgangsfejl",
-"Your full name has been changed." => "Dit fulde navn er blevet ændret.",
-"Unable to change full name" => "Ikke i stand til at ændre dit fulde navn",
-"Group already exists" => "Gruppen findes allerede",
-"Unable to add group" => "Gruppen kan ikke oprettes",
-"Files decrypted successfully" => "Filer dekrypteret med succes",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
-"Encryption keys deleted permanently" => "Krypteringsnøgle slettet permanent",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
-"Couldn't remove app." => "Kunne ikke fjerne app'en.",
-"Email saved" => "E-mailadressen er gemt",
-"Invalid email" => "Ugyldig e-mailadresse",
-"Unable to delete group" => "Gruppen kan ikke slettes",
-"Unable to delete user" => "Bruger kan ikke slettes",
-"Backups restored successfully" => "Genskabelsen af sikkerhedskopierne blev gennemført",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
-"Language changed" => "Sprog ændret",
-"Invalid request" => "Ugyldig forespørgsel",
-"Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
-"Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
-"Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
-"Couldn't update app." => "Kunne ikke opdatere app'en.",
-"Wrong password" => "Forkert kodeord",
-"No user supplied" => "Intet brugernavn givet",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
-"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",
-"Saved" => "Gemt",
-"test email settings" => "test e-mailindstillinger",
-"If you received this email, the settings seem to be correct." => "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
-"A problem occurred while sending the email. Please revise your settings." => "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
-"Email sent" => "E-mail afsendt",
-"You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
-"Add trusted domain" => "Tilføj et domæne som du har tillid til",
-"Sending..." => "Sender...",
-"All" => "Alle",
-"Please wait...." => "Vent venligst...",
-"Error while disabling app" => "Kunne ikke deaktivere app",
-"Disable" => "Deaktiver",
-"Enable" => "Aktiver",
-"Error while enabling app" => "Kunne ikke aktivere app",
-"Updating...." => "Opdaterer....",
-"Error while updating app" => "Der opstod en fejl under app opgraderingen",
-"Updated" => "Opdateret",
-"Uninstalling ...." => "Afinstallerer...",
-"Error while uninstalling app" => "Fejl under afinstallering af app",
-"Uninstall" => "Afinstallér",
-"Select a profile picture" => "Vælg et profilbillede",
-"Very weak password" => "Meget svagt kodeord",
-"Weak password" => "Svagt kodeord",
-"So-so password" => "Jævnt kodeord",
-"Good password" => "Godt kodeord",
-"Strong password" => "Stærkt kodeord",
-"Valid until {date}" => "Gyldig indtil {date}",
-"Delete" => "Slet",
-"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-"Delete encryption keys permanently." => "Slet krypteringsnøgler permanent.",
-"Restore encryption keys." => "Genopret krypteringsnøgler.",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kunne ikke slette {objName}",
-"Error creating group" => "Fejl ved oprettelse af gruppe",
-"A valid group name must be provided" => "Et gyldigt gruppenavn skal angives ",
-"deleted {groupName}" => "slettede {groupName}",
-"undo" => "fortryd",
-"no group" => "ingen gruppe",
-"never" => "aldrig",
-"deleted {userName}" => "slettede {userName}",
-"add group" => "Tilføj gruppe",
-"A valid username must be provided" => "Et gyldigt brugernavn skal angives",
-"Error creating user" => "Fejl ved oprettelse af bruger",
-"A valid password must be provided" => "En gyldig adgangskode skal angives",
-"Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
-"__language_name__" => "Dansk",
-"Personal Info" => "Personlige oplysninger",
-"SSL root certificates" => "SSL-rodcertifikater",
-"Encryption" => "Kryptering",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, advarsler, fejl og alvorlige fejl",
-"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",
-"Plain" => "Klartekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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.  ",
-"Setup Warning" => "Opsætnings Advarsel",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
-"Database Performance Info" => "Database Performance Oplysninger",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
-"Module 'fileinfo' missing" => "Module 'fileinfo' mangler",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
-"Your PHP version is outdated" => "Din PHP-version er forældet",
-"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." => "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
-"PHP charset is not set to UTF-8" => "PHP-tegnsættet er ikke angivet til UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
-"Locale not working" => "Landestandard fungerer ikke",
-"System locale can not be set to a one which supports UTF-8." => "Systemets locale kan ikke sættes til et der bruger UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Det betyder at der kan være problemer med visse tegn i filnavne.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
-"URL generation in notification emails" => "URL-oprettelse i e-mailnotifikationer.",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
-"Connectivity checks" => "Tjek for forbindelsen",
-"No problems found" => "Der blev ikke fundet problemer",
-"Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Seneste 'cron' blev kørt %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
-"Cron was not executed yet!" => "Cron har ikke kørt endnu!",
-"Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Brug systemets cron service til at kalde cron.php hver 15. minut",
-"Sharing" => "Deling",
-"Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
-"Allow users to share via link" => "Tillad brugere at dele via link",
-"Enforce password protection" => "tving kodeords beskyttelse",
-"Allow public uploads" => "Tillad offentlig upload",
-"Set default expiration date" => "Vælg standard udløbsdato",
-"Expire after " => "Udløber efter",
-"days" => "dage",
-"Enforce expiration date" => "Påtving udløbsdato",
-"Allow resharing" => "Tillad videredeling",
-"Restrict users to only share with users in their groups" => "Begræns brugere til deling med brugere i deres gruppe",
-"Allow users to send mail notification for shared files" => "Tillad brugere at sende mail underretninger for delte filer",
-"Exclude groups from sharing" => "Ekskluder grupper fra at dele",
-"These groups will still be able to receive shares, but not to initiate them." => "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
-"Security" => "Sikkerhed",
-"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.",
-"Email Server" => "E-mailserver",
-"This is used for sending out notifications." => "Dette anvendes til udsendelse af notifikationer.",
-"Send mode" => "Tilstand for afsendelse",
-"From address" => "Fra adresse",
-"mail" => "mail",
-"Authentication method" => "Godkendelsesmetode",
-"Authentication required" => "Godkendelse påkrævet",
-"Server address" => "Serveradresse",
-"Port" => "Port",
-"Credentials" => "Brugeroplysninger",
-"SMTP Username" => "SMTP Brugernavn",
-"SMTP Password" => "SMTP Kodeord",
-"Store credentials" => "Gem brugeroplysninger",
-"Test email settings" => "Test e-mail-indstillinger",
-"Send email" => "Send e-mail",
-"Log" => "Log",
-"Log level" => "Log niveau",
-"More" => "Mere",
-"Less" => "Mindre",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Flere programmer",
-"Add your app" => "Tilføj din app",
-"by" => "af",
-"licensed" => "licenseret",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Brugerdokumentation",
-"Admin Documentation" => "Administrator Dokumentation",
-"Update to %s" => "Opdatér til %s",
-"Enable only for specific groups" => "Aktivér kun for udvalgte grupper",
-"Uninstall App" => "Afinstallér app",
-"Administrator Documentation" => "Administrator Dokumentation",
-"Online Documentation" => "Online dokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommerciel support",
-"Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
-"Show First Run Wizard again" => "Vis guiden for første kørsel igen.",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
-"Password" => "Kodeord",
-"Your password was changed" => "Din adgangskode blev ændret",
-"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
-"Current password" => "Nuværende adgangskode",
-"New password" => "Nyt kodeord",
-"Change password" => "Skift kodeord",
-"Full Name" => "Fulde navn",
-"Email" => "E-mail",
-"Your email address" => "Din e-mailadresse",
-"Fill in an email address to enable password recovery and receive notifications" => "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
-"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.",
-"Cancel" => "Annuller",
-"Choose as profile image" => "Vælg som profilbillede",
-"Language" => "Sprog",
-"Help translate" => "Hjælp med oversættelsen",
-"Common Name" => "Almindeligt navn",
-"Valid until" => "Gyldig indtil",
-"Issued By" => "Udstedt af",
-"Valid until %s" => "Gyldig indtil %s",
-"Import Root Certificate" => "Importer rodcertifikat",
-"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 ",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
-"Restore Encryption Keys" => "Genopret Krypteringsnøgler",
-"Delete Encryption Keys" => "Slet Krypteringsnøgler",
-"Show storage location" => "Vis placering af lageret",
-"Show last log in" => "Vis seneste login",
-"Login Name" => "Loginnavn",
-"Create" => "Ny",
-"Admin Recovery Password" => "Administrator gendannelse kodeord",
-"Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-"Search Users and Groups" => "Søg efter brugere og grupper",
-"Add Group" => "Tilføj Gruppe",
-"Group" => "Gruppe",
-"Everyone" => "Alle",
-"Admins" => "Administratore",
-"Default Quota" => "Standard kvote",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
-"Unlimited" => "Ubegrænset",
-"Other" => "Andet",
-"Username" => "Brugernavn",
-"Group Admin for" => "Gruppeadministrator for",
-"Quota" => "Kvote",
-"Storage Location" => "Placering af lageret",
-"Last Login" => "Seneste login",
-"change full name" => "ændre fulde navn",
-"set new password" => "skift kodeord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
new file mode 100644
index 00000000000..9c686e7f2b7
--- /dev/null
+++ b/settings/l10n/de.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Gruppe existiert bereits",
+    "Unable to add group" : "Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail Adresse",
+    "Unable to delete group" : "Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer übermittelt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+    "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",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Sende...",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten...",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Aktualisierung...",
+    "Error while updating app" : "Fehler beim Aktualisieren der App",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Deinstalliere ....",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "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",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Persönlich)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "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",
+    "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, dass 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öglicherweise 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 ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankperformance",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+    "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",
+    "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." : "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
+    "Locale not working" : "Ländereinstellung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "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.",
+    "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "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.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
+    "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Setze  Ablaufdatum",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaubt erneutes Teilen",
+    "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "Erzwinge HTTPS",
+    "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.",
+    "Send mode" : "Sende-Modus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "Teste E-Mail-Einstellungen",
+    "Send email" : "Sende E-Mail",
+    "Log" : "Log",
+    "Log level" : "Loglevel",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Admin-Dokumentation",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
+    "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Dein Passwort wurde geändert.",
+    "Unable to change your password" : "Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Deine E-Mail-Adresse",
+    "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.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Hilf bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Anlegen",
+    "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
+    "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Nutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standard-Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Quota",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
new file mode 100644
index 00000000000..1d290029d11
--- /dev/null
+++ b/settings/l10n/de.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Gruppe existiert bereits",
+    "Unable to add group" : "Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail Adresse",
+    "Unable to delete group" : "Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer übermittelt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+    "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",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Sende...",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten...",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Aktualisierung...",
+    "Error while updating app" : "Fehler beim Aktualisieren der App",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Deinstalliere ....",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "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",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Persönlich)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "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",
+    "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, dass 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öglicherweise 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 ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankperformance",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+    "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",
+    "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." : "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
+    "Locale not working" : "Ländereinstellung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "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.",
+    "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "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.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
+    "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Setze  Ablaufdatum",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaubt erneutes Teilen",
+    "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "Erzwinge HTTPS",
+    "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.",
+    "Send mode" : "Sende-Modus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "Teste E-Mail-Einstellungen",
+    "Send email" : "Sende E-Mail",
+    "Log" : "Log",
+    "Log level" : "Loglevel",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Admin-Dokumentation",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
+    "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Dein Passwort wurde geändert.",
+    "Unable to change your password" : "Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Deine E-Mail-Adresse",
+    "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.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Hilf bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Anlegen",
+    "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
+    "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Nutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standard-Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Quota",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
deleted file mode 100644
index 19d18f82061..00000000000
--- a/settings/l10n/de.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiviert",
-"Not enabled" => "Nicht aktiviert",
-"Recommended" => "Empfohlen",
-"Authentication error" => "Fehler bei der Anmeldung",
-"Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
-"Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
-"Group already exists" => "Gruppe existiert bereits",
-"Unable to add group" => "Gruppe konnte nicht angelegt werden",
-"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
-"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Couldn't remove app." => "Die App konnte nicht entfernt werden.",
-"Email saved" => "E-Mail Adresse gespeichert",
-"Invalid email" => "Ungültige E-Mail Adresse",
-"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
-"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
-"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Language changed" => "Sprache geändert",
-"Invalid request" => "Fehlerhafte Anfrage",
-"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
-"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.",
-"Wrong password" => "Falsches Passwort",
-"No user supplied" => "Keinen Benutzer übermittelt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
-"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",
-"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 email. Please revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
-"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
-"Sending..." => "Sende...",
-"All" => "Alle",
-"Please wait...." => "Bitte warten...",
-"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
-"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
-"Updating...." => "Aktualisierung...",
-"Error while updating app" => "Fehler beim Aktualisieren der App",
-"Updated" => "Aktualisiert",
-"Uninstalling ...." => "Deinstalliere ....",
-"Error while uninstalling app" => "Fehler beim Deinstallieren der App",
-"Uninstall" => "Deinstallieren",
-"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",
-"Valid until {date}" => "Gültig bis {date}",
-"Delete" => "Löschen",
-"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
-"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
-"Groups" => "Gruppen",
-"Unable to delete {objName}" => "Löschen von {objName} nicht möglich",
-"Error creating group" => "Fehler beim Erstellen der Gruppe",
-"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
-"deleted {groupName}" => "{groupName} gelöscht",
-"undo" => "rückgängig machen",
-"no group" => "Keine Gruppe",
-"never" => "niemals",
-"deleted {userName}" => "{userName} gelöscht",
-"add group" => "Gruppe hinzufügen",
-"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
-"Error creating user" => "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
-"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
-"Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
-"__language_name__" => "Deutsch (Persönlich)",
-"Personal Info" => "Persönliche Informationen",
-"SSL root certificates" => "SSL-Root-Zertifikate",
-"Encryption" => "Verschlüsselung",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
-"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",
-"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, dass 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öglicherweise 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 ausserhalb des Wurzelverzeichnisses des Webservers.",
-"Setup Warning" => "Einrichtungswarnung",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
-"Database Performance Info" => "Info zur Datenbankperformance",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
-"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",
-"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." => "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
-"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
-"Locale not working" => "Ländereinstellung funktioniert nicht",
-"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
-"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.",
-"URL generation in notification emails" => "URL-Generierung in Mail-Benachrichtungen",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
-"Connectivity checks" => "Verbindungsüberprüfungen",
-"No problems found" => "Keine Probleme gefunden",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
-"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
-"Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
-"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.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-"Sharing" => "Teilen",
-"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
-"Allow users to share via link" => "Erlaube Nutzern, mithilfe von Links zu teilen",
-"Enforce password protection" => "Passwortschutz erzwingen",
-"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Set default expiration date" => "Setze  Ablaufdatum",
-"Expire after " => "Ablauf nach ",
-"days" => "Tagen",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Allow resharing" => "Erlaubt erneutes Teilen",
-"Restrict users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
-"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
-"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-"Security" => "Sicherheit",
-"Enforce HTTPS" => "Erzwinge HTTPS",
-"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.",
-"Send mode" => "Sende-Modus",
-"From address" => "Absender-Adresse",
-"mail" => "Mail",
-"Authentication method" => "Authentifizierungsmethode",
-"Authentication required" => "Authentifizierung benötigt",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"Credentials" => "Zugangsdaten",
-"SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwort",
-"Store credentials" => "Anmeldeinformationen speichern",
-"Test email settings" => "Teste E-Mail-Einstellungen",
-"Send email" => "Sende E-Mail",
-"Log" => "Log",
-"Log level" => "Loglevel",
-"More" => "Mehr",
-"Less" => "Weniger",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"More apps" => "Mehr Apps",
-"Add your app" => "Fügen Sie Ihre App hinzu",
-"by" => "von",
-"licensed" => "Lizenziert",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Admin-Dokumentation",
-"Update to %s" => "Aktualisierung auf %s",
-"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
-"Uninstall App" => "App deinstallieren",
-"Administrator Documentation" => "Dokumentation für Administratoren",
-"Online Documentation" => "Online-Dokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommerzieller Support",
-"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
-"Show First Run Wizard again" => "Erstinstallation erneut durchführen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Password" => "Passwort",
-"Your password was changed" => "Dein Passwort wurde geändert.",
-"Unable to change your password" => "Passwort konnte nicht geändert werden",
-"Current password" => "Aktuelles Passwort",
-"New password" => "Neues Passwort",
-"Change password" => "Passwort ändern",
-"Full Name" => "Vollständiger Name",
-"Email" => "E-Mail",
-"Your email address" => "Deine E-Mail-Adresse",
-"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.",
-"Cancel" => "Abbrechen",
-"Choose as profile image" => "Als Profilbild wählen",
-"Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung",
-"Common Name" => "Zuname",
-"Valid until" => "Gültig bis",
-"Issued By" => "Ausgestellt von:",
-"Valid until %s" => "Gültig bis %s",
-"Import Root Certificate" => "Root-Zertifikate importieren",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
-"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
-"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
-"Show storage location" => "Speicherort anzeigen",
-"Show last log in" => "Letzte Anmeldung anzeigen",
-"Login Name" => "Loginname",
-"Create" => "Anlegen",
-"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
-"Enter the recovery password in order to recover the users files during password change" => "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Search Users and Groups" => "Nutzer und Gruppen suchen",
-"Add Group" => "Gruppe hinzufügen",
-"Group" => "Gruppe",
-"Everyone" => "Jeder",
-"Admins" => "Administratoren",
-"Default Quota" => "Standard-Quota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
-"Unlimited" => "Unbegrenzt",
-"Other" => "Andere",
-"Username" => "Benutzername",
-"Group Admin for" => "Gruppenadministrator für",
-"Quota" => "Quota",
-"Storage Location" => "Speicherort",
-"Last Login" => "Letzte Anmeldung",
-"change full name" => "Vollständigen Namen ändern",
-"set new password" => "Neues Passwort setzen",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_AT.js b/settings/l10n/de_AT.js
new file mode 100644
index 00000000000..cbec5214387
--- /dev/null
+++ b/settings/l10n/de_AT.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Delete" : "Löschen",
+    "never" : "niemals",
+    "__language_name__" : "Deutsch (Österreich)",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "Password" : "Passwort",
+    "Email" : "E-Mail",
+    "Cancel" : "Abbrechen",
+    "Other" : "Anderes"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_AT.json b/settings/l10n/de_AT.json
new file mode 100644
index 00000000000..c47cd69e340
--- /dev/null
+++ b/settings/l10n/de_AT.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Delete" : "Löschen",
+    "never" : "niemals",
+    "__language_name__" : "Deutsch (Österreich)",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "Password" : "Passwort",
+    "Email" : "E-Mail",
+    "Cancel" : "Abbrechen",
+    "Other" : "Anderes"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
deleted file mode 100644
index f82d87ef739..00000000000
--- a/settings/l10n/de_AT.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "Fehlerhafte Anfrage",
-"Delete" => "Löschen",
-"never" => "niemals",
-"__language_name__" => "Deutsch (Österreich)",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"More apps" => "Mehr Apps",
-"by" => "von",
-"Password" => "Passwort",
-"Email" => "E-Mail",
-"Cancel" => "Abbrechen",
-"Other" => "Anderes"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js
new file mode 100644
index 00000000000..af913b8d81e
--- /dev/null
+++ b/settings/l10n/de_CH.js
@@ -0,0 +1,102 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiviert",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "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.",
+    "Saved" : "Gespeichert",
+    "Email sent" : "Email gesendet",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Groups" : "Gruppen",
+    "undo" : "rückgängig machen",
+    "never" : "niemals",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "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)",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "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",
+    "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.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow public uploads" : "Erlaube öffentliches hochladen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "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.",
+    "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",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Cancel" : "Abbrechen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_CH.json b/settings/l10n/de_CH.json
new file mode 100644
index 00000000000..ad7338d33b1
--- /dev/null
+++ b/settings/l10n/de_CH.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "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.",
+    "Saved" : "Gespeichert",
+    "Email sent" : "Email gesendet",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Groups" : "Gruppen",
+    "undo" : "rückgängig machen",
+    "never" : "niemals",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "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)",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "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",
+    "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.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow public uploads" : "Erlaube öffentliches hochladen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "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.",
+    "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",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Cancel" : "Abbrechen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
deleted file mode 100644
index 08ff1847dd8..00000000000
--- a/settings/l10n/de_CH.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiviert",
-"Authentication error" => "Authentifizierungs-Fehler",
-"Group already exists" => "Die Gruppe existiert bereits",
-"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
-"Email saved" => "E-Mail-Adresse gespeichert",
-"Invalid email" => "Ungültige E-Mail-Adresse",
-"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
-"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
-"Language changed" => "Sprache geändert",
-"Invalid request" => "Ungültige Anforderung",
-"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-"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.",
-"Saved" => "Gespeichert",
-"Email sent" => "Email gesendet",
-"All" => "Alle",
-"Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Fehler während der Deaktivierung der Anwendung",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
-"Error while enabling app" => "Fehler während der Aktivierung der Anwendung",
-"Updating...." => "Update...",
-"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
-"Updated" => "Aktualisiert",
-"Delete" => "Löschen",
-"Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Groups" => "Gruppen",
-"undo" => "rückgängig machen",
-"never" => "niemals",
-"add group" => "Gruppe hinzufügen",
-"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
-"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)",
-"SSL root certificates" => "SSL-Root-Zertifikate",
-"Encryption" => "Verschlüsselung",
-"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",
-"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.",
-"Locale not working" => "Die Lokalisierung funktioniert nicht",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
-"Sharing" => "Teilen",
-"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
-"Allow public uploads" => "Erlaube öffentliches hochladen",
-"Allow resharing" => "Erlaube Weiterverteilen",
-"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.",
-"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",
-"Less" => "Weniger",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"More apps" => "Mehr Apps",
-"by" => "von",
-"User Documentation" => "Dokumentation für Benutzer",
-"Administrator Documentation" => "Dokumentation für Administratoren",
-"Online Documentation" => "Online-Dokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommerzieller Support",
-"Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-"Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Password" => "Passwort",
-"Your password was changed" => "Ihr Passwort wurde geändert.",
-"Unable to change your password" => "Das Passwort konnte nicht geändert werden",
-"Current password" => "Aktuelles Passwort",
-"New password" => "Neues Passwort",
-"Change password" => "Passwort ändern",
-"Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail-Adresse",
-"Cancel" => "Abbrechen",
-"Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Übersetzung",
-"Import Root Certificate" => "Root-Zertifikate importieren",
-"Log-in password" => "Login-Passwort",
-"Decrypt all Files" => "Alle Dateien entschlüsseln",
-"Login Name" => "Loginname",
-"Create" => "Erstellen",
-"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
-"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Unlimited" => "Unbegrenzt",
-"Other" => "Andere",
-"Username" => "Benutzername",
-"set new password" => "Neues Passwort setzen",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
new file mode 100644
index 00000000000..45b35b0abd1
--- /dev/null
+++ b/settings/l10n/de_DE.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "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 Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "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, scheinen die Einstellungen richtig zu sein.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+    "Email sent" : "E-Mail gesendet",
+    "You need to set your user email before being able to send test emails." : "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Wird gesendet …",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Wird deinstalliert …",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "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",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "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",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Förmlich: Sie)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "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 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, dass 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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankleistung",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+    "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",
+    "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." : "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es 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.",
+    "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "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.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Standardablaufdatum einstellen",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "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.",
+    "Send mode" : "Sendemodus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Legitimierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Log" : "Log",
+    "Log level" : "Log-Level",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "Add your app" : "Füge Deine App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Dokumentation für Administratoren",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</a>!",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "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 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 Ihrem Ursprungskonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Benutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standardkontingent",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Kontingent",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
new file mode 100644
index 00000000000..346e8790f30
--- /dev/null
+++ b/settings/l10n/de_DE.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "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 Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "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, scheinen die Einstellungen richtig zu sein.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+    "Email sent" : "E-Mail gesendet",
+    "You need to set your user email before being able to send test emails." : "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Wird gesendet …",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Wird deinstalliert …",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "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",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "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",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Förmlich: Sie)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "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 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, dass 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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankleistung",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+    "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",
+    "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." : "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es 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.",
+    "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "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.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Standardablaufdatum einstellen",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "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.",
+    "Send mode" : "Sendemodus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Legitimierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "Log" : "Log",
+    "Log level" : "Log-Level",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "Add your app" : "Füge Deine App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Dokumentation für Administratoren",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</a>!",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "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 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 Ihrem Ursprungskonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Benutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standardkontingent",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Kontingent",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
deleted file mode 100644
index 25328f377e3..00000000000
--- a/settings/l10n/de_DE.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiviert",
-"Not enabled" => "Nicht aktiviert",
-"Recommended" => "Empfohlen",
-"Authentication error" => "Authentifizierungs-Fehler",
-"Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
-"Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
-"Group already exists" => "Die Gruppe existiert bereits",
-"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
-"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
-"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
-"Couldn't remove app." => "Die App konnte nicht entfernt werden.",
-"Email saved" => "E-Mail-Adresse gespeichert",
-"Invalid email" => "Ungültige E-Mail-Adresse",
-"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
-"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
-"Backups restored successfully" => "Sicherungen erfolgreich wiederhergestellt",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-"Language changed" => "Sprache geändert",
-"Invalid request" => "Ungültige Anforderung",
-"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-"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.",
-"Wrong password" => "Falsches Passwort",
-"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 Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
-"Unable to change password" => "Passwort konnte nicht geändert werden",
-"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, scheinen die Einstellungen richtig zu sein.",
-"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
-"Email sent" => "E-Mail gesendet",
-"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
-"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
-"Sending..." => "Wird gesendet …",
-"All" => "Alle",
-"Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
-"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
-"Updating...." => "Update...",
-"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
-"Updated" => "Aktualisiert",
-"Uninstalling ...." => "Wird deinstalliert …",
-"Error while uninstalling app" => "Fehler beim Deinstallieren der App",
-"Uninstall" => "Deinstallieren",
-"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",
-"Valid until {date}" => "Gültig bis {date}",
-"Delete" => "Löschen",
-"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
-"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
-"Groups" => "Gruppen",
-"Unable to delete {objName}" => "Löschen von {objName} nicht möglich",
-"Error creating group" => "Fehler beim Erstellen der Gruppe",
-"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
-"deleted {groupName}" => "{groupName} gelöscht",
-"undo" => "rückgängig machen",
-"no group" => "Keine Gruppe",
-"never" => "niemals",
-"deleted {userName}" => "{userName} gelöscht",
-"add group" => "Gruppe hinzufügen",
-"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
-"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",
-"Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
-"__language_name__" => "Deutsch (Förmlich: Sie)",
-"Personal Info" => "Persönliche Informationen",
-"SSL root certificates" => "SSL-Root-Zertifikate",
-"Encryption" => "Verschlüsselung",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
-"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 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, dass 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",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
-"Database Performance Info" => "Info zur Datenbankleistung",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
-"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",
-"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." => "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
-"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
-"Locale not working" => "Die Lokalisierung funktioniert nicht",
-"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
-"This means that there might be problems with certain characters in file names." => "Dieses bedeutet, dass es 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.",
-"URL generation in notification emails" => "Adresserstellung in E-Mail-Benachrichtungen",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
-"Connectivity checks" => "Verbindungsüberprüfungen",
-"No problems found" => "Keine Probleme gefunden",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
-"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
-"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.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-"Sharing" => "Teilen",
-"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
-"Allow users to share via link" => "Benutzern erlauben, über Links Inhalte freizugeben",
-"Enforce password protection" => "Passwortschutz erzwingen",
-"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Set default expiration date" => "Standardablaufdatum einstellen",
-"Expire after " => "Ablauf nach ",
-"days" => "Tagen",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Allow resharing" => "Erlaube Weiterverteilen",
-"Restrict users to only share with users in their groups" => "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
-"Allow users to send mail notification for shared files" => "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
-"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-"Security" => "Sicherheit",
-"Enforce HTTPS" => "HTTPS erzwingen",
-"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.",
-"Send mode" => "Sendemodus",
-"From address" => "Absender-Adresse",
-"mail" => "Mail",
-"Authentication method" => "Legitimierungsmethode",
-"Authentication required" => "Authentifizierung benötigt",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"Credentials" => "Zugangsdaten",
-"SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwort",
-"Store credentials" => "Anmeldeinformationen speichern",
-"Test email settings" => "E-Mail-Einstellungen testen",
-"Send email" => "E-Mail senden",
-"Log" => "Log",
-"Log level" => "Log-Level",
-"More" => "Mehr",
-"Less" => "Weniger",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"More apps" => "Mehr Apps",
-"Add your app" => "Füge Deine App hinzu",
-"by" => "von",
-"licensed" => "Lizenziert",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Dokumentation für Administratoren",
-"Update to %s" => "Aktualisierung auf %s",
-"Enable only for specific groups" => "Nur für bestimmte Gruppen aktivieren",
-"Uninstall App" => "App deinstallieren",
-"Administrator Documentation" => "Dokumentation für Administratoren",
-"Online Documentation" => "Online-Dokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommerzieller Support",
-"Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</a>!",
-"Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Password" => "Passwort",
-"Your password was changed" => "Ihr Passwort wurde geändert.",
-"Unable to change your password" => "Das Passwort konnte nicht geändert werden",
-"Current password" => "Aktuelles Passwort",
-"New password" => "Neues Passwort",
-"Change password" => "Passwort ändern",
-"Full Name" => "Vollständiger Name",
-"Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail-Adresse",
-"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 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 Ihrem Ursprungskonto verwendet.",
-"Cancel" => "Abbrechen",
-"Choose as profile image" => "Als Profilbild wählen",
-"Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Übersetzung",
-"Common Name" => "Zuname",
-"Valid until" => "Gültig bis",
-"Issued By" => "Ausgestellt von:",
-"Valid until %s" => "Gültig bis %s",
-"Import Root Certificate" => "Root-Zertifikate importieren",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
-"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
-"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
-"Show storage location" => "Speicherort anzeigen",
-"Show last log in" => "Letzte Anmeldung anzeigen",
-"Login Name" => "Loginname",
-"Create" => "Erstellen",
-"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
-"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Search Users and Groups" => "Benutzer und Gruppen suchen",
-"Add Group" => "Gruppe hinzufügen",
-"Group" => "Gruppe",
-"Everyone" => "Jeder",
-"Admins" => "Administratoren",
-"Default Quota" => "Standardkontingent",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
-"Unlimited" => "Unbegrenzt",
-"Other" => "Andere",
-"Username" => "Benutzername",
-"Group Admin for" => "Gruppenadministrator für",
-"Quota" => "Kontingent",
-"Storage Location" => "Speicherort",
-"Last Login" => "Letzte Anmeldung",
-"change full name" => "Vollständigen Namen ändern",
-"set new password" => "Neues Passwort setzen",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
new file mode 100644
index 00000000000..d4c75399fa4
--- /dev/null
+++ b/settings/l10n/el.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
+    "Authentication error" : "Σφάλμα πιστοποίησης",
+    "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
+    "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
+    "Group already exists" : "Η ομάδα υπάρχει ήδη",
+    "Unable to add group" : "Αδυναμία προσθήκης ομάδας",
+    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
+    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
+    "Email saved" : "Το email αποθηκεύτηκε ",
+    "Invalid email" : "Μη έγκυρο email",
+    "Unable to delete group" : "Αδυναμία διαγραφής ομάδας",
+    "Unable to delete user" : "Αδυναμία διαγραφής χρήστη",
+    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "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" : "Αδυναμία αλλαγής συνθηματικού",
+    "Saved" : "Αποθηκεύτηκαν",
+    "test email settings" : "δοκιμή ρυθμίσεων email",
+    "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+    "A problem occurred while sending the email. Please revise your settings." : "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
+    "Email sent" : "Το Email απεστάλη ",
+    "You need to set your user email before being able to send test emails." : "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
+    "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Sending..." : "Αποστέλεται...",
+    "All" : "Όλες",
+    "Please wait...." : "Παρακαλώ περιμένετε...",
+    "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
+    "Disable" : "Απενεργοποίηση",
+    "Enable" : "Ενεργοποίηση",
+    "Error while enabling app" : "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
+    "Updating...." : "Ενημέρωση...",
+    "Error while updating app" : "Σφάλμα κατά την ενημέρωση της εφαρμογής",
+    "Updated" : "Ενημερώθηκε",
+    "Uninstalling ...." : "Απεγκατάσταση ....",
+    "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
+    "Uninstall" : "Απεγκατάσταση",
+    "Select a profile picture" : "Επιλογή εικόνας προφίλ",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Valid until {date}" : "Έγκυρο έως {date}",
+    "Delete" : "Διαγραφή",
+    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
+    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
+    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
+    "Groups" : "Ομάδες",
+    "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
+    "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
+    "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
+    "deleted {groupName}" : "διαγραφή {groupName}",
+    "undo" : "αναίρεση",
+    "never" : "ποτέ",
+    "deleted {userName}" : "διαγραφή {userName}",
+    "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__" : "__όνομα_γλώσσας__",
+    "Personal Info" : "Προσωπικές Πληροφορίες",
+    "SSL root certificates" : "Πιστοποιητικά SSL root",
+    "Encryption" : "Κρυπτογράφηση",
+    "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." : "Έχετε πρόσβαση στο %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 δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
+    "Setup Warning" : "Ρύθμιση Προειδοποίησης",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
+    "Database Performance Info" : "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
+    "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 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
+    "PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-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.",
+    "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
+    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
+    "No problems found" : "Δεν βρέθηκαν προβλήματα",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.",
+    "Cron was not executed yet!" : "Η διεργασία 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 λεπτά μέσω http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
+    "Sharing" : "Διαμοιρασμός",
+    "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
+    "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
+    "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
+    "Allow public uploads" : "Επιτρέπεται το κοινόχρηστο ανέβασμα",
+    "Set default expiration date" : "Ορισμός ερήμην ημερομηνίας λήξης",
+    "Expire after " : "Λήξη μετά από",
+    "days" : "ημέρες",
+    "Enforce expiration date" : "Επιβολή της ημερομηνίας λήξης",
+    "Allow resharing" : "Επιτρέπεται ο επαναδιαμοιρασμός",
+    "Restrict users to only share with users in their groups" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
+    "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
+    "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
+    "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "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.",
+    "Email Server" : "Διακομιστής Email",
+    "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+    "Send mode" : "Κατάσταση αποστολής",
+    "From address" : "Από τη διεύθυνση",
+    "mail" : "ταχυδρομείο",
+    "Authentication method" : "Μέθοδος πιστοποίησης",
+    "Authentication required" : "Απαιτείται πιστοποίηση",
+    "Server address" : "Διεύθυνση διακομιστή",
+    "Port" : "Θύρα",
+    "Credentials" : "Πιστοποιητικά",
+    "SMTP Username" : "Όνομα χρήστη SMTP",
+    "SMTP Password" : "Συνθηματικό SMTP",
+    "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
+    "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>.",
+    "More apps" : "Περισσότερες εφαρμογές",
+    "Add your app" : "Προσθέστε την Εφαρμογή σας ",
+    "by" : "από",
+    "Documentation:" : "Τεκμηρίωση:",
+    "User Documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Update to %s" : "Ενημέρωση σε %s",
+    "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
+    "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "Forum" : "Φόρουμ",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
+    "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" : "Τρέχων συνθηματικό",
+    "New password" : "Νέο συνθηματικό",
+    "Change password" : "Αλλαγή συνθηματικού",
+    "Full Name" : "Πλήρες όνομα",
+    "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." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
+    "Cancel" : "Άκυρο",
+    "Choose as profile image" : "Επιλογή εικόνας προφίλ",
+    "Language" : "Γλώσσα",
+    "Help translate" : "Βοηθήστε στη μετάφραση",
+    "Common Name" : "Κοινό Όνομα",
+    "Valid until" : "Έγκυρο έως",
+    "Issued By" : "Έκδόθηκε από",
+    "Valid until %s" : "Έγκυρο έως %s",
+    "Import Root Certificate" : "Εισαγωγή Πιστοποιητικού Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
+    "Log-in password" : "Συνθηματικό εισόδου",
+    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
+    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
+    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
+    "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
+    "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
+    "Login Name" : "Όνομα Σύνδεσης",
+    "Create" : "Δημιουργία",
+    "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
+    "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
+    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
+    "Add Group" : "Προσθήκη Ομάδας",
+    "Group" : "Ομάδα",
+    "Everyone" : "Όλοι",
+    "Admins" : "Διαχειριστές",
+    "Default Quota" : "Προεπιλεγμένο Όριο",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
+    "Unlimited" : "Απεριόριστο",
+    "Other" : "Άλλο",
+    "Username" : "Όνομα χρήστη",
+    "Quota" : "Σύνολο Χώρου",
+    "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
+    "Last Login" : "Τελευταία Σύνδεση",
+    "change full name" : "αλλαγή πλήρους ονόματος",
+    "set new password" : "επιλογή νέου κωδικού",
+    "Default" : "Προκαθορισμένο"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
new file mode 100644
index 00000000000..c2c202a3206
--- /dev/null
+++ b/settings/l10n/el.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
+    "Authentication error" : "Σφάλμα πιστοποίησης",
+    "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
+    "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
+    "Group already exists" : "Η ομάδα υπάρχει ήδη",
+    "Unable to add group" : "Αδυναμία προσθήκης ομάδας",
+    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
+    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
+    "Email saved" : "Το email αποθηκεύτηκε ",
+    "Invalid email" : "Μη έγκυρο email",
+    "Unable to delete group" : "Αδυναμία διαγραφής ομάδας",
+    "Unable to delete user" : "Αδυναμία διαγραφής χρήστη",
+    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "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" : "Αδυναμία αλλαγής συνθηματικού",
+    "Saved" : "Αποθηκεύτηκαν",
+    "test email settings" : "δοκιμή ρυθμίσεων email",
+    "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+    "A problem occurred while sending the email. Please revise your settings." : "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
+    "Email sent" : "Το Email απεστάλη ",
+    "You need to set your user email before being able to send test emails." : "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
+    "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Sending..." : "Αποστέλεται...",
+    "All" : "Όλες",
+    "Please wait...." : "Παρακαλώ περιμένετε...",
+    "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
+    "Disable" : "Απενεργοποίηση",
+    "Enable" : "Ενεργοποίηση",
+    "Error while enabling app" : "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
+    "Updating...." : "Ενημέρωση...",
+    "Error while updating app" : "Σφάλμα κατά την ενημέρωση της εφαρμογής",
+    "Updated" : "Ενημερώθηκε",
+    "Uninstalling ...." : "Απεγκατάσταση ....",
+    "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
+    "Uninstall" : "Απεγκατάσταση",
+    "Select a profile picture" : "Επιλογή εικόνας προφίλ",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Valid until {date}" : "Έγκυρο έως {date}",
+    "Delete" : "Διαγραφή",
+    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
+    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
+    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
+    "Groups" : "Ομάδες",
+    "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
+    "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
+    "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
+    "deleted {groupName}" : "διαγραφή {groupName}",
+    "undo" : "αναίρεση",
+    "never" : "ποτέ",
+    "deleted {userName}" : "διαγραφή {userName}",
+    "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__" : "__όνομα_γλώσσας__",
+    "Personal Info" : "Προσωπικές Πληροφορίες",
+    "SSL root certificates" : "Πιστοποιητικά SSL root",
+    "Encryption" : "Κρυπτογράφηση",
+    "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." : "Έχετε πρόσβαση στο %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 δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
+    "Setup Warning" : "Ρύθμιση Προειδοποίησης",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
+    "Database Performance Info" : "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
+    "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 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
+    "PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-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.",
+    "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
+    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
+    "No problems found" : "Δεν βρέθηκαν προβλήματα",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.",
+    "Cron was not executed yet!" : "Η διεργασία 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 λεπτά μέσω http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
+    "Sharing" : "Διαμοιρασμός",
+    "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
+    "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
+    "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
+    "Allow public uploads" : "Επιτρέπεται το κοινόχρηστο ανέβασμα",
+    "Set default expiration date" : "Ορισμός ερήμην ημερομηνίας λήξης",
+    "Expire after " : "Λήξη μετά από",
+    "days" : "ημέρες",
+    "Enforce expiration date" : "Επιβολή της ημερομηνίας λήξης",
+    "Allow resharing" : "Επιτρέπεται ο επαναδιαμοιρασμός",
+    "Restrict users to only share with users in their groups" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
+    "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
+    "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
+    "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "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.",
+    "Email Server" : "Διακομιστής Email",
+    "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+    "Send mode" : "Κατάσταση αποστολής",
+    "From address" : "Από τη διεύθυνση",
+    "mail" : "ταχυδρομείο",
+    "Authentication method" : "Μέθοδος πιστοποίησης",
+    "Authentication required" : "Απαιτείται πιστοποίηση",
+    "Server address" : "Διεύθυνση διακομιστή",
+    "Port" : "Θύρα",
+    "Credentials" : "Πιστοποιητικά",
+    "SMTP Username" : "Όνομα χρήστη SMTP",
+    "SMTP Password" : "Συνθηματικό SMTP",
+    "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
+    "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>.",
+    "More apps" : "Περισσότερες εφαρμογές",
+    "Add your app" : "Προσθέστε την Εφαρμογή σας ",
+    "by" : "από",
+    "Documentation:" : "Τεκμηρίωση:",
+    "User Documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Update to %s" : "Ενημέρωση σε %s",
+    "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
+    "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "Forum" : "Φόρουμ",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
+    "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" : "Τρέχων συνθηματικό",
+    "New password" : "Νέο συνθηματικό",
+    "Change password" : "Αλλαγή συνθηματικού",
+    "Full Name" : "Πλήρες όνομα",
+    "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." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
+    "Cancel" : "Άκυρο",
+    "Choose as profile image" : "Επιλογή εικόνας προφίλ",
+    "Language" : "Γλώσσα",
+    "Help translate" : "Βοηθήστε στη μετάφραση",
+    "Common Name" : "Κοινό Όνομα",
+    "Valid until" : "Έγκυρο έως",
+    "Issued By" : "Έκδόθηκε από",
+    "Valid until %s" : "Έγκυρο έως %s",
+    "Import Root Certificate" : "Εισαγωγή Πιστοποιητικού Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
+    "Log-in password" : "Συνθηματικό εισόδου",
+    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
+    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
+    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
+    "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
+    "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
+    "Login Name" : "Όνομα Σύνδεσης",
+    "Create" : "Δημιουργία",
+    "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
+    "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
+    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
+    "Add Group" : "Προσθήκη Ομάδας",
+    "Group" : "Ομάδα",
+    "Everyone" : "Όλοι",
+    "Admins" : "Διαχειριστές",
+    "Default Quota" : "Προεπιλεγμένο Όριο",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
+    "Unlimited" : "Απεριόριστο",
+    "Other" : "Άλλο",
+    "Username" : "Όνομα χρήστη",
+    "Quota" : "Σύνολο Χώρου",
+    "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
+    "Last Login" : "Τελευταία Σύνδεση",
+    "change full name" : "αλλαγή πλήρους ονόματος",
+    "set new password" : "επιλογή νέου κωδικού",
+    "Default" : "Προκαθορισμένο"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
deleted file mode 100644
index 82fefc35c61..00000000000
--- a/settings/l10n/el.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Ενεργοποιημένο",
-"Not enabled" => "Μη ενεργοποιημένο",
-"Recommended" => "Προτείνεται",
-"Authentication error" => "Σφάλμα πιστοποίησης",
-"Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
-"Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
-"Group already exists" => "Η ομάδα υπάρχει ήδη",
-"Unable to add group" => "Αδυναμία προσθήκης ομάδας",
-"Files decrypted successfully" => "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
-"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
-"Encryption keys deleted permanently" => "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
-"Couldn't remove app." => "Αδυναμία αφαίρεσης εφαρμογής.",
-"Email saved" => "Το email αποθηκεύτηκε ",
-"Invalid email" => "Μη έγκυρο email",
-"Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
-"Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
-"Backups restored successfully" => "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
-"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" => "Αδυναμία αλλαγής συνθηματικού",
-"Saved" => "Αποθηκεύτηκαν",
-"test email settings" => "δοκιμή ρυθμίσεων email",
-"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
-"A problem occurred while sending the email. Please revise your settings." => "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
-"Email sent" => "Το Email απεστάλη ",
-"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
-"Add trusted domain" => "Προσθέστε αξιόπιστη περιοχή",
-"Sending..." => "Αποστέλεται...",
-"All" => "Όλες",
-"Please wait...." => "Παρακαλώ περιμένετε...",
-"Error while disabling app" => "Σφάλμα κατά την απενεργοποίηση εισόδου",
-"Disable" => "Απενεργοποίηση",
-"Enable" => "Ενεργοποίηση",
-"Error while enabling app" => "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
-"Updating...." => "Ενημέρωση...",
-"Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
-"Updated" => "Ενημερώθηκε",
-"Uninstalling ...." => "Απεγκατάσταση ....",
-"Error while uninstalling app" => "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
-"Uninstall" => "Απεγκατάσταση",
-"Select a profile picture" => "Επιλογή εικόνας προφίλ",
-"Very weak password" => "Πολύ αδύναμο συνθηματικό",
-"Weak password" => "Αδύναμο συνθηματικό",
-"So-so password" => "Μέτριο συνθηματικό",
-"Good password" => "Καλό συνθηματικό",
-"Strong password" => "Δυνατό συνθηματικό",
-"Valid until {date}" => "Έγκυρο έως {date}",
-"Delete" => "Διαγραφή",
-"Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-"Delete encryption keys permanently." => "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
-"Restore encryption keys." => "Επαναφορά των κλειδιών κρυπτογράφησης.",
-"Groups" => "Ομάδες",
-"Unable to delete {objName}" => "Αδυναμία διαγραφής του {objName}",
-"Error creating group" => "Σφάλμα δημιουργίας ομάδας",
-"A valid group name must be provided" => "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
-"deleted {groupName}" => "διαγραφή {groupName}",
-"undo" => "αναίρεση",
-"no group" => "καμια ομάδα",
-"never" => "ποτέ",
-"deleted {userName}" => "διαγραφή {userName}",
-"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__" => "__όνομα_γλώσσας__",
-"Personal Info" => "Προσωπικές Πληροφορίες",
-"SSL root certificates" => "Πιστοποιητικά SSL root",
-"Encryption" => "Κρυπτογράφηση",
-"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." => "Έχετε πρόσβαση στο %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 δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
-"Setup Warning" => "Ρύθμιση Προειδοποίησης",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
-"Database Performance Info" => "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
-"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 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
-"PHP charset is not set to UTF-8" => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-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.",
-"URL generation in notification emails" => "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
-"Connectivity checks" => "Έλεγχοι συνδεσιμότητας",
-"No problems found" => "Δεν βρέθηκαν προβλήματα",
-"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.",
-"Cron was not executed yet!" => "Η διεργασία 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 λεπτά μέσω http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-"Sharing" => "Διαμοιρασμός",
-"Allow apps to use the Share API" => "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
-"Allow users to share via link" => "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
-"Enforce password protection" => "Επιβολή προστασίας με κωδικό",
-"Allow public uploads" => "Επιτρέπεται το κοινόχρηστο ανέβασμα",
-"Set default expiration date" => "Ορισμός ερήμην ημερομηνίας λήξης",
-"Expire after " => "Λήξη μετά από",
-"days" => "ημέρες",
-"Enforce expiration date" => "Επιβολή της ημερομηνίας λήξης",
-"Allow resharing" => "Επιτρέπεται ο επαναδιαμοιρασμός",
-"Restrict users to only share with users in their groups" => "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
-"Allow users to send mail notification for shared files" => "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
-"Exclude groups from sharing" => "Εξαίρεση ομάδων από τον διαμοιρασμό",
-"These groups will still be able to receive shares, but not to initiate them." => "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
-"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.",
-"Email Server" => "Διακομιστής Email",
-"This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
-"Send mode" => "Κατάσταση αποστολής",
-"From address" => "Από τη διεύθυνση",
-"mail" => "ταχυδρομείο",
-"Authentication method" => "Μέθοδος πιστοποίησης",
-"Authentication required" => "Απαιτείται πιστοποίηση",
-"Server address" => "Διεύθυνση διακομιστή",
-"Port" => "Θύρα",
-"Credentials" => "Πιστοποιητικά",
-"SMTP Username" => "Όνομα χρήστη SMTP",
-"SMTP Password" => "Συνθηματικό SMTP",
-"Store credentials" => "Διαπιστευτήρια αποθήκευσης",
-"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>.",
-"More apps" => "Περισσότερες εφαρμογές",
-"Add your app" => "Προσθέστε την Εφαρμογή σας ",
-"by" => "από",
-"Documentation:" => "Τεκμηρίωση:",
-"User Documentation" => "Τεκμηρίωση Χρήστη",
-"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
-"Update to %s" => "Ενημέρωση σε %s",
-"Enable only for specific groups" => "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
-"Uninstall App" => "Απεγκατάσταση Εφαρμογής",
-"Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
-"Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
-"Forum" => "Φόρουμ",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Εμπορική Υποστήριξη",
-"Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
-"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" => "Τρέχων συνθηματικό",
-"New password" => "Νέο συνθηματικό",
-"Change password" => "Αλλαγή συνθηματικού",
-"Full Name" => "Πλήρες όνομα",
-"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." => "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
-"Cancel" => "Άκυρο",
-"Choose as profile image" => "Επιλογή εικόνας προφίλ",
-"Language" => "Γλώσσα",
-"Help translate" => "Βοηθήστε στη μετάφραση",
-"Common Name" => "Κοινό Όνομα",
-"Valid until" => "Έγκυρο έως",
-"Issued By" => "Έκδόθηκε από",
-"Valid until %s" => "Έγκυρο έως %s",
-"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root",
-"The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
-"Log-in password" => "Συνθηματικό εισόδου",
-"Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
-"Restore Encryption Keys" => "Επαναφορά κλειδιών κρυπτογράφησης",
-"Delete Encryption Keys" => "Διαγραφή κλειδιών κρυπτογράφησης",
-"Show storage location" => "Εμφάνιση τοποθεσίας αποθήκευσης",
-"Show last log in" => "Εμφάνιση τελευταίας εισόδου",
-"Login Name" => "Όνομα Σύνδεσης",
-"Create" => "Δημιουργία",
-"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
-"Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-"Search Users and Groups" => "Αναζήτηση Χρηστών και Ομάδων",
-"Add Group" => "Προσθήκη Ομάδας",
-"Group" => "Ομάδα",
-"Everyone" => "Όλοι",
-"Admins" => "Διαχειριστές",
-"Default Quota" => "Προεπιλεγμένο Όριο",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
-"Unlimited" => "Απεριόριστο",
-"Other" => "Άλλο",
-"Username" => "Όνομα χρήστη",
-"Quota" => "Σύνολο Χώρου",
-"Storage Location" => "Τοποθεσία αποθηκευτικού χώρου",
-"Last Login" => "Τελευταία Σύνδεση",
-"change full name" => "αλλαγή πλήρους ονόματος",
-"set new password" => "επιλογή νέου κωδικού",
-"Default" => "Προκαθορισμένο"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en@pirate.js b/settings/l10n/en@pirate.js
new file mode 100644
index 00000000000..f9293f8094c
--- /dev/null
+++ b/settings/l10n/en@pirate.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Password" : "Passcode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en@pirate.json b/settings/l10n/en@pirate.json
new file mode 100644
index 00000000000..6f74658eb82
--- /dev/null
+++ b/settings/l10n/en@pirate.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Password" : "Passcode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/en@pirate.php b/settings/l10n/en@pirate.php
deleted file mode 100644
index e269c57c3d0..00000000000
--- a/settings/l10n/en@pirate.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Passcode"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
new file mode 100644
index 00000000000..b35062e2824
--- /dev/null
+++ b/settings/l10n/en_GB.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
+    "Authentication error" : "Authentication error",
+    "Your full name has been changed." : "Your full name has been changed.",
+    "Unable to change full name" : "Unable to change full name",
+    "Group already exists" : "Group already exists",
+    "Unable to add group" : "Unable to add group",
+    "Files decrypted successfully" : "Files decrypted successfully",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
+    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
+    "Couldn't remove app." : "Couldn't remove app.",
+    "Email saved" : "Email saved",
+    "Invalid email" : "Invalid email",
+    "Unable to delete group" : "Unable to delete group",
+    "Unable to delete user" : "Unable to delete user",
+    "Backups restored successfully" : "Backups restored successfully",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
+    "Language changed" : "Language changed",
+    "Invalid request" : "Invalid request",
+    "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
+    "Unable to add user to group %s" : "Unable to add user to group %s",
+    "Unable to remove user from group %s" : "Unable to remove user from group %s",
+    "Couldn't update app." : "Couldn't update app.",
+    "Wrong password" : "Incorrect password",
+    "No user supplied" : "No user supplied",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
+    "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",
+    "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 email. Please revise your settings." : "A problem occurred whilst sending the email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
+    "Add trusted domain" : "Add trusted domain",
+    "Sending..." : "Sending...",
+    "All" : "All",
+    "Please wait...." : "Please wait....",
+    "Error while disabling app" : "Error whilst disabling app",
+    "Disable" : "Disable",
+    "Enable" : "Enable",
+    "Error while enabling app" : "Error whilst enabling app",
+    "Updating...." : "Updating....",
+    "Error while updating app" : "Error whilst updating app",
+    "Updated" : "Updated",
+    "Uninstalling ...." : "Uninstalling...",
+    "Error while uninstalling app" : "Error whilst uninstalling app",
+    "Uninstall" : "Uninstall",
+    "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",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Delete",
+    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
+    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
+    "Restore encryption keys." : "Restore encryption keys.",
+    "Groups" : "Groups",
+    "Unable to delete {objName}" : "Unable to delete {objName}",
+    "Error creating group" : "Error creating group",
+    "A valid group name must be provided" : "A valid group name must be provided",
+    "deleted {groupName}" : "deleted {groupName}",
+    "undo" : "undo",
+    "no group" : "no group",
+    "never" : "never",
+    "deleted {userName}" : "deleted {userName}",
+    "add group" : "add group",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Error creating user" : "Error creating user",
+    "A valid password must be provided" : "A valid password must be provided",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warning: Home directory for user \"{user}\" already exists",
+    "__language_name__" : "English (British English)",
+    "Personal Info" : "Personal Info",
+    "SSL root certificates" : "SSL root certificates",
+    "Encryption" : "Encryption",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "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.",
+    "Setup Warning" : "Setup Warning",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' missing",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
+    "Your PHP version is outdated" : "Your PHP version is outdated",
+    "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." : "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 charset is not set to UTF-8" : "PHP charset is not set to UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
+    "Locale not working" : "Locale not working",
+    "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "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." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
+    "URL generation in notification emails" : "URL generation in notification emails",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity checks" : "Connectivity checks",
+    "No problems found" : "No problems found",
+    "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Last cron was executed at %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Sharing" : "Sharing",
+    "Allow apps to use the Share API" : "Allow apps to use the Share API",
+    "Allow users to share via link" : "Allow users to share via link",
+    "Enforce password protection" : "Enforce password protection",
+    "Allow public uploads" : "Allow public uploads",
+    "Set default expiration date" : "Set default expiry date",
+    "Expire after " : "Expire after ",
+    "days" : "days",
+    "Enforce expiration date" : "Enforce expiry date",
+    "Allow resharing" : "Allow resharing",
+    "Restrict users to only share with users in their groups" : "Restrict users to only share with users in their groups",
+    "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
+    "Exclude groups from sharing" : "Exclude groups from sharing",
+    "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
+    "Security" : "Security",
+    "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.",
+    "Send mode" : "Send mode",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Log" : "Log",
+    "Log level" : "Log level",
+    "More" : "More",
+    "Less" : "Less",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "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 Licence\">AGPL</abbr></a>.",
+    "More apps" : "More apps",
+    "Add your app" : "Add your app",
+    "by" : "by",
+    "licensed" : "licensed",
+    "Documentation:" : "Documentation:",
+    "User Documentation" : "User Documentation",
+    "Admin Documentation" : "Admin Documentation",
+    "Update to %s" : "Update to %s",
+    "Enable only for specific groups" : "Enable only for specific groups",
+    "Uninstall App" : "Uninstall App",
+    "Administrator Documentation" : "Administrator Documentation",
+    "Online Documentation" : "Online Documentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commercial Support",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "Your password was changed",
+    "Unable to change your password" : "Unable to change your password",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Change password" : "Change password",
+    "Full Name" : "Full Name",
+    "Email" : "Email",
+    "Your email address" : "Your email address",
+    "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.",
+    "Cancel" : "Cancel",
+    "Choose as profile image" : "Choose as profile image",
+    "Language" : "Language",
+    "Help translate" : "Help translate",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Import Root Certificate",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+    "Restore Encryption Keys" : "Restore Encryption Keys",
+    "Delete Encryption Keys" : "Delete Encryption Keys",
+    "Show storage location" : "Show storage location",
+    "Show last log in" : "Show last log in",
+    "Login Name" : "Login Name",
+    "Create" : "Create",
+    "Admin Recovery Password" : "Admin Recovery Password",
+    "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users and Groups" : "Search Users and Groups",
+    "Add Group" : "Add Group",
+    "Group" : "Group",
+    "Everyone" : "Everyone",
+    "Admins" : "Admins",
+    "Default Quota" : "Default Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Unlimited",
+    "Other" : "Other",
+    "Username" : "Username",
+    "Group Admin for" : "Group Admin for",
+    "Quota" : "Quota",
+    "Storage Location" : "Storage Location",
+    "Last Login" : "Last Login",
+    "change full name" : "change full name",
+    "set new password" : "set new password",
+    "Default" : "Default"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
new file mode 100644
index 00000000000..c5ae9fff869
--- /dev/null
+++ b/settings/l10n/en_GB.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
+    "Authentication error" : "Authentication error",
+    "Your full name has been changed." : "Your full name has been changed.",
+    "Unable to change full name" : "Unable to change full name",
+    "Group already exists" : "Group already exists",
+    "Unable to add group" : "Unable to add group",
+    "Files decrypted successfully" : "Files decrypted successfully",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
+    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
+    "Couldn't remove app." : "Couldn't remove app.",
+    "Email saved" : "Email saved",
+    "Invalid email" : "Invalid email",
+    "Unable to delete group" : "Unable to delete group",
+    "Unable to delete user" : "Unable to delete user",
+    "Backups restored successfully" : "Backups restored successfully",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
+    "Language changed" : "Language changed",
+    "Invalid request" : "Invalid request",
+    "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
+    "Unable to add user to group %s" : "Unable to add user to group %s",
+    "Unable to remove user from group %s" : "Unable to remove user from group %s",
+    "Couldn't update app." : "Couldn't update app.",
+    "Wrong password" : "Incorrect password",
+    "No user supplied" : "No user supplied",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
+    "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",
+    "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 email. Please revise your settings." : "A problem occurred whilst sending the email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
+    "Add trusted domain" : "Add trusted domain",
+    "Sending..." : "Sending...",
+    "All" : "All",
+    "Please wait...." : "Please wait....",
+    "Error while disabling app" : "Error whilst disabling app",
+    "Disable" : "Disable",
+    "Enable" : "Enable",
+    "Error while enabling app" : "Error whilst enabling app",
+    "Updating...." : "Updating....",
+    "Error while updating app" : "Error whilst updating app",
+    "Updated" : "Updated",
+    "Uninstalling ...." : "Uninstalling...",
+    "Error while uninstalling app" : "Error whilst uninstalling app",
+    "Uninstall" : "Uninstall",
+    "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",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Delete",
+    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
+    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
+    "Restore encryption keys." : "Restore encryption keys.",
+    "Groups" : "Groups",
+    "Unable to delete {objName}" : "Unable to delete {objName}",
+    "Error creating group" : "Error creating group",
+    "A valid group name must be provided" : "A valid group name must be provided",
+    "deleted {groupName}" : "deleted {groupName}",
+    "undo" : "undo",
+    "no group" : "no group",
+    "never" : "never",
+    "deleted {userName}" : "deleted {userName}",
+    "add group" : "add group",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Error creating user" : "Error creating user",
+    "A valid password must be provided" : "A valid password must be provided",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warning: Home directory for user \"{user}\" already exists",
+    "__language_name__" : "English (British English)",
+    "Personal Info" : "Personal Info",
+    "SSL root certificates" : "SSL root certificates",
+    "Encryption" : "Encryption",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "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.",
+    "Setup Warning" : "Setup Warning",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' missing",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
+    "Your PHP version is outdated" : "Your PHP version is outdated",
+    "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." : "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 charset is not set to UTF-8" : "PHP charset is not set to UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
+    "Locale not working" : "Locale not working",
+    "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "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." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
+    "URL generation in notification emails" : "URL generation in notification emails",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity checks" : "Connectivity checks",
+    "No problems found" : "No problems found",
+    "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Last cron was executed at %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Sharing" : "Sharing",
+    "Allow apps to use the Share API" : "Allow apps to use the Share API",
+    "Allow users to share via link" : "Allow users to share via link",
+    "Enforce password protection" : "Enforce password protection",
+    "Allow public uploads" : "Allow public uploads",
+    "Set default expiration date" : "Set default expiry date",
+    "Expire after " : "Expire after ",
+    "days" : "days",
+    "Enforce expiration date" : "Enforce expiry date",
+    "Allow resharing" : "Allow resharing",
+    "Restrict users to only share with users in their groups" : "Restrict users to only share with users in their groups",
+    "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
+    "Exclude groups from sharing" : "Exclude groups from sharing",
+    "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
+    "Security" : "Security",
+    "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.",
+    "Send mode" : "Send mode",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Log" : "Log",
+    "Log level" : "Log level",
+    "More" : "More",
+    "Less" : "Less",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "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 Licence\">AGPL</abbr></a>.",
+    "More apps" : "More apps",
+    "Add your app" : "Add your app",
+    "by" : "by",
+    "licensed" : "licensed",
+    "Documentation:" : "Documentation:",
+    "User Documentation" : "User Documentation",
+    "Admin Documentation" : "Admin Documentation",
+    "Update to %s" : "Update to %s",
+    "Enable only for specific groups" : "Enable only for specific groups",
+    "Uninstall App" : "Uninstall App",
+    "Administrator Documentation" : "Administrator Documentation",
+    "Online Documentation" : "Online Documentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commercial Support",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "Your password was changed",
+    "Unable to change your password" : "Unable to change your password",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Change password" : "Change password",
+    "Full Name" : "Full Name",
+    "Email" : "Email",
+    "Your email address" : "Your email address",
+    "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.",
+    "Cancel" : "Cancel",
+    "Choose as profile image" : "Choose as profile image",
+    "Language" : "Language",
+    "Help translate" : "Help translate",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Import Root Certificate",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+    "Restore Encryption Keys" : "Restore Encryption Keys",
+    "Delete Encryption Keys" : "Delete Encryption Keys",
+    "Show storage location" : "Show storage location",
+    "Show last log in" : "Show last log in",
+    "Login Name" : "Login Name",
+    "Create" : "Create",
+    "Admin Recovery Password" : "Admin Recovery Password",
+    "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users and Groups" : "Search Users and Groups",
+    "Add Group" : "Add Group",
+    "Group" : "Group",
+    "Everyone" : "Everyone",
+    "Admins" : "Admins",
+    "Default Quota" : "Default Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Unlimited",
+    "Other" : "Other",
+    "Username" : "Username",
+    "Group Admin for" : "Group Admin for",
+    "Quota" : "Quota",
+    "Storage Location" : "Storage Location",
+    "Last Login" : "Last Login",
+    "change full name" : "change full name",
+    "set new password" : "set new password",
+    "Default" : "Default"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
deleted file mode 100644
index 86101c029c0..00000000000
--- a/settings/l10n/en_GB.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Enabled",
-"Not enabled" => "Not enabled",
-"Recommended" => "Recommended",
-"Authentication error" => "Authentication error",
-"Your full name has been changed." => "Your full name has been changed.",
-"Unable to change full name" => "Unable to change full name",
-"Group already exists" => "Group already exists",
-"Unable to add group" => "Unable to add group",
-"Files decrypted successfully" => "Files decrypted successfully",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
-"Couldn't decrypt your files, check your password and try again" => "Couldn't decrypt your files, check your password and try again",
-"Encryption keys deleted permanently" => "Encryption keys deleted permanently",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
-"Couldn't remove app." => "Couldn't remove app.",
-"Email saved" => "Email saved",
-"Invalid email" => "Invalid email",
-"Unable to delete group" => "Unable to delete group",
-"Unable to delete user" => "Unable to delete user",
-"Backups restored successfully" => "Backups restored successfully",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
-"Language changed" => "Language changed",
-"Invalid request" => "Invalid request",
-"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
-"Unable to add user to group %s" => "Unable to add user to group %s",
-"Unable to remove user from group %s" => "Unable to remove user from group %s",
-"Couldn't update app." => "Couldn't update app.",
-"Wrong password" => "Incorrect password",
-"No user supplied" => "No user supplied",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Please provide an admin recovery password, otherwise all user data will be lost",
-"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",
-"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 email. Please revise your settings." => "A problem occurred whilst sending the email. Please revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?",
-"Add trusted domain" => "Add trusted domain",
-"Sending..." => "Sending...",
-"All" => "All",
-"Please wait...." => "Please wait....",
-"Error while disabling app" => "Error whilst disabling app",
-"Disable" => "Disable",
-"Enable" => "Enable",
-"Error while enabling app" => "Error whilst enabling app",
-"Updating...." => "Updating....",
-"Error while updating app" => "Error whilst updating app",
-"Updated" => "Updated",
-"Uninstalling ...." => "Uninstalling...",
-"Error while uninstalling app" => "Error whilst uninstalling app",
-"Uninstall" => "Uninstall",
-"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",
-"Valid until {date}" => "Valid until {date}",
-"Delete" => "Delete",
-"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
-"Delete encryption keys permanently." => "Delete encryption keys permanently.",
-"Restore encryption keys." => "Restore encryption keys.",
-"Groups" => "Groups",
-"Unable to delete {objName}" => "Unable to delete {objName}",
-"Error creating group" => "Error creating group",
-"A valid group name must be provided" => "A valid group name must be provided",
-"deleted {groupName}" => "deleted {groupName}",
-"undo" => "undo",
-"no group" => "no group",
-"never" => "never",
-"deleted {userName}" => "deleted {userName}",
-"add group" => "add group",
-"A valid username must be provided" => "A valid username must be provided",
-"Error creating user" => "Error creating user",
-"A valid password must be provided" => "A valid password must be provided",
-"Warning: Home directory for user \"{user}\" already exists" => "Warning: Home directory for user \"{user}\" already exists",
-"__language_name__" => "English (British English)",
-"Personal Info" => "Personal Info",
-"SSL root certificates" => "SSL root certificates",
-"Encryption" => "Encryption",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Everything (fatal issues, errors, warnings, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, warnings, errors and fatal issues",
-"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.",
-"Setup Warning" => "Setup Warning",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
-"Database Performance Info" => "Database Performance Info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
-"Your PHP version is outdated" => "Your PHP version is outdated",
-"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." => "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 charset is not set to UTF-8" => "PHP charset is not set to UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
-"Locale not working" => "Locale not working",
-"System locale can not be set to a one which supports UTF-8." => "System locale can not be set to a one which supports UTF-8.",
-"This means that there might be problems with certain characters in file names." => "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." => "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
-"URL generation in notification emails" => "URL generation in notification emails",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
-"Connectivity checks" => "Connectivity checks",
-"No problems found" => "No problems found",
-"Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Last cron was executed at %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
-"Cron was not executed yet!" => "Cron was not executed yet!",
-"Execute one task with each page loaded" => "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Use system's cron service to call the cron.php file every 15 minutes.",
-"Sharing" => "Sharing",
-"Allow apps to use the Share API" => "Allow apps to use the Share API",
-"Allow users to share via link" => "Allow users to share via link",
-"Enforce password protection" => "Enforce password protection",
-"Allow public uploads" => "Allow public uploads",
-"Set default expiration date" => "Set default expiry date",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Enforce expiration date" => "Enforce expiry date",
-"Allow resharing" => "Allow resharing",
-"Restrict users to only share with users in their groups" => "Restrict users to only share with users in their groups",
-"Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
-"Exclude groups from sharing" => "Exclude groups from sharing",
-"These groups will still be able to receive shares, but not to initiate them." => "These groups will still be able to receive shares, but not to initiate them.",
-"Security" => "Security",
-"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.",
-"Send mode" => "Send mode",
-"From address" => "From address",
-"mail" => "mail",
-"Authentication method" => "Authentication method",
-"Authentication required" => "Authentication required",
-"Server address" => "Server address",
-"Port" => "Port",
-"Credentials" => "Credentials",
-"SMTP Username" => "SMTP Username",
-"SMTP Password" => "SMTP Password",
-"Store credentials" => "Store credentials",
-"Test email settings" => "Test email settings",
-"Send email" => "Send email",
-"Log" => "Log",
-"Log level" => "Log level",
-"More" => "More",
-"Less" => "Less",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "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 Licence\">AGPL</abbr></a>.",
-"More apps" => "More apps",
-"Add your app" => "Add your app",
-"by" => "by",
-"licensed" => "licensed",
-"Documentation:" => "Documentation:",
-"User Documentation" => "User Documentation",
-"Admin Documentation" => "Admin Documentation",
-"Update to %s" => "Update to %s",
-"Enable only for specific groups" => "Enable only for specific groups",
-"Uninstall App" => "Uninstall App",
-"Administrator Documentation" => "Administrator Documentation",
-"Online Documentation" => "Online Documentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Commercial Support",
-"Get the apps to sync your files" => "Get the apps to sync your files",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
-"Show First Run Wizard again" => "Show First Run Wizard again",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
-"Password" => "Password",
-"Your password was changed" => "Your password was changed",
-"Unable to change your password" => "Unable to change your password",
-"Current password" => "Current password",
-"New password" => "New password",
-"Change password" => "Change password",
-"Full Name" => "Full Name",
-"Email" => "Email",
-"Your email address" => "Your email address",
-"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.",
-"Cancel" => "Cancel",
-"Choose as profile image" => "Choose as profile image",
-"Language" => "Language",
-"Help translate" => "Help translate",
-"Common Name" => "Common Name",
-"Valid until" => "Valid until",
-"Issued By" => "Issued By",
-"Valid until %s" => "Valid until %s",
-"Import Root Certificate" => "Import Root Certificate",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
-"Restore Encryption Keys" => "Restore Encryption Keys",
-"Delete Encryption Keys" => "Delete Encryption Keys",
-"Show storage location" => "Show storage location",
-"Show last log in" => "Show last log in",
-"Login Name" => "Login Name",
-"Create" => "Create",
-"Admin Recovery Password" => "Admin Recovery Password",
-"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
-"Search Users and Groups" => "Search Users and Groups",
-"Add Group" => "Add Group",
-"Group" => "Group",
-"Everyone" => "Everyone",
-"Admins" => "Admins",
-"Default Quota" => "Default Quota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
-"Unlimited" => "Unlimited",
-"Other" => "Other",
-"Username" => "Username",
-"Group Admin for" => "Group Admin for",
-"Quota" => "Quota",
-"Storage Location" => "Storage Location",
-"Last Login" => "Last Login",
-"change full name" => "change full name",
-"set new password" => "set new password",
-"Default" => "Default"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
new file mode 100644
index 00000000000..5d76674dca9
--- /dev/null
+++ b/settings/l10n/eo.js
@@ -0,0 +1,155 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
+    "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
+    "Group already exists" : "La grupo jam ekzistas",
+    "Unable to add group" : "Ne eblis aldoni la grupon",
+    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
+    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
+    "Email saved" : "La retpoŝtadreso konserviĝis",
+    "Invalid email" : "Nevalida retpoŝtadreso",
+    "Unable to delete group" : "Ne eblis forigi la grupon",
+    "Unable to delete user" : "Ne eblis forigi la uzanton",
+    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
+    "Language changed" : "La lingvo estas ŝanĝita",
+    "Invalid request" : "Nevalida peto",
+    "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",
+    "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
+    "Wrong password" : "Malĝusta pasvorto",
+    "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Saved" : "Konservita",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Sending..." : "Sendante...",
+    "All" : "Ĉio",
+    "Please wait...." : "Bonvolu atendi...",
+    "Error while disabling app" : "Eraris malkapabligo de aplikaĵo",
+    "Disable" : "Malkapabligi",
+    "Enable" : "Kapabligi",
+    "Error while enabling app" : "Eraris kapabligo de aplikaĵo",
+    "Updating...." : "Ĝisdatigata...",
+    "Error while updating app" : "Eraris ĝisdatigo de la aplikaĵo",
+    "Updated" : "Ĝisdatigita",
+    "Uninstalling ...." : "Malinstalante...",
+    "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo",
+    "Uninstall" : "Malinstali",
+    "Select a profile picture" : "Elekti profilan bildon",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Delete" : "Forigi",
+    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
+    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
+    "Groups" : "Grupoj",
+    "deleted {groupName}" : "{groupName} foriĝis",
+    "undo" : "malfari",
+    "never" : "neniam",
+    "deleted {userName}" : "{userName} foriĝis",
+    "add group" : "aldoni grupon",
+    "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
+    "Error creating user" : "Eraris kreo de uzanto",
+    "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
+    "__language_name__" : "Esperanto",
+    "SSL root certificates" : "Radikaj SSL-atestoj",
+    "Encryption" : "Ĉifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+    "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
+    "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
+    "Errors and fatal issues" : "Eraroj kaj fatalaĵoj",
+    "Fatal issues only" : "Fatalaĵoj nur",
+    "None" : "Nenio",
+    "Login" : "Ensaluti",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sekureca averto",
+    "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
+    "Locale not working" : "La lokaĵaro ne funkcias",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+    "Allow public uploads" : "Permesi publikajn alŝutojn",
+    "Expire after " : "Eksvalidigi post",
+    "days" : "tagoj",
+    "Allow resharing" : "Kapabligi rekunhavigon",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Send mode" : "Sendi pli",
+    "From address" : "El adreso",
+    "mail" : "retpoŝto",
+    "Authentication method" : "Aŭtentiga metodo",
+    "Authentication required" : "Aŭtentiĝo nepras",
+    "Server address" : "Servila adreso",
+    "Port" : "Pordo",
+    "Credentials" : "Aŭtentigiloj",
+    "SMTP Username" : "SMTP-uzantonomo",
+    "SMTP Password" : "SMTP-pasvorto",
+    "Send email" : "Sendi retpoŝton",
+    "Log" : "Protokolo",
+    "Log level" : "Registronivelo",
+    "More" : "Pli",
+    "Less" : "Malpli",
+    "Version" : "Eldono",
+    "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>." : "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "de",
+    "Documentation:" : "Dokumentaro:",
+    "User Documentation" : "Dokumentaro por uzantoj",
+    "Admin Documentation" : "Administra dokumentaro",
+    "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
+    "Uninstall App" : "Malinstali aplikaĵon",
+    "Administrator Documentation" : "Dokumentaro por administrantoj",
+    "Online Documentation" : "Reta dokumentaro",
+    "Forum" : "Forumo",
+    "Bugtracker" : "Cimoraportejo",
+    "Commercial Support" : "Komerca subteno",
+    "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
+    "Password" : "Pasvorto",
+    "Your password was changed" : "Via pasvorto ŝanĝiĝis",
+    "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton",
+    "Current password" : "Nuna pasvorto",
+    "New password" : "Nova pasvorto",
+    "Change password" : "Ŝanĝi la pasvorton",
+    "Full Name" : "Plena nomo",
+    "Email" : "Retpoŝto",
+    "Your email address" : "Via retpoŝta adreso",
+    "Profile picture" : "Profila bildo",
+    "Upload new" : "Alŝuti novan",
+    "Select new from Files" : "Elekti novan el dosieroj",
+    "Remove image" : "Forigi bildon",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
+    "Cancel" : "Nuligi",
+    "Choose as profile image" : "Elekti kiel profilan bildon",
+    "Language" : "Lingvo",
+    "Help translate" : "Helpu traduki",
+    "Import Root Certificate" : "Enporti radikan ateston",
+    "Log-in password" : "Ensaluta pasvorto",
+    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
+    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
+    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
+    "Login Name" : "Ensaluti",
+    "Create" : "Krei",
+    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
+    "Add Group" : "Aldoni grupon",
+    "Group" : "Grupo",
+    "Everyone" : "Ĉiuj",
+    "Admins" : "Administrantoj",
+    "Default Quota" : "Defaŭlta kvoto",
+    "Unlimited" : "Senlima",
+    "Other" : "Alia",
+    "Username" : "Uzantonomo",
+    "Quota" : "Kvoto",
+    "Last Login" : "Lasta ensaluto",
+    "change full name" : "ŝanĝi plenan nomon",
+    "set new password" : "agordi novan pasvorton",
+    "Default" : "Defaŭlta"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
new file mode 100644
index 00000000000..1fc5186184f
--- /dev/null
+++ b/settings/l10n/eo.json
@@ -0,0 +1,153 @@
+{ "translations": {
+    "Enabled" : "Kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
+    "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
+    "Group already exists" : "La grupo jam ekzistas",
+    "Unable to add group" : "Ne eblis aldoni la grupon",
+    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
+    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
+    "Email saved" : "La retpoŝtadreso konserviĝis",
+    "Invalid email" : "Nevalida retpoŝtadreso",
+    "Unable to delete group" : "Ne eblis forigi la grupon",
+    "Unable to delete user" : "Ne eblis forigi la uzanton",
+    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
+    "Language changed" : "La lingvo estas ŝanĝita",
+    "Invalid request" : "Nevalida peto",
+    "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",
+    "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
+    "Wrong password" : "Malĝusta pasvorto",
+    "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Saved" : "Konservita",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Sending..." : "Sendante...",
+    "All" : "Ĉio",
+    "Please wait...." : "Bonvolu atendi...",
+    "Error while disabling app" : "Eraris malkapabligo de aplikaĵo",
+    "Disable" : "Malkapabligi",
+    "Enable" : "Kapabligi",
+    "Error while enabling app" : "Eraris kapabligo de aplikaĵo",
+    "Updating...." : "Ĝisdatigata...",
+    "Error while updating app" : "Eraris ĝisdatigo de la aplikaĵo",
+    "Updated" : "Ĝisdatigita",
+    "Uninstalling ...." : "Malinstalante...",
+    "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo",
+    "Uninstall" : "Malinstali",
+    "Select a profile picture" : "Elekti profilan bildon",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Delete" : "Forigi",
+    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
+    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
+    "Groups" : "Grupoj",
+    "deleted {groupName}" : "{groupName} foriĝis",
+    "undo" : "malfari",
+    "never" : "neniam",
+    "deleted {userName}" : "{userName} foriĝis",
+    "add group" : "aldoni grupon",
+    "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
+    "Error creating user" : "Eraris kreo de uzanto",
+    "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
+    "__language_name__" : "Esperanto",
+    "SSL root certificates" : "Radikaj SSL-atestoj",
+    "Encryption" : "Ĉifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+    "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
+    "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
+    "Errors and fatal issues" : "Eraroj kaj fatalaĵoj",
+    "Fatal issues only" : "Fatalaĵoj nur",
+    "None" : "Nenio",
+    "Login" : "Ensaluti",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sekureca averto",
+    "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
+    "Locale not working" : "La lokaĵaro ne funkcias",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+    "Allow public uploads" : "Permesi publikajn alŝutojn",
+    "Expire after " : "Eksvalidigi post",
+    "days" : "tagoj",
+    "Allow resharing" : "Kapabligi rekunhavigon",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Send mode" : "Sendi pli",
+    "From address" : "El adreso",
+    "mail" : "retpoŝto",
+    "Authentication method" : "Aŭtentiga metodo",
+    "Authentication required" : "Aŭtentiĝo nepras",
+    "Server address" : "Servila adreso",
+    "Port" : "Pordo",
+    "Credentials" : "Aŭtentigiloj",
+    "SMTP Username" : "SMTP-uzantonomo",
+    "SMTP Password" : "SMTP-pasvorto",
+    "Send email" : "Sendi retpoŝton",
+    "Log" : "Protokolo",
+    "Log level" : "Registronivelo",
+    "More" : "Pli",
+    "Less" : "Malpli",
+    "Version" : "Eldono",
+    "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>." : "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "de",
+    "Documentation:" : "Dokumentaro:",
+    "User Documentation" : "Dokumentaro por uzantoj",
+    "Admin Documentation" : "Administra dokumentaro",
+    "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
+    "Uninstall App" : "Malinstali aplikaĵon",
+    "Administrator Documentation" : "Dokumentaro por administrantoj",
+    "Online Documentation" : "Reta dokumentaro",
+    "Forum" : "Forumo",
+    "Bugtracker" : "Cimoraportejo",
+    "Commercial Support" : "Komerca subteno",
+    "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
+    "Password" : "Pasvorto",
+    "Your password was changed" : "Via pasvorto ŝanĝiĝis",
+    "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton",
+    "Current password" : "Nuna pasvorto",
+    "New password" : "Nova pasvorto",
+    "Change password" : "Ŝanĝi la pasvorton",
+    "Full Name" : "Plena nomo",
+    "Email" : "Retpoŝto",
+    "Your email address" : "Via retpoŝta adreso",
+    "Profile picture" : "Profila bildo",
+    "Upload new" : "Alŝuti novan",
+    "Select new from Files" : "Elekti novan el dosieroj",
+    "Remove image" : "Forigi bildon",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
+    "Cancel" : "Nuligi",
+    "Choose as profile image" : "Elekti kiel profilan bildon",
+    "Language" : "Lingvo",
+    "Help translate" : "Helpu traduki",
+    "Import Root Certificate" : "Enporti radikan ateston",
+    "Log-in password" : "Ensaluta pasvorto",
+    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
+    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
+    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
+    "Login Name" : "Ensaluti",
+    "Create" : "Krei",
+    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
+    "Add Group" : "Aldoni grupon",
+    "Group" : "Grupo",
+    "Everyone" : "Ĉiuj",
+    "Admins" : "Administrantoj",
+    "Default Quota" : "Defaŭlta kvoto",
+    "Unlimited" : "Senlima",
+    "Other" : "Alia",
+    "Username" : "Uzantonomo",
+    "Quota" : "Kvoto",
+    "Last Login" : "Lasta ensaluto",
+    "change full name" : "ŝanĝi plenan nomon",
+    "set new password" : "agordi novan pasvorton",
+    "Default" : "Defaŭlta"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
deleted file mode 100644
index 44506ad4e3c..00000000000
--- a/settings/l10n/eo.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Kapabligita",
-"Authentication error" => "Aŭtentiga eraro",
-"Your full name has been changed." => "Via plena nomo ŝanĝitas.",
-"Unable to change full name" => "Ne eblis ŝanĝi la plenan nomon",
-"Group already exists" => "La grupo jam ekzistas",
-"Unable to add group" => "Ne eblis aldoni la grupon",
-"Files decrypted successfully" => "La dosieroj malĉifriĝis sukcese",
-"Encryption keys deleted permanently" => "La ĉifroklavojn foriĝis por ĉiam.",
-"Email saved" => "La retpoŝtadreso konserviĝis",
-"Invalid email" => "Nevalida retpoŝtadreso",
-"Unable to delete group" => "Ne eblis forigi la grupon",
-"Unable to delete user" => "Ne eblis forigi la uzanton",
-"Backups restored successfully" => "La savokopioj restaŭriĝis sukcese",
-"Language changed" => "La lingvo estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
-"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",
-"Couldn't update app." => "Ne eblis ĝisdatigi la aplikaĵon.",
-"Wrong password" => "Malĝusta pasvorto",
-"Unable to change password" => "Ne eblis ŝanĝi la pasvorton",
-"Saved" => "Konservita",
-"Email sent" => "La retpoŝtaĵo sendiĝis",
-"Sending..." => "Sendante...",
-"All" => "Ĉio",
-"Please wait...." => "Bonvolu atendi...",
-"Error while disabling app" => "Eraris malkapabligo de aplikaĵo",
-"Disable" => "Malkapabligi",
-"Enable" => "Kapabligi",
-"Error while enabling app" => "Eraris kapabligo de aplikaĵo",
-"Updating...." => "Ĝisdatigata...",
-"Error while updating app" => "Eraris ĝisdatigo de la aplikaĵo",
-"Updated" => "Ĝisdatigita",
-"Uninstalling ...." => "Malinstalante...",
-"Error while uninstalling app" => "Eraris malinstalo de aplikaĵo",
-"Uninstall" => "Malinstali",
-"Select a profile picture" => "Elekti profilan bildon",
-"Very weak password" => "Tre malforta pasvorto",
-"Weak password" => "Malforta pasvorto",
-"So-so password" => "Mezaĉa pasvorto",
-"Good password" => "Bona pasvorto",
-"Strong password" => "Forta pasvorto",
-"Delete" => "Forigi",
-"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
-"Restore encryption keys." => "Restaŭri ĉifroklavojn.",
-"Groups" => "Grupoj",
-"deleted {groupName}" => "{groupName} foriĝis",
-"undo" => "malfari",
-"never" => "neniam",
-"deleted {userName}" => "{userName} foriĝis",
-"add group" => "aldoni grupon",
-"A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
-"Error creating user" => "Eraris kreo de uzanto",
-"A valid password must be provided" => "Valida pasvorto devas proviziĝi",
-"Warning: Home directory for user \"{user}\" already exists" => "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
-"__language_name__" => "Esperanto",
-"SSL root certificates" => "Radikaj SSL-atestoj",
-"Encryption" => "Ĉifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
-"Info, warnings, errors and fatal issues" => "Informoj, avertoj, eraroj kaj fatalaĵoj",
-"Warnings, errors and fatal issues" => "Avertoj, eraroj kaj fatalaĵoj",
-"Errors and fatal issues" => "Eraroj kaj fatalaĵoj",
-"Fatal issues only" => "Fatalaĵoj nur",
-"None" => "Nenio",
-"Login" => "Ensaluti",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sekureca averto",
-"Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
-"Locale not working" => "La lokaĵaro ne funkcias",
-"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
-"Cron" => "Cron",
-"Sharing" => "Kunhavigo",
-"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
-"Allow public uploads" => "Permesi publikajn alŝutojn",
-"Expire after " => "Eksvalidigi post",
-"days" => "tagoj",
-"Allow resharing" => "Kapabligi rekunhavigon",
-"Security" => "Sekuro",
-"Email Server" => "Retpoŝtoservilo",
-"Send mode" => "Sendi pli",
-"From address" => "El adreso",
-"mail" => "retpoŝto",
-"Authentication method" => "Aŭtentiga metodo",
-"Authentication required" => "Aŭtentiĝo nepras",
-"Server address" => "Servila adreso",
-"Port" => "Pordo",
-"Credentials" => "Aŭtentigiloj",
-"SMTP Username" => "SMTP-uzantonomo",
-"SMTP Password" => "SMTP-pasvorto",
-"Send email" => "Sendi retpoŝton",
-"Log" => "Protokolo",
-"Log level" => "Registronivelo",
-"More" => "Pli",
-"Less" => "Malpli",
-"Version" => "Eldono",
-"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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "de",
-"Documentation:" => "Dokumentaro:",
-"User Documentation" => "Dokumentaro por uzantoj",
-"Admin Documentation" => "Administra dokumentaro",
-"Enable only for specific groups" => "Kapabligi nur por specifajn grupojn",
-"Uninstall App" => "Malinstali aplikaĵon",
-"Administrator Documentation" => "Dokumentaro por administrantoj",
-"Online Documentation" => "Reta dokumentaro",
-"Forum" => "Forumo",
-"Bugtracker" => "Cimoraportejo",
-"Commercial Support" => "Komerca subteno",
-"Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
-"Password" => "Pasvorto",
-"Your password was changed" => "Via pasvorto ŝanĝiĝis",
-"Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
-"Current password" => "Nuna pasvorto",
-"New password" => "Nova pasvorto",
-"Change password" => "Ŝanĝi la pasvorton",
-"Full Name" => "Plena nomo",
-"Email" => "Retpoŝto",
-"Your email address" => "Via retpoŝta adreso",
-"Profile picture" => "Profila bildo",
-"Upload new" => "Alŝuti novan",
-"Select new from Files" => "Elekti novan el dosieroj",
-"Remove image" => "Forigi bildon",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
-"Cancel" => "Nuligi",
-"Choose as profile image" => "Elekti kiel profilan bildon",
-"Language" => "Lingvo",
-"Help translate" => "Helpu traduki",
-"Import Root Certificate" => "Enporti radikan ateston",
-"Log-in password" => "Ensaluta pasvorto",
-"Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
-"Restore Encryption Keys" => "Restaŭri ĉifroklavojn",
-"Delete Encryption Keys" => "Forigi ĉifroklavojn",
-"Login Name" => "Ensaluti",
-"Create" => "Krei",
-"Search Users and Groups" => "Serĉi uzantojn kaj grupojn",
-"Add Group" => "Aldoni grupon",
-"Group" => "Grupo",
-"Everyone" => "Ĉiuj",
-"Admins" => "Administrantoj",
-"Default Quota" => "Defaŭlta kvoto",
-"Unlimited" => "Senlima",
-"Other" => "Alia",
-"Username" => "Uzantonomo",
-"Quota" => "Kvoto",
-"Last Login" => "Lasta ensaluto",
-"change full name" => "ŝanĝi plenan nomon",
-"set new password" => "agordi novan pasvorton",
-"Default" => "Defaŭlta"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
new file mode 100644
index 00000000000..510f4c14c78
--- /dev/null
+++ b/settings/l10n/es.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Files decrypted successfully" : "Los archivos fueron descifrados",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
+    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Couldn't remove app." : "No se pudo eliminar la aplicación.",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Backups restored successfully" : "Copia de seguridad restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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",
+    "Saved" : "Guardado",
+    "test email settings" : "probar configuración de correo electrónico",
+    "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 email. Please revise your settings." : "Ocurrió un problema al mandar 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
+    "Add trusted domain" : "Agregar dominio de confianza",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando...",
+    "Error while uninstalling app" : "Error al desinstalar la aplicación",
+    "Uninstall" : "Desinstalar",
+    "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",
+    "Valid until {date}" : "Válido hasta {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
+    "Restore encryption keys." : "Restaurar claves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "No es posible eliminar {objName}",
+    "Error creating group" : "Error al crear un grupo",
+    "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
+    "deleted {groupName}" : "borrado {groupName}",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "deleted {userName}" : "borrado {userName}",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Castellano",
+    "Personal Info" : "Información personal",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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.",
+    "Setup Warning" : "Advertencia de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones del principales no estén accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rendimiento de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+    "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 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.",
+    "PHP charset is not set to UTF-8" : "El conjunto de caracteres de PHP no está establecido en UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
+    "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.",
+    "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 los archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity checks" : "Probar la conectividad",
+    "No problems found" : "No se han encontrado problemas",
+    "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>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's 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",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
+    "Enforce password protection" : "Forzar la protección por contraseña.",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Set default expiration date" : "Establecer fecha de caducidad predeterminada",
+    "Expire after " : "Caduca luego de",
+    "days" : "días",
+    "Enforce expiration date" : "Imponer fecha de caducidad",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
+    "Exclude groups from sharing" : "Excluye grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
+    "Security" : "Seguridad",
+    "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.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticació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",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Más aplicaciones",
+    "Add your app" : "Agregue su aplicación",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de usuario",
+    "Admin Documentation" : "Documentación para administradores",
+    "Update to %s" : "Actualizado a %s",
+    "Enable only for specific groups" : "Activar solamente para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "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 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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Common Name" : "Nombre común",
+    "Valid until" : "Válido hasta",
+    "Issued By" : "Emitido por",
+    "Valid until %s" : "Válido hasta %s",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+    "Restore Encryption Keys" : "Restaurar claves de cifrado",
+    "Delete Encryption Keys" : "Eliminar claves de cifrado",
+    "Show storage location" : "Mostrar la ubicación del almacenamiento",
+    "Show last log in" : "Mostrar el último inicio de sesión",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users and Groups" : "Buscar usuarios y grupos",
+    "Add Group" : "Agregar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "Storage Location" : "Ubicación de almacenamiento",
+    "Last Login" : "Último inicio de sesión",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
new file mode 100644
index 00000000000..15113b4ff2d
--- /dev/null
+++ b/settings/l10n/es.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Files decrypted successfully" : "Los archivos fueron descifrados",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
+    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Couldn't remove app." : "No se pudo eliminar la aplicación.",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Backups restored successfully" : "Copia de seguridad restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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",
+    "Saved" : "Guardado",
+    "test email settings" : "probar configuración de correo electrónico",
+    "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 email. Please revise your settings." : "Ocurrió un problema al mandar 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
+    "Add trusted domain" : "Agregar dominio de confianza",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando...",
+    "Error while uninstalling app" : "Error al desinstalar la aplicación",
+    "Uninstall" : "Desinstalar",
+    "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",
+    "Valid until {date}" : "Válido hasta {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
+    "Restore encryption keys." : "Restaurar claves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "No es posible eliminar {objName}",
+    "Error creating group" : "Error al crear un grupo",
+    "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
+    "deleted {groupName}" : "borrado {groupName}",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "deleted {userName}" : "borrado {userName}",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Castellano",
+    "Personal Info" : "Información personal",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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.",
+    "Setup Warning" : "Advertencia de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones del principales no estén accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rendimiento de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+    "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 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.",
+    "PHP charset is not set to UTF-8" : "El conjunto de caracteres de PHP no está establecido en UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
+    "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.",
+    "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 los archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity checks" : "Probar la conectividad",
+    "No problems found" : "No se han encontrado problemas",
+    "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>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's 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",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
+    "Enforce password protection" : "Forzar la protección por contraseña.",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Set default expiration date" : "Establecer fecha de caducidad predeterminada",
+    "Expire after " : "Caduca luego de",
+    "days" : "días",
+    "Enforce expiration date" : "Imponer fecha de caducidad",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
+    "Exclude groups from sharing" : "Excluye grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
+    "Security" : "Seguridad",
+    "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.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticació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",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Más aplicaciones",
+    "Add your app" : "Agregue su aplicación",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de usuario",
+    "Admin Documentation" : "Documentación para administradores",
+    "Update to %s" : "Actualizado a %s",
+    "Enable only for specific groups" : "Activar solamente para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "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 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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Common Name" : "Nombre común",
+    "Valid until" : "Válido hasta",
+    "Issued By" : "Emitido por",
+    "Valid until %s" : "Válido hasta %s",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+    "Restore Encryption Keys" : "Restaurar claves de cifrado",
+    "Delete Encryption Keys" : "Eliminar claves de cifrado",
+    "Show storage location" : "Mostrar la ubicación del almacenamiento",
+    "Show last log in" : "Mostrar el último inicio de sesión",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users and Groups" : "Buscar usuarios y grupos",
+    "Add Group" : "Agregar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "Storage Location" : "Ubicación de almacenamiento",
+    "Last Login" : "Último inicio de sesión",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
deleted file mode 100644
index 91fdbe2f3e1..00000000000
--- a/settings/l10n/es.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"Not enabled" => "No habilitado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Error de autenticación",
-"Your full name has been changed." => "Se ha cambiado su nombre completo.",
-"Unable to change full name" => "No se puede cambiar el nombre completo",
-"Group already exists" => "El grupo ya existe",
-"Unable to add group" => "No se pudo añadir el grupo",
-"Files decrypted successfully" => "Los archivos fueron descifrados",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
-"Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
-"Encryption keys deleted permanently" => "Claves de cifrado eliminadas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
-"Couldn't remove app." => "No se pudo eliminar la aplicación.",
-"Email saved" => "Correo electrónico guardado",
-"Invalid email" => "Correo electrónico no válido",
-"Unable to delete group" => "No se pudo eliminar el grupo",
-"Unable to delete user" => "No se pudo eliminar el usuario",
-"Backups restored successfully" => "Copia de seguridad restaurada",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Petición no válida",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
-"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la aplicación.",
-"Wrong password" => "Contraseña incorrecta",
-"No user supplied" => "No se especificó un usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
-"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",
-"Saved" => "Guardado",
-"test email settings" => "probar configuración de correo electrónico",
-"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 email. Please revise your settings." => "Ocurrió un problema al mandar 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
-"Add trusted domain" => "Agregar dominio de confianza",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Espere, por favor....",
-"Error while disabling app" => "Error mientras se desactivaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Error mientras se activaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando...",
-"Error while uninstalling app" => "Error al desinstalar la aplicación",
-"Uninstall" => "Desinstalar",
-"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",
-"Valid until {date}" => "Válido hasta {date}",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Delete encryption keys permanently." => "Eliminar claves de cifrado permanentemente.",
-"Restore encryption keys." => "Restaurar claves de cifrado.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "No es posible eliminar {objName}",
-"Error creating group" => "Error al crear un grupo",
-"A valid group name must be provided" => "Se debe dar un nombre válido para el grupo ",
-"deleted {groupName}" => "borrado {groupName}",
-"undo" => "deshacer",
-"no group" => "sin grupo",
-"never" => "nunca",
-"deleted {userName}" => "borrado {userName}",
-"add group" => "añadir Grupo",
-"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
-"Error creating user" => "Error al crear usuario",
-"A valid password must be provided" => "Se debe proporcionar una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
-"__language_name__" => "Castellano",
-"Personal Info" => "Información personal",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
-"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.",
-"Setup Warning" => "Advertencia de configuración",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones del principales no estén accesibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Información de rendimiento de la base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
-"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 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.",
-"PHP charset is not set to UTF-8" => "El conjunto de caracteres de PHP no está establecido en UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
-"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.",
-"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 los archivos.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
-"URL generation in notification emails" => "Generación de URL en mensajes de notificación",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
-"Connectivity checks" => "Probar la conectividad",
-"No problems found" => "No se han encontrado problemas",
-"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>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron fue ejecutado por última vez a las %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
-"Cron was not executed yet!" => "¡Cron aún no ha sido ejecutado!",
-"Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
-"Use system's 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",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
-"Allow users to share via link" => "Permite a los usuarios compartir por medio de enlaces",
-"Enforce password protection" => "Forzar la protección por contraseña.",
-"Allow public uploads" => "Permitir subidas públicas",
-"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
-"Expire after " => "Caduca luego de",
-"days" => "días",
-"Enforce expiration date" => "Imponer fecha de caducidad",
-"Allow resharing" => "Permitir re-compartición",
-"Restrict users to only share with users in their groups" => "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
-"Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
-"Exclude groups from sharing" => "Excluye grupos de compartir",
-"These groups will still be able to receive shares, but not to initiate them." => "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
-"Security" => "Seguridad",
-"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.",
-"Send mode" => "Modo de envío",
-"From address" => "Desde la dirección",
-"mail" => "correo electrónico",
-"Authentication method" => "Método de autenticació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",
-"Store credentials" => "Almacenar credenciales",
-"Test email settings" => "Probar configuración de correo electrónico",
-"Send email" => "Enviar mensaje",
-"Log" => "Registro",
-"Log level" => "Nivel de registro",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Más aplicaciones",
-"Add your app" => "Agregue su aplicación",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación de usuario",
-"Admin Documentation" => "Documentación para administradores",
-"Update to %s" => "Actualizado a %s",
-"Enable only for specific groups" => "Activar solamente para grupos específicos",
-"Uninstall App" => "Desinstalar aplicación",
-"Administrator Documentation" => "Documentación de administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Rastreador de fallos",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
-"Show First Run Wizard again" => "Mostrar nuevamente el Asistente de ejecución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Su contraseña ha sido cambiada",
-"Unable to change your password" => "No se ha podido cambiar su contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña",
-"Change password" => "Cambiar contraseña",
-"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 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.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Seleccionar como imagen de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ayúdanos a traducir",
-"Common Name" => "Nombre común",
-"Valid until" => "Válido hasta",
-"Issued By" => "Emitido por",
-"Valid until %s" => "Válido hasta %s",
-"Import Root Certificate" => "Importar certificado raíz",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
-"Restore Encryption Keys" => "Restaurar claves de cifrado",
-"Delete Encryption Keys" => "Eliminar claves de cifrado",
-"Show storage location" => "Mostrar la ubicación del almacenamiento",
-"Show last log in" => "Mostrar el último inicio de sesión",
-"Login Name" => "Nombre de usuario",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña de administración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Search Users and Groups" => "Buscar usuarios y grupos",
-"Add Group" => "Agregar grupo",
-"Group" => "Grupo",
-"Everyone" => "Todos",
-"Admins" => "Administradores",
-"Default Quota" => "Cuota predeterminada",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Otro",
-"Username" => "Nombre de usuario",
-"Group Admin for" => "Grupo administrador para",
-"Quota" => "Cuota",
-"Storage Location" => "Ubicación de almacenamiento",
-"Last Login" => "Último inicio de sesión",
-"change full name" => "cambiar el nombre completo",
-"set new password" => "establecer nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
new file mode 100644
index 00000000000..278fdc3f353
--- /dev/null
+++ b/settings/l10n/es_AR.js
@@ -0,0 +1,167 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "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",
+    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
+    "Email saved" : "e-mail guardado",
+    "Invalid email" : "El e-mail no es válido ",
+    "Unable to delete group" : "No fue posible borrar el grupo",
+    "Unable to delete user" : "No fue posible borrar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
+    "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",
+    "Saved" : "Guardado",
+    "test email settings" : "Configuración de correo de prueba.",
+    "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
+    "Email sent" : "e-mail mandado",
+    "You need to set your user email before being able to send test emails." : "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, esperá....",
+    "Error while disabling app" : "Se ha producido un error mientras se deshabilitaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Se ha producido un error mientras se habilitaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error al actualizar App",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imágen de perfil",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Delete" : "Borrar",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "agregar grupo",
+    "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)",
+    "SSL root certificates" : "certificados SSL raíz",
+    "Encryption" : "Encriptación",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Administrador 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á 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",
+    "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.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir Re-Compartir",
+    "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para 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",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
+    "Send mode" : "Modo de envio",
+    "From address" : "Dirección remitente",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Autentificación requerida",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Configuracion de correo de prueba.",
+    "Send email" : "Enviar correo",
+    "Log" : "Log",
+    "Log level" : "Nivel de Log",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de Usuario",
+    "Admin Documentation" : "Documentación de Administrador.",
+    "Administrator Documentation" : "Documentación de Administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Informar errores",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Tu contraseña fue cambiada",
+    "Unable to change your password" : "No fue posible cambiar tu contraseña",
+    "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 and receive notifications" : "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
+    "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",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Create" : "Crear",
+    "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",
+    "Group" : "Grupo",
+    "Default Quota" : "Cuota predeterminada",
+    "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",
+    "Quota" : "Cuota",
+    "change full name" : "Cambiar nombre completo",
+    "set new password" : "Configurar nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
new file mode 100644
index 00000000000..0614fb56d37
--- /dev/null
+++ b/settings/l10n/es_AR.json
@@ -0,0 +1,165 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "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",
+    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
+    "Email saved" : "e-mail guardado",
+    "Invalid email" : "El e-mail no es válido ",
+    "Unable to delete group" : "No fue posible borrar el grupo",
+    "Unable to delete user" : "No fue posible borrar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
+    "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",
+    "Saved" : "Guardado",
+    "test email settings" : "Configuración de correo de prueba.",
+    "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
+    "Email sent" : "e-mail mandado",
+    "You need to set your user email before being able to send test emails." : "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, esperá....",
+    "Error while disabling app" : "Se ha producido un error mientras se deshabilitaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Se ha producido un error mientras se habilitaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error al actualizar App",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imágen de perfil",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Delete" : "Borrar",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "agregar grupo",
+    "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)",
+    "SSL root certificates" : "certificados SSL raíz",
+    "Encryption" : "Encriptación",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Administrador 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á 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",
+    "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.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir Re-Compartir",
+    "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para 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",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
+    "Send mode" : "Modo de envio",
+    "From address" : "Dirección remitente",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Autentificación requerida",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Configuracion de correo de prueba.",
+    "Send email" : "Enviar correo",
+    "Log" : "Log",
+    "Log level" : "Nivel de Log",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de Usuario",
+    "Admin Documentation" : "Documentación de Administrador.",
+    "Administrator Documentation" : "Documentación de Administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Informar errores",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Tu contraseña fue cambiada",
+    "Unable to change your password" : "No fue posible cambiar tu contraseña",
+    "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 and receive notifications" : "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
+    "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",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Create" : "Crear",
+    "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",
+    "Group" : "Grupo",
+    "Default Quota" : "Cuota predeterminada",
+    "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",
+    "Quota" : "Cuota",
+    "change full name" : "Cambiar nombre completo",
+    "set new password" : "Configurar nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
deleted file mode 100644
index 1b27515d77d..00000000000
--- a/settings/l10n/es_AR.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"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",
-"Files decrypted successfully" => "Archivos des-encriptados correctamente",
-"Email saved" => "e-mail guardado",
-"Invalid email" => "El e-mail no es válido ",
-"Unable to delete group" => "No fue posible borrar el grupo",
-"Unable to delete user" => "No fue posible borrar el usuario",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
-"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",
-"Saved" => "Guardado",
-"test email settings" => "Configuración de correo de prueba.",
-"If you received this email, the settings seem to be correct." => "Si recibió este correo, la configuración parece estar correcta.",
-"Email sent" => "e-mail mandado",
-"You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Por favor, esperá....",
-"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error al actualizar App",
-"Updated" => "Actualizado",
-"Select a profile picture" => "Seleccionar una imágen de perfil",
-"Very weak password" => "Contraseña muy débil.",
-"Weak password" => "Contraseña débil.",
-"So-so password" => "Contraseña de nivel medio. ",
-"Good password" => "Buena contraseña. ",
-"Strong password" => "Contraseña fuerte.",
-"Delete" => "Borrar",
-"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
-"Groups" => "Grupos",
-"undo" => "deshacer",
-"never" => "nunca",
-"add group" => "agregar grupo",
-"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)",
-"SSL root certificates" => "certificados SSL raíz",
-"Encryption" => "Encriptación",
-"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",
-"Plain" => "Plano",
-"NT LAN Manager" => "Administrador 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á 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",
-"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.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-"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.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
-"Allow public uploads" => "Permitir subidas públicas",
-"Allow resharing" => "Permitir Re-Compartir",
-"Allow users to send mail notification for shared files" => "Habilitar a los usuarios para 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",
-"Email Server" => "Servidor de correo electrónico",
-"This is used for sending out notifications." => "Esto es usado para enviar notificaciones.",
-"Send mode" => "Modo de envio",
-"From address" => "Dirección remitente",
-"Authentication method" => "Método de autenticación",
-"Authentication required" => "Autentificación requerida",
-"Server address" => "Dirección del servidor",
-"Port" => "Puerto",
-"Credentials" => "Credenciales",
-"SMTP Username" => "Nombre de usuario SMTP",
-"SMTP Password" => "Contraseña SMTP",
-"Test email settings" => "Configuracion de correo de prueba.",
-"Send email" => "Enviar correo",
-"Log" => "Log",
-"Log level" => "Nivel de Log",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación de Usuario",
-"Admin Documentation" => "Documentación de Administrador.",
-"Administrator Documentation" => "Documentación de Administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Informar errores",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtené Apps para sincronizar tus archivos",
-"Show First Run Wizard again" => "Mostrar de nuevo el asistente de primera ejecución",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Tu contraseña fue cambiada",
-"Unable to change your password" => "No fue posible cambiar tu contraseña",
-"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 and receive notifications" => "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
-"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",
-"Import Root Certificate" => "Importar certificado raíz",
-"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",
-"Create" => "Crear",
-"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",
-"Group" => "Grupo",
-"Default Quota" => "Cuota predeterminada",
-"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",
-"Quota" => "Cuota",
-"change full name" => "Cambiar nombre completo",
-"set new password" => "Configurar nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_CL.js b/settings/l10n/es_CL.js
new file mode 100644
index 00000000000..b51f930e83a
--- /dev/null
+++ b/settings/l10n/es_CL.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Password" : "Clave",
+    "Cancel" : "Cancelar",
+    "Username" : "Usuario"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_CL.json b/settings/l10n/es_CL.json
new file mode 100644
index 00000000000..981c7eeb897
--- /dev/null
+++ b/settings/l10n/es_CL.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Password" : "Clave",
+    "Cancel" : "Cancelar",
+    "Username" : "Usuario"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php
deleted file mode 100644
index fc5e328f3bc..00000000000
--- a/settings/l10n/es_CL.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Clave",
-"Cancel" => "Cancelar",
-"Username" => "Usuario"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
new file mode 100644
index 00000000000..1c48d5b19ed
--- /dev/null
+++ b/settings/l10n/es_MX.js
@@ -0,0 +1,133 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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",
+    "Email sent" : "Correo electrónico enviado",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Español (México)",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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.",
+    "Setup Warning" : "Advertencia de configuración",
+    "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. 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.",
+    "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 los archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "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>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir re-compartición",
+    "Security" : "Seguridad",
+    "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",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "User Documentation" : "Documentación de usuario",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
new file mode 100644
index 00000000000..7dccd57fbf7
--- /dev/null
+++ b/settings/l10n/es_MX.json
@@ -0,0 +1,131 @@
+{ "translations": {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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",
+    "Email sent" : "Correo electrónico enviado",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Español (México)",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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.",
+    "Setup Warning" : "Advertencia de configuración",
+    "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. 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.",
+    "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 los archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "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>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir re-compartición",
+    "Security" : "Seguridad",
+    "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",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "User Documentation" : "Documentación de usuario",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "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",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
deleted file mode 100644
index 4db87b4e68b..00000000000
--- a/settings/l10n/es_MX.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitar",
-"Authentication error" => "Error de autenticación",
-"Your full name has been changed." => "Se ha cambiado su nombre completo.",
-"Unable to change full name" => "No se puede cambiar el nombre completo",
-"Group already exists" => "El grupo ya existe",
-"Unable to add group" => "No se pudo añadir el grupo",
-"Email saved" => "Correo electrónico guardado",
-"Invalid email" => "Correo electrónico no válido",
-"Unable to delete group" => "No se pudo eliminar el grupo",
-"Unable to delete user" => "No se pudo eliminar el usuario",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Petición no válida",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
-"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la aplicación.",
-"Wrong password" => "Contraseña incorrecta",
-"No user supplied" => "No se especificó un usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
-"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",
-"Email sent" => "Correo electrónico enviado",
-"All" => "Todos",
-"Please wait...." => "Espere, por favor....",
-"Error while disabling app" => "Error mientras se desactivaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Error mientras se activaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Updated" => "Actualizado",
-"Select a profile picture" => "Seleccionar una imagen de perfil",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Groups" => "Grupos",
-"undo" => "deshacer",
-"never" => "nunca",
-"add group" => "añadir Grupo",
-"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
-"Error creating user" => "Error al crear usuario",
-"A valid password must be provided" => "Se debe proporcionar una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
-"__language_name__" => "Español (México)",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
-"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.",
-"Setup Warning" => "Advertencia de configuración",
-"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. 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.",
-"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 los archivos.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
-"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>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
-"Allow public uploads" => "Permitir subidas públicas",
-"Allow resharing" => "Permitir re-compartición",
-"Security" => "Seguridad",
-"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",
-"Less" => "Menos",
-"Version" => "Versión",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"User Documentation" => "Documentación de usuario",
-"Administrator Documentation" => "Documentación de administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Rastreador de fallos",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"Show First Run Wizard again" => "Mostrar nuevamente el Asistente de ejecución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Su contraseña ha sido cambiada",
-"Unable to change your password" => "No se ha podido cambiar su contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña",
-"Change password" => "Cambiar contraseña",
-"Full Name" => "Nombre completo",
-"Email" => "Correo electrónico",
-"Your email address" => "Su dirección de correo",
-"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.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Seleccionar como imagen de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ayúdanos a traducir",
-"Import Root Certificate" => "Importar certificado raíz",
-"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",
-"Login Name" => "Nombre de usuario",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña de administración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Otro",
-"Username" => "Nombre de usuario",
-"change full name" => "cambiar el nombre completo",
-"set new password" => "establecer nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
new file mode 100644
index 00000000000..27e936aedbc
--- /dev/null
+++ b/settings/l10n/et_EE.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
+    "Authentication error" : "Autentimise viga",
+    "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
+    "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
+    "Group already exists" : "Grupp on juba olemas",
+    "Unable to add group" : "Keela grupi lisamine",
+    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
+    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
+    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
+    "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
+    "Email saved" : "Kiri on salvestatud",
+    "Invalid email" : "Vigane e-post",
+    "Unable to delete group" : "Grupi kustutamine ebaõnnestus",
+    "Unable to delete user" : "Kasutaja kustutamine ebaõnnestus",
+    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
+    "Language changed" : "Keel on muudetud",
+    "Invalid request" : "Vigane päring",
+    "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
+    "Unable to add user to group %s" : "Kasutajat ei saa lisada gruppi %s",
+    "Unable to remove user from group %s" : "Kasutajat ei saa eemaldada grupist %s",
+    "Couldn't update app." : "Rakenduse uuendamine ebaõnnestus.",
+    "Wrong password" : "Vale parool",
+    "No user supplied" : "Kasutajat ei sisestatud",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
+    "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",
+    "Saved" : "Salvestatud",
+    "test email settings" : "testi e-posti seadeid",
+    "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
+    "Email sent" : "E-kiri on saadetud",
+    "You need to set your user email before being able to send test emails." : "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
+    "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Sending..." : "Saadan...",
+    "All" : "Kõik",
+    "Please wait...." : "Palun oota...",
+    "Error while disabling app" : "Viga rakenduse keelamisel",
+    "Disable" : "Lülita välja",
+    "Enable" : "Lülita sisse",
+    "Error while enabling app" : "Viga rakenduse lubamisel",
+    "Updating...." : "Uuendamine...",
+    "Error while updating app" : "Viga rakenduse uuendamisel",
+    "Updated" : "Uuendatud",
+    "Uninstalling ...." : "Eemaldan...",
+    "Error while uninstalling app" : "Viga rakendi eemaldamisel",
+    "Uninstall" : "Eemalda",
+    "Select a profile picture" : "Vali profiili pilt",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Valid until {date}" : "Kehtib kuni {date}",
+    "Delete" : "Kustuta",
+    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
+    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
+    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
+    "Groups" : "Grupid",
+    "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
+    "Error creating group" : "Viga grupi loomisel",
+    "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
+    "deleted {groupName}" : "kustutatud {groupName}",
+    "undo" : "tagasi",
+    "never" : "mitte kunagi",
+    "deleted {userName}" : "kustutatud {userName}",
+    "add group" : "lisa grupp",
+    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
+    "Error creating user" : "Viga kasutaja loomisel",
+    "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
+    "__language_name__" : "Eesti",
+    "SSL root certificates" : "SSL root sertifikaadid",
+    "Encryption" : "Krüpteerimine",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
+    "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
+    "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",
+    "Plain" : "Tavatekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Paigalduse hoiatus",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
+    "Database Performance Info" : "Andmebaasi toimimise info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Moodul 'fileinfo' puudub",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
+    "Your PHP version is outdated" : "PHP versioon on aegunud",
+    "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." : "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
+    "PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
+    "Locale not working" : "Lokalisatsioon ei toimi",
+    "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
+    "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
+    "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity checks" : "Ühenduse kontrollimine",
+    "No problems found" : "Ühtegi probleemi ei leitud",
+    "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron käivitati viimati %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
+    "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
+    "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Sharing" : "Jagamine",
+    "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
+    "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
+    "Enforce password protection" : "Sunni parooliga kaitsmist",
+    "Allow public uploads" : "Luba avalikud üleslaadimised",
+    "Set default expiration date" : "Määra vaikimisi aegumise kuupäev",
+    "Expire after " : "Aegu pärast",
+    "days" : "päeva",
+    "Enforce expiration date" : "Sunnitud aegumise kuupäev",
+    "Allow resharing" : "Luba edasijagamine",
+    "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
+    "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
+    "Exclude groups from sharing" : "Eemalda grupid jagamisest",
+    "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Security" : "Turvalisus",
+    "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.",
+    "Email Server" : "Postiserver",
+    "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
+    "Send mode" : "Saatmise viis",
+    "From address" : "Saatja aadress",
+    "mail" : "e-mail",
+    "Authentication method" : "Autentimise meetod",
+    "Authentication required" : "Autentimine on vajalik",
+    "Server address" : "Serveri aadress",
+    "Port" : "Port",
+    "Credentials" : "Kasutajatunnused",
+    "SMTP Username" : "SMTP kasutajatunnus",
+    "SMTP Password" : "SMTP parool",
+    "Store credentials" : "Säilita kasutajaandmed",
+    "Test email settings" : "Testi e-posti seadeid",
+    "Send email" : "Saada kiri",
+    "Log" : "Logi",
+    "Log level" : "Logi tase",
+    "More" : "Rohkem",
+    "Less" : "Vähem",
+    "Version" : "Versioon",
+    "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>." : "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
+    "More apps" : "Rohkem rakendusi",
+    "Add your app" : "Lisa oma rakendus",
+    "by" : "lisas",
+    "licensed" : "litsenseeritud",
+    "Documentation:" : "Dokumentatsioon:",
+    "User Documentation" : "Kasutaja dokumentatsioon",
+    "Admin Documentation" : "Admin dokumentatsioon",
+    "Update to %s" : "Uuenda versioonile %s",
+    "Enable only for specific groups" : "Luba ainult kindlad grupid",
+    "Uninstall App" : "Eemada rakend",
+    "Administrator Documentation" : "Administraatori dokumentatsioon",
+    "Online Documentation" : "Online dokumentatsioon",
+    "Forum" : "Foorum",
+    "Bugtracker" : "Vigade nimekiri",
+    "Commercial Support" : "Tasuline kasutajatugi",
+    "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
+    "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
+    "Password" : "Parool",
+    "Your password was changed" : "Sinu parooli on muudetud",
+    "Unable to change your password" : "Sa ei saa oma parooli muuta",
+    "Current password" : "Praegune parool",
+    "New password" : "Uus parool",
+    "Change password" : "Muuda parooli",
+    "Full Name" : "Täispikk nimi",
+    "Email" : "E-post",
+    "Your email address" : "Sinu e-posti aadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
+    "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.",
+    "Cancel" : "Loobu",
+    "Choose as profile image" : "Vali profiilipildiks",
+    "Language" : "Keel",
+    "Help translate" : "Aita tõlkida",
+    "Common Name" : "Üldnimetus",
+    "Valid until" : "Kehtib kuni",
+    "Issued By" : "isas",
+    "Valid until %s" : "Kehtib kuni %s",
+    "Import Root Certificate" : "Impordi root sertifikaadid",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
+    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
+    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
+    "Show storage location" : "Näita salvestusruumi asukohta",
+    "Show last log in" : "Viimane sisselogimine",
+    "Login Name" : "Kasutajanimi",
+    "Create" : "Lisa",
+    "Admin Recovery Password" : "Admini parooli taastamine",
+    "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
+    "Add Group" : "Lisa grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Igaüks",
+    "Admins" : "Haldurid",
+    "Default Quota" : "Vaikimisi kvoot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
+    "Unlimited" : "Piiramatult",
+    "Other" : "Muu",
+    "Username" : "Kasutajanimi",
+    "Quota" : "Mahupiir",
+    "Storage Location" : "Mahu asukoht",
+    "Last Login" : "Viimane sisselogimine",
+    "change full name" : "Muuda täispikka nime",
+    "set new password" : "määra uus parool",
+    "Default" : "Vaikeväärtus"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
new file mode 100644
index 00000000000..52549e1e640
--- /dev/null
+++ b/settings/l10n/et_EE.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
+    "Authentication error" : "Autentimise viga",
+    "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
+    "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
+    "Group already exists" : "Grupp on juba olemas",
+    "Unable to add group" : "Keela grupi lisamine",
+    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
+    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
+    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
+    "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
+    "Email saved" : "Kiri on salvestatud",
+    "Invalid email" : "Vigane e-post",
+    "Unable to delete group" : "Grupi kustutamine ebaõnnestus",
+    "Unable to delete user" : "Kasutaja kustutamine ebaõnnestus",
+    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
+    "Language changed" : "Keel on muudetud",
+    "Invalid request" : "Vigane päring",
+    "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
+    "Unable to add user to group %s" : "Kasutajat ei saa lisada gruppi %s",
+    "Unable to remove user from group %s" : "Kasutajat ei saa eemaldada grupist %s",
+    "Couldn't update app." : "Rakenduse uuendamine ebaõnnestus.",
+    "Wrong password" : "Vale parool",
+    "No user supplied" : "Kasutajat ei sisestatud",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
+    "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",
+    "Saved" : "Salvestatud",
+    "test email settings" : "testi e-posti seadeid",
+    "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
+    "Email sent" : "E-kiri on saadetud",
+    "You need to set your user email before being able to send test emails." : "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
+    "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Sending..." : "Saadan...",
+    "All" : "Kõik",
+    "Please wait...." : "Palun oota...",
+    "Error while disabling app" : "Viga rakenduse keelamisel",
+    "Disable" : "Lülita välja",
+    "Enable" : "Lülita sisse",
+    "Error while enabling app" : "Viga rakenduse lubamisel",
+    "Updating...." : "Uuendamine...",
+    "Error while updating app" : "Viga rakenduse uuendamisel",
+    "Updated" : "Uuendatud",
+    "Uninstalling ...." : "Eemaldan...",
+    "Error while uninstalling app" : "Viga rakendi eemaldamisel",
+    "Uninstall" : "Eemalda",
+    "Select a profile picture" : "Vali profiili pilt",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Valid until {date}" : "Kehtib kuni {date}",
+    "Delete" : "Kustuta",
+    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
+    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
+    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
+    "Groups" : "Grupid",
+    "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
+    "Error creating group" : "Viga grupi loomisel",
+    "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
+    "deleted {groupName}" : "kustutatud {groupName}",
+    "undo" : "tagasi",
+    "never" : "mitte kunagi",
+    "deleted {userName}" : "kustutatud {userName}",
+    "add group" : "lisa grupp",
+    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
+    "Error creating user" : "Viga kasutaja loomisel",
+    "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
+    "__language_name__" : "Eesti",
+    "SSL root certificates" : "SSL root sertifikaadid",
+    "Encryption" : "Krüpteerimine",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
+    "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
+    "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",
+    "Plain" : "Tavatekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Paigalduse hoiatus",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
+    "Database Performance Info" : "Andmebaasi toimimise info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Moodul 'fileinfo' puudub",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
+    "Your PHP version is outdated" : "PHP versioon on aegunud",
+    "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." : "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
+    "PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
+    "Locale not working" : "Lokalisatsioon ei toimi",
+    "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
+    "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
+    "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity checks" : "Ühenduse kontrollimine",
+    "No problems found" : "Ühtegi probleemi ei leitud",
+    "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron käivitati viimati %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
+    "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
+    "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Sharing" : "Jagamine",
+    "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
+    "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
+    "Enforce password protection" : "Sunni parooliga kaitsmist",
+    "Allow public uploads" : "Luba avalikud üleslaadimised",
+    "Set default expiration date" : "Määra vaikimisi aegumise kuupäev",
+    "Expire after " : "Aegu pärast",
+    "days" : "päeva",
+    "Enforce expiration date" : "Sunnitud aegumise kuupäev",
+    "Allow resharing" : "Luba edasijagamine",
+    "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
+    "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
+    "Exclude groups from sharing" : "Eemalda grupid jagamisest",
+    "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Security" : "Turvalisus",
+    "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.",
+    "Email Server" : "Postiserver",
+    "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
+    "Send mode" : "Saatmise viis",
+    "From address" : "Saatja aadress",
+    "mail" : "e-mail",
+    "Authentication method" : "Autentimise meetod",
+    "Authentication required" : "Autentimine on vajalik",
+    "Server address" : "Serveri aadress",
+    "Port" : "Port",
+    "Credentials" : "Kasutajatunnused",
+    "SMTP Username" : "SMTP kasutajatunnus",
+    "SMTP Password" : "SMTP parool",
+    "Store credentials" : "Säilita kasutajaandmed",
+    "Test email settings" : "Testi e-posti seadeid",
+    "Send email" : "Saada kiri",
+    "Log" : "Logi",
+    "Log level" : "Logi tase",
+    "More" : "Rohkem",
+    "Less" : "Vähem",
+    "Version" : "Versioon",
+    "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>." : "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
+    "More apps" : "Rohkem rakendusi",
+    "Add your app" : "Lisa oma rakendus",
+    "by" : "lisas",
+    "licensed" : "litsenseeritud",
+    "Documentation:" : "Dokumentatsioon:",
+    "User Documentation" : "Kasutaja dokumentatsioon",
+    "Admin Documentation" : "Admin dokumentatsioon",
+    "Update to %s" : "Uuenda versioonile %s",
+    "Enable only for specific groups" : "Luba ainult kindlad grupid",
+    "Uninstall App" : "Eemada rakend",
+    "Administrator Documentation" : "Administraatori dokumentatsioon",
+    "Online Documentation" : "Online dokumentatsioon",
+    "Forum" : "Foorum",
+    "Bugtracker" : "Vigade nimekiri",
+    "Commercial Support" : "Tasuline kasutajatugi",
+    "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
+    "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
+    "Password" : "Parool",
+    "Your password was changed" : "Sinu parooli on muudetud",
+    "Unable to change your password" : "Sa ei saa oma parooli muuta",
+    "Current password" : "Praegune parool",
+    "New password" : "Uus parool",
+    "Change password" : "Muuda parooli",
+    "Full Name" : "Täispikk nimi",
+    "Email" : "E-post",
+    "Your email address" : "Sinu e-posti aadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
+    "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.",
+    "Cancel" : "Loobu",
+    "Choose as profile image" : "Vali profiilipildiks",
+    "Language" : "Keel",
+    "Help translate" : "Aita tõlkida",
+    "Common Name" : "Üldnimetus",
+    "Valid until" : "Kehtib kuni",
+    "Issued By" : "isas",
+    "Valid until %s" : "Kehtib kuni %s",
+    "Import Root Certificate" : "Impordi root sertifikaadid",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
+    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
+    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
+    "Show storage location" : "Näita salvestusruumi asukohta",
+    "Show last log in" : "Viimane sisselogimine",
+    "Login Name" : "Kasutajanimi",
+    "Create" : "Lisa",
+    "Admin Recovery Password" : "Admini parooli taastamine",
+    "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
+    "Add Group" : "Lisa grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Igaüks",
+    "Admins" : "Haldurid",
+    "Default Quota" : "Vaikimisi kvoot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
+    "Unlimited" : "Piiramatult",
+    "Other" : "Muu",
+    "Username" : "Kasutajanimi",
+    "Quota" : "Mahupiir",
+    "Storage Location" : "Mahu asukoht",
+    "Last Login" : "Viimane sisselogimine",
+    "change full name" : "Muuda täispikka nime",
+    "set new password" : "määra uus parool",
+    "Default" : "Vaikeväärtus"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
deleted file mode 100644
index e38cb7ff242..00000000000
--- a/settings/l10n/et_EE.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Sisse lülitatud",
-"Not enabled" => "Pole sisse lülitatud",
-"Recommended" => "Soovitatud",
-"Authentication error" => "Autentimise viga",
-"Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
-"Unable to change full name" => "Täispika nime muutmine ebaõnnestus",
-"Group already exists" => "Grupp on juba olemas",
-"Unable to add group" => "Keela grupi lisamine",
-"Files decrypted successfully" => "Failide krüpteerimine õnnestus",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
-"Couldn't decrypt your files, check your password and try again" => "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
-"Encryption keys deleted permanently" => "Krüpteerimisvõtmed kustutatud lõplikult",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
-"Couldn't remove app." => "Ei suutnud rakendit eemaldada.",
-"Email saved" => "Kiri on salvestatud",
-"Invalid email" => "Vigane e-post",
-"Unable to delete group" => "Grupi kustutamine ebaõnnestus",
-"Unable to delete user" => "Kasutaja kustutamine ebaõnnestus",
-"Backups restored successfully" => "Varukoopiad taastatud edukalt.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
-"Language changed" => "Keel on muudetud",
-"Invalid request" => "Vigane päring",
-"Admins can't remove themself from the admin group" => "Administraatorid ei saa ise end admin grupist eemaldada",
-"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
-"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
-"Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.",
-"Wrong password" => "Vale parool",
-"No user supplied" => "Kasutajat ei sisestatud",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
-"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",
-"Saved" => "Salvestatud",
-"test email settings" => "testi e-posti seadeid",
-"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.",
-"A problem occurred while sending the email. Please revise your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
-"Email sent" => "E-kiri on saadetud",
-"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
-"Add trusted domain" => "Lis ausaldusväärne domeen",
-"Sending..." => "Saadan...",
-"All" => "Kõik",
-"Please wait...." => "Palun oota...",
-"Error while disabling app" => "Viga rakenduse keelamisel",
-"Disable" => "Lülita välja",
-"Enable" => "Lülita sisse",
-"Error while enabling app" => "Viga rakenduse lubamisel",
-"Updating...." => "Uuendamine...",
-"Error while updating app" => "Viga rakenduse uuendamisel",
-"Updated" => "Uuendatud",
-"Uninstalling ...." => "Eemaldan...",
-"Error while uninstalling app" => "Viga rakendi eemaldamisel",
-"Uninstall" => "Eemalda",
-"Select a profile picture" => "Vali profiili pilt",
-"Very weak password" => "Väga nõrk parool",
-"Weak password" => "Nõrk parool",
-"So-so password" => "Enam-vähem sobiv parool",
-"Good password" => "Hea parool",
-"Strong password" => "Väga hea parool",
-"Valid until {date}" => "Kehtib kuni {date}",
-"Delete" => "Kustuta",
-"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-"Delete encryption keys permanently." => "Kustuta krüpteerimisvõtmed lõplikult",
-"Restore encryption keys." => "Taasta krüpteerimisvõtmed.",
-"Groups" => "Grupid",
-"Unable to delete {objName}" => "Ei suuda kustutada {objName}",
-"Error creating group" => "Viga grupi loomisel",
-"A valid group name must be provided" => "Sisesta nõuetele vastav grupi nimi",
-"deleted {groupName}" => "kustutatud {groupName}",
-"undo" => "tagasi",
-"never" => "mitte kunagi",
-"deleted {userName}" => "kustutatud {userName}",
-"add group" => "lisa grupp",
-"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
-"Error creating user" => "Viga kasutaja loomisel",
-"A valid password must be provided" => "Sisesta nõuetele vastav parool",
-"Warning: Home directory for user \"{user}\" already exists" => "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
-"__language_name__" => "Eesti",
-"SSL root certificates" => "SSL root sertifikaadid",
-"Encryption" => "Krüpteerimine",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
-"Info, warnings, errors and fatal issues" => "Info, hoiatused, veateted ja tõsised probleemid",
-"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",
-"Plain" => "Tavatekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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.",
-"Setup Warning" => "Paigalduse hoiatus",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
-"Database Performance Info" => "Andmebaasi toimimise info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Moodul 'fileinfo' puudub",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
-"Your PHP version is outdated" => "PHP versioon on aegunud",
-"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." => "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
-"PHP charset is not set to UTF-8" => "PHP märgistik pole UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
-"Locale not working" => "Lokalisatsioon ei toimi",
-"System locale can not be set to a one which supports UTF-8." => "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
-"This means that there might be problems with certain characters in file names." => "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
-"URL generation in notification emails" => "URL-ide loomine teavituskirjades",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
-"Connectivity checks" => "Ühenduse kontrollimine",
-"No problems found" => "Ühtegi probleemi ei leitud",
-"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron käivitati viimati %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
-"Cron was not executed yet!" => "Cron pole kordagi käivitatud!",
-"Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
-"Sharing" => "Jagamine",
-"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
-"Allow users to share via link" => "Luba kasutajatel lingiga jagamist ",
-"Enforce password protection" => "Sunni parooliga kaitsmist",
-"Allow public uploads" => "Luba avalikud üleslaadimised",
-"Set default expiration date" => "Määra vaikimisi aegumise kuupäev",
-"Expire after " => "Aegu pärast",
-"days" => "päeva",
-"Enforce expiration date" => "Sunnitud aegumise kuupäev",
-"Allow resharing" => "Luba edasijagamine",
-"Restrict users to only share with users in their groups" => "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
-"Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
-"Exclude groups from sharing" => "Eemalda grupid jagamisest",
-"These groups will still be able to receive shares, but not to initiate them." => "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
-"Security" => "Turvalisus",
-"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.",
-"Email Server" => "Postiserver",
-"This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
-"Send mode" => "Saatmise viis",
-"From address" => "Saatja aadress",
-"mail" => "e-mail",
-"Authentication method" => "Autentimise meetod",
-"Authentication required" => "Autentimine on vajalik",
-"Server address" => "Serveri aadress",
-"Port" => "Port",
-"Credentials" => "Kasutajatunnused",
-"SMTP Username" => "SMTP kasutajatunnus",
-"SMTP Password" => "SMTP parool",
-"Store credentials" => "Säilita kasutajaandmed",
-"Test email settings" => "Testi e-posti seadeid",
-"Send email" => "Saada kiri",
-"Log" => "Logi",
-"Log level" => "Logi tase",
-"More" => "Rohkem",
-"Less" => "Vähem",
-"Version" => "Versioon",
-"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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
-"More apps" => "Rohkem rakendusi",
-"Add your app" => "Lisa oma rakendus",
-"by" => "lisas",
-"licensed" => "litsenseeritud",
-"Documentation:" => "Dokumentatsioon:",
-"User Documentation" => "Kasutaja dokumentatsioon",
-"Admin Documentation" => "Admin dokumentatsioon",
-"Update to %s" => "Uuenda versioonile %s",
-"Enable only for specific groups" => "Luba ainult kindlad grupid",
-"Uninstall App" => "Eemada rakend",
-"Administrator Documentation" => "Administraatori dokumentatsioon",
-"Online Documentation" => "Online dokumentatsioon",
-"Forum" => "Foorum",
-"Bugtracker" => "Vigade nimekiri",
-"Commercial Support" => "Tasuline kasutajatugi",
-"Get the apps to sync your files" => "Hangi rakendusi failide sünkroniseerimiseks",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
-"Show First Run Wizard again" => "Näita veelkord Esmase Käivituse Juhendajat",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
-"Password" => "Parool",
-"Your password was changed" => "Sinu parooli on muudetud",
-"Unable to change your password" => "Sa ei saa oma parooli muuta",
-"Current password" => "Praegune parool",
-"New password" => "Uus parool",
-"Change password" => "Muuda parooli",
-"Full Name" => "Täispikk nimi",
-"Email" => "E-post",
-"Your email address" => "Sinu e-posti aadress",
-"Fill in an email address to enable password recovery and receive notifications" => "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
-"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.",
-"Cancel" => "Loobu",
-"Choose as profile image" => "Vali profiilipildiks",
-"Language" => "Keel",
-"Help translate" => "Aita tõlkida",
-"Common Name" => "Üldnimetus",
-"Valid until" => "Kehtib kuni",
-"Issued By" => "isas",
-"Valid until %s" => "Kehtib kuni %s",
-"Import Root Certificate" => "Impordi root sertifikaadid",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
-"Restore Encryption Keys" => "Taasta krüpteerimisvõtmed",
-"Delete Encryption Keys" => "Kustuta krüpteerimisvõtmed",
-"Show storage location" => "Näita salvestusruumi asukohta",
-"Show last log in" => "Viimane sisselogimine",
-"Login Name" => "Kasutajanimi",
-"Create" => "Lisa",
-"Admin Recovery Password" => "Admini parooli taastamine",
-"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-"Search Users and Groups" => "Otsi kasutajaid ja gruppe",
-"Add Group" => "Lisa grupp",
-"Group" => "Grupp",
-"Everyone" => "Igaüks",
-"Admins" => "Haldurid",
-"Default Quota" => "Vaikimisi kvoot",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
-"Unlimited" => "Piiramatult",
-"Other" => "Muu",
-"Username" => "Kasutajanimi",
-"Quota" => "Mahupiir",
-"Storage Location" => "Mahu asukoht",
-"Last Login" => "Viimane sisselogimine",
-"change full name" => "Muuda täispikka nime",
-"set new password" => "määra uus parool",
-"Default" => "Vaikeväärtus"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
new file mode 100644
index 00000000000..d64a74f86bf
--- /dev/null
+++ b/settings/l10n/eu.js
@@ -0,0 +1,221 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Gaitua",
+    "Authentication error" : "Autentifikazio errorea",
+    "Your full name has been changed." : "Zure izena aldatu egin da.",
+    "Unable to change full name" : "Ezin izan da izena aldatu",
+    "Group already exists" : "Taldea dagoeneko existitzenda",
+    "Unable to add group" : "Ezin izan da taldea gehitu",
+    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
+    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
+    "Email saved" : "Eposta gorde da",
+    "Invalid email" : "Baliogabeko eposta",
+    "Unable to delete group" : "Ezin izan da taldea ezabatu",
+    "Unable to delete user" : "Ezin izan da erabiltzailea ezabatu",
+    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Language changed" : "Hizkuntza aldatuta",
+    "Invalid request" : "Baliogabeko eskaera",
+    "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
+    "Unable to add user to group %s" : "Ezin izan da erabiltzailea %s taldera gehitu",
+    "Unable to remove user from group %s" : "Ezin izan da erabiltzailea %s taldetik ezabatu",
+    "Couldn't update app." : "Ezin izan da aplikazioa eguneratu.",
+    "Wrong password" : "Pasahitz okerra",
+    "No user supplied" : "Ez da erabiltzailerik zehaztu",
+    "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." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
+    "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Saved" : "Gordeta",
+    "test email settings" : "probatu eposta ezarpenak",
+    "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "Email sent" : "Eposta bidalia",
+    "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
+    "Add trusted domain" : "Gehitu domeinu fidagarria",
+    "Sending..." : "Bidaltzen...",
+    "All" : "Denak",
+    "Please wait...." : "Itxoin mesedez...",
+    "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan",
+    "Disable" : "Ez-gaitu",
+    "Enable" : "Gaitu",
+    "Error while enabling app" : "Erroea izan da aplikazioa gaitzerakoan",
+    "Updating...." : "Eguneratzen...",
+    "Error while updating app" : "Errorea aplikazioa eguneratzen zen bitartean",
+    "Updated" : "Eguneratuta",
+    "Uninstalling ...." : "Desinstalatzen ...",
+    "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan",
+    "Uninstall" : "Desinstalatu",
+    "Select a profile picture" : "Profilaren irudia aukeratu",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Delete" : "Ezabatu",
+    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
+    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
+    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
+    "Groups" : "Taldeak",
+    "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
+    "Error creating group" : "Errore bat izan da taldea sortzean",
+    "A valid group name must be provided" : "Baliozko talde izena eman behar da",
+    "deleted {groupName}" : "{groupName} ezbatuta",
+    "undo" : "desegin",
+    "never" : "inoiz",
+    "deleted {userName}" : "{userName} ezabatuta",
+    "add group" : "gehitu taldea",
+    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
+    "Error creating user" : "Errore bat egon da erabiltzailea sortzean",
+    "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__" : "Euskara",
+    "SSL root certificates" : "SSL erro ziurtagiriak",
+    "Encryption" : "Enkriptazioa",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
+    "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
+    "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
+    "Errors and fatal issues" : "Erroreak eta arazo larriak",
+    "Fatal issues only" : "Bakarrik arazo larriak",
+    "None" : "Ezer",
+    "Login" : "Saio hasiera",
+    "Plain" : "Arrunta",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Konfiguratu abisuak",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
+    "Database Performance Info" : "Database Performance informazioa",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
+    "Your PHP version is outdated" : "Zure PHP bertsioa zaharkituta dago",
+    "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." : "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
+    "PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
+    "Locale not working" : "Lokala ez dabil",
+    "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
+    "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
+    "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
+    "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
+    "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
+    "Sharing" : "Partekatzea",
+    "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
+    "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
+    "Enforce password protection" : "Betearazi pasahitzaren babesa",
+    "Allow public uploads" : "Baimendu igoera publikoak",
+    "Set default expiration date" : "Ezarri muga data lehenetsia",
+    "Expire after " : "Iraungia honen ondoren",
+    "days" : "egun",
+    "Enforce expiration date" : "Muga data betearazi",
+    "Allow resharing" : "Baimendu birpartekatzea",
+    "Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+    "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
+    "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
+    "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
+    "Security" : "Segurtasuna",
+    "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.",
+    "Email Server" : "Eposta zerbitzaria",
+    "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
+    "Send mode" : "Bidaltzeko modua",
+    "From address" : "Helbidetik",
+    "mail" : "posta",
+    "Authentication method" : "Autentifikazio metodoa",
+    "Authentication required" : "Autentikazioa beharrezkoa",
+    "Server address" : "Zerbitzariaren helbidea",
+    "Port" : "Portua",
+    "Credentials" : "Kredentzialak",
+    "SMTP Username" : "SMTP erabiltzaile-izena",
+    "SMTP Password" : "SMTP pasahitza",
+    "Test email settings" : "Probatu eposta ezarpenak",
+    "Send email" : "Bidali eposta",
+    "Log" : "Log",
+    "Log level" : "Erregistro maila",
+    "More" : "Gehiago",
+    "Less" : "Gutxiago",
+    "Version" : "Bertsioa",
+    "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 komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
+    "More apps" : "App gehiago",
+    "by" : " Egilea:",
+    "Documentation:" : "Dokumentazioa:",
+    "User Documentation" : "Erabiltzaile dokumentazioa",
+    "Admin Documentation" : "Administrazio dokumentazioa",
+    "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
+    "Uninstall App" : "Desinstalatu aplikazioa",
+    "Administrator Documentation" : "Administratzaile dokumentazioa",
+    "Online Documentation" : "Online dokumentazioa",
+    "Forum" : "Foroa",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Babes komertziala",
+    "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
+    "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
+    "Password" : "Pasahitza",
+    "Your password was changed" : "Zure pasahitza aldatu da",
+    "Unable to change your password" : "Ezin izan da zure pasahitza aldatu",
+    "Current password" : "Uneko pasahitza",
+    "New password" : "Pasahitz berria",
+    "Change password" : "Aldatu pasahitza",
+    "Full Name" : "Izena",
+    "Email" : "E-posta",
+    "Your email address" : "Zure e-posta",
+    "Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+    "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.",
+    "Your avatar is provided by your original account." : "Zure jatorrizko kontuak ezarri du zure avatar.",
+    "Cancel" : "Ezeztatu",
+    "Choose as profile image" : "Profil irudi bezala aukeratu",
+    "Language" : "Hizkuntza",
+    "Help translate" : "Lagundu itzultzen",
+    "Import Root Certificate" : "Inportatu erro ziurtagiria",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
+    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
+    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Login Name" : "Sarrera Izena",
+    "Create" : "Sortu",
+    "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
+    "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
+    "Add Group" : "Gehitu taldea",
+    "Group" : "Taldea",
+    "Everyone" : "Edonor",
+    "Admins" : "Administratzaileak",
+    "Default Quota" : "Kuota lehentsia",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
+    "Unlimited" : "Mugarik gabe",
+    "Other" : "Bestelakoa",
+    "Username" : "Erabiltzaile izena",
+    "Quota" : "Kuota",
+    "Storage Location" : "Biltegiaren kokapena",
+    "Last Login" : "Azken saio hasiera",
+    "change full name" : "aldatu izena",
+    "set new password" : "ezarri pasahitz berria",
+    "Default" : "Lehenetsia"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
new file mode 100644
index 00000000000..c2ad4ccc5bc
--- /dev/null
+++ b/settings/l10n/eu.json
@@ -0,0 +1,219 @@
+{ "translations": {
+    "Enabled" : "Gaitua",
+    "Authentication error" : "Autentifikazio errorea",
+    "Your full name has been changed." : "Zure izena aldatu egin da.",
+    "Unable to change full name" : "Ezin izan da izena aldatu",
+    "Group already exists" : "Taldea dagoeneko existitzenda",
+    "Unable to add group" : "Ezin izan da taldea gehitu",
+    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
+    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
+    "Email saved" : "Eposta gorde da",
+    "Invalid email" : "Baliogabeko eposta",
+    "Unable to delete group" : "Ezin izan da taldea ezabatu",
+    "Unable to delete user" : "Ezin izan da erabiltzailea ezabatu",
+    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Language changed" : "Hizkuntza aldatuta",
+    "Invalid request" : "Baliogabeko eskaera",
+    "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
+    "Unable to add user to group %s" : "Ezin izan da erabiltzailea %s taldera gehitu",
+    "Unable to remove user from group %s" : "Ezin izan da erabiltzailea %s taldetik ezabatu",
+    "Couldn't update app." : "Ezin izan da aplikazioa eguneratu.",
+    "Wrong password" : "Pasahitz okerra",
+    "No user supplied" : "Ez da erabiltzailerik zehaztu",
+    "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." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
+    "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Saved" : "Gordeta",
+    "test email settings" : "probatu eposta ezarpenak",
+    "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "Email sent" : "Eposta bidalia",
+    "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
+    "Add trusted domain" : "Gehitu domeinu fidagarria",
+    "Sending..." : "Bidaltzen...",
+    "All" : "Denak",
+    "Please wait...." : "Itxoin mesedez...",
+    "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan",
+    "Disable" : "Ez-gaitu",
+    "Enable" : "Gaitu",
+    "Error while enabling app" : "Erroea izan da aplikazioa gaitzerakoan",
+    "Updating...." : "Eguneratzen...",
+    "Error while updating app" : "Errorea aplikazioa eguneratzen zen bitartean",
+    "Updated" : "Eguneratuta",
+    "Uninstalling ...." : "Desinstalatzen ...",
+    "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan",
+    "Uninstall" : "Desinstalatu",
+    "Select a profile picture" : "Profilaren irudia aukeratu",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Delete" : "Ezabatu",
+    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
+    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
+    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
+    "Groups" : "Taldeak",
+    "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
+    "Error creating group" : "Errore bat izan da taldea sortzean",
+    "A valid group name must be provided" : "Baliozko talde izena eman behar da",
+    "deleted {groupName}" : "{groupName} ezbatuta",
+    "undo" : "desegin",
+    "never" : "inoiz",
+    "deleted {userName}" : "{userName} ezabatuta",
+    "add group" : "gehitu taldea",
+    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
+    "Error creating user" : "Errore bat egon da erabiltzailea sortzean",
+    "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__" : "Euskara",
+    "SSL root certificates" : "SSL erro ziurtagiriak",
+    "Encryption" : "Enkriptazioa",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
+    "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
+    "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
+    "Errors and fatal issues" : "Erroreak eta arazo larriak",
+    "Fatal issues only" : "Bakarrik arazo larriak",
+    "None" : "Ezer",
+    "Login" : "Saio hasiera",
+    "Plain" : "Arrunta",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Konfiguratu abisuak",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
+    "Database Performance Info" : "Database Performance informazioa",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
+    "Your PHP version is outdated" : "Zure PHP bertsioa zaharkituta dago",
+    "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." : "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
+    "PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
+    "Locale not working" : "Lokala ez dabil",
+    "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
+    "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
+    "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
+    "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
+    "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
+    "Sharing" : "Partekatzea",
+    "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
+    "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
+    "Enforce password protection" : "Betearazi pasahitzaren babesa",
+    "Allow public uploads" : "Baimendu igoera publikoak",
+    "Set default expiration date" : "Ezarri muga data lehenetsia",
+    "Expire after " : "Iraungia honen ondoren",
+    "days" : "egun",
+    "Enforce expiration date" : "Muga data betearazi",
+    "Allow resharing" : "Baimendu birpartekatzea",
+    "Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+    "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
+    "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
+    "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
+    "Security" : "Segurtasuna",
+    "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.",
+    "Email Server" : "Eposta zerbitzaria",
+    "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
+    "Send mode" : "Bidaltzeko modua",
+    "From address" : "Helbidetik",
+    "mail" : "posta",
+    "Authentication method" : "Autentifikazio metodoa",
+    "Authentication required" : "Autentikazioa beharrezkoa",
+    "Server address" : "Zerbitzariaren helbidea",
+    "Port" : "Portua",
+    "Credentials" : "Kredentzialak",
+    "SMTP Username" : "SMTP erabiltzaile-izena",
+    "SMTP Password" : "SMTP pasahitza",
+    "Test email settings" : "Probatu eposta ezarpenak",
+    "Send email" : "Bidali eposta",
+    "Log" : "Log",
+    "Log level" : "Erregistro maila",
+    "More" : "Gehiago",
+    "Less" : "Gutxiago",
+    "Version" : "Bertsioa",
+    "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 komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
+    "More apps" : "App gehiago",
+    "by" : " Egilea:",
+    "Documentation:" : "Dokumentazioa:",
+    "User Documentation" : "Erabiltzaile dokumentazioa",
+    "Admin Documentation" : "Administrazio dokumentazioa",
+    "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
+    "Uninstall App" : "Desinstalatu aplikazioa",
+    "Administrator Documentation" : "Administratzaile dokumentazioa",
+    "Online Documentation" : "Online dokumentazioa",
+    "Forum" : "Foroa",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Babes komertziala",
+    "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
+    "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
+    "Password" : "Pasahitza",
+    "Your password was changed" : "Zure pasahitza aldatu da",
+    "Unable to change your password" : "Ezin izan da zure pasahitza aldatu",
+    "Current password" : "Uneko pasahitza",
+    "New password" : "Pasahitz berria",
+    "Change password" : "Aldatu pasahitza",
+    "Full Name" : "Izena",
+    "Email" : "E-posta",
+    "Your email address" : "Zure e-posta",
+    "Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+    "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.",
+    "Your avatar is provided by your original account." : "Zure jatorrizko kontuak ezarri du zure avatar.",
+    "Cancel" : "Ezeztatu",
+    "Choose as profile image" : "Profil irudi bezala aukeratu",
+    "Language" : "Hizkuntza",
+    "Help translate" : "Lagundu itzultzen",
+    "Import Root Certificate" : "Inportatu erro ziurtagiria",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
+    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
+    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Login Name" : "Sarrera Izena",
+    "Create" : "Sortu",
+    "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
+    "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
+    "Add Group" : "Gehitu taldea",
+    "Group" : "Taldea",
+    "Everyone" : "Edonor",
+    "Admins" : "Administratzaileak",
+    "Default Quota" : "Kuota lehentsia",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
+    "Unlimited" : "Mugarik gabe",
+    "Other" : "Bestelakoa",
+    "Username" : "Erabiltzaile izena",
+    "Quota" : "Kuota",
+    "Storage Location" : "Biltegiaren kokapena",
+    "Last Login" : "Azken saio hasiera",
+    "change full name" : "aldatu izena",
+    "set new password" : "ezarri pasahitz berria",
+    "Default" : "Lehenetsia"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
deleted file mode 100644
index 2818e94db4e..00000000000
--- a/settings/l10n/eu.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentifikazio errorea",
-"Your full name has been changed." => "Zure izena aldatu egin da.",
-"Unable to change full name" => "Ezin izan da izena aldatu",
-"Group already exists" => "Taldea dagoeneko existitzenda",
-"Unable to add group" => "Ezin izan da taldea gehitu",
-"Files decrypted successfully" => "Fitxategiak ongi deskodetu dira.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Couldn't decrypt your files, check your password and try again" => "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
-"Encryption keys deleted permanently" => "Enkriptatze gakoak behin betiko ezabatuak",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Couldn't remove app." => "Ezin izan da aplikazioa ezabatu..",
-"Email saved" => "Eposta gorde da",
-"Invalid email" => "Baliogabeko eposta",
-"Unable to delete group" => "Ezin izan da taldea ezabatu",
-"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
-"Backups restored successfully" => "Babeskopiak ongi leheneratu dira",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Language changed" => "Hizkuntza aldatuta",
-"Invalid request" => "Baliogabeko eskaera",
-"Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
-"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
-"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
-"Couldn't update app." => "Ezin izan da aplikazioa eguneratu.",
-"Wrong password" => "Pasahitz okerra",
-"No user supplied" => "Ez da erabiltzailerik zehaztu",
-"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." => "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
-"Unable to change password" => "Ezin izan da pasahitza aldatu",
-"Enabled" => "Gaitua",
-"Recommended" => "Aholkatuta",
-"Saved" => "Gordeta",
-"test email settings" => "probatu eposta ezarpenak",
-"If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
-"A problem occurred while sending the email. Please revise your settings." => "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
-"Email sent" => "Eposta bidalia",
-"You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
-"Add trusted domain" => "Gehitu domeinu fidagarria",
-"Sending..." => "Bidaltzen...",
-"All" => "Denak",
-"Please wait...." => "Itxoin mesedez...",
-"Error while disabling app" => "Erroea izan da aplikazioa desgaitzerakoan",
-"Disable" => "Ez-gaitu",
-"Enable" => "Gaitu",
-"Error while enabling app" => "Erroea izan da aplikazioa gaitzerakoan",
-"Updating...." => "Eguneratzen...",
-"Error while updating app" => "Errorea aplikazioa eguneratzen zen bitartean",
-"Updated" => "Eguneratuta",
-"Uninstalling ...." => "Desinstalatzen ...",
-"Error while uninstalling app" => "Erroea izan da aplikazioa desinstalatzerakoan",
-"Uninstall" => "Desinstalatu",
-"Select a profile picture" => "Profilaren irudia aukeratu",
-"Very weak password" => "Pasahitz oso ahula",
-"Weak password" => "Pasahitz ahula",
-"So-so password" => "Halamoduzko pasahitza",
-"Good password" => "Pasahitz ona",
-"Strong password" => "Pasahitz sendoa",
-"Valid until {date}" => "{date} arte baliogarria",
-"Delete" => "Ezabatu",
-"Decrypting files... Please wait, this can take some time." => "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
-"Delete encryption keys permanently." => "Ezabatu enkriptatze gakoak behin betiko",
-"Restore encryption keys." => "Leheneratu enkriptatze gakoak",
-"Groups" => "Taldeak",
-"Unable to delete {objName}" => "Ezin izan da {objName} ezabatu",
-"Error creating group" => "Errore bat izan da taldea sortzean",
-"A valid group name must be provided" => "Baliozko talde izena eman behar da",
-"deleted {groupName}" => "{groupName} ezbatuta",
-"undo" => "desegin",
-"no group" => "talderik ez",
-"never" => "inoiz",
-"deleted {userName}" => "{userName} ezabatuta",
-"add group" => "gehitu taldea",
-"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
-"Error creating user" => "Errore bat egon da erabiltzailea sortzean",
-"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__" => "Euskara",
-"Personal Info" => "Informazio Pertsonala",
-"SSL root certificates" => "SSL erro ziurtagiriak",
-"Encryption" => "Enkriptazioa",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
-"Info, warnings, errors and fatal issues" => "Informazioa, abisuak, erroreak eta arazo larriak.",
-"Warnings, errors and fatal issues" => "Abisuak, erroreak eta arazo larriak",
-"Errors and fatal issues" => "Erroreak eta arazo larriak",
-"Fatal issues only" => "Bakarrik arazo larriak",
-"None" => "Ezer",
-"Login" => "Saio hasiera",
-"Plain" => "Arrunta",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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.",
-"Setup Warning" => "Konfiguratu abisuak",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
-"Database Performance Info" => "Database Performance informazioa",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
-"Module 'fileinfo' missing" => "'fileinfo' modulua falta da",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
-"Your PHP version is outdated" => "Zure PHP bertsioa zaharkituta dago",
-"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." => "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
-"PHP charset is not set to UTF-8" => "PHP charset ez da UTF-8 gisa ezartzen",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
-"Locale not working" => "Lokala ez dabil",
-"System locale can not be set to a one which supports UTF-8." => "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
-"This means that there might be problems with certain characters in file names." => "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
-"URL generation in notification emails" => "URL sorrera jakinarazpen mezuetan",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
-"Connectivity checks" => "Konexio egiaztapenak",
-"No problems found" => "Ez da problemarik aurkitu",
-"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Azken cron-a  %s-etan exekutatu da",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
-"Cron was not executed yet!" => "Cron-a oraindik ez da exekutatu!",
-"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
-"Sharing" => "Partekatzea",
-"Allow apps to use the Share API" => "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
-"Allow users to share via link" => "Baimendu erabiltzaileak esteken bidez partekatzea",
-"Enforce password protection" => "Betearazi pasahitzaren babesa",
-"Allow public uploads" => "Baimendu igoera publikoak",
-"Set default expiration date" => "Ezarri muga data lehenetsia",
-"Expire after " => "Iraungia honen ondoren",
-"days" => "egun",
-"Enforce expiration date" => "Muga data betearazi",
-"Allow resharing" => "Baimendu birpartekatzea",
-"Restrict users to only share with users in their groups" => "Mugatu partekatzeak taldeko erabiltzaileetara",
-"Allow users to send mail notification for shared files" => "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
-"Exclude groups from sharing" => "Baztertu taldeak partekatzean",
-"These groups will still be able to receive shares, but not to initiate them." => "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
-"Security" => "Segurtasuna",
-"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.",
-"Email Server" => "Eposta zerbitzaria",
-"This is used for sending out notifications." => "Hau jakinarazpenak bidaltzeko erabiltzen da.",
-"Send mode" => "Bidaltzeko modua",
-"From address" => "Helbidetik",
-"mail" => "posta",
-"Authentication method" => "Autentifikazio metodoa",
-"Authentication required" => "Autentikazioa beharrezkoa",
-"Server address" => "Zerbitzariaren helbidea",
-"Port" => "Portua",
-"Credentials" => "Kredentzialak",
-"SMTP Username" => "SMTP erabiltzaile-izena",
-"SMTP Password" => "SMTP pasahitza",
-"Store credentials" => "Gorde kredentzialak",
-"Test email settings" => "Probatu eposta ezarpenak",
-"Send email" => "Bidali eposta",
-"Log" => "Log",
-"Log level" => "Erregistro maila",
-"More" => "Gehiago",
-"Less" => "Gutxiago",
-"Version" => "Bertsioa",
-"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 komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
-"More apps" => "App gehiago",
-"Add your app" => "Gehitu zure aplikazioa",
-"by" => " Egilea:",
-"Documentation:" => "Dokumentazioa:",
-"User Documentation" => "Erabiltzaile dokumentazioa",
-"Admin Documentation" => "Administrazio dokumentazioa",
-"Update to %s" => "Eguneratu %sra",
-"Enable only for specific groups" => "Baimendu bakarri talde espezifikoetarako",
-"Uninstall App" => "Desinstalatu aplikazioa",
-"Administrator Documentation" => "Administratzaile dokumentazioa",
-"Online Documentation" => "Online dokumentazioa",
-"Forum" => "Foroa",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Babes komertziala",
-"Get the apps to sync your files" => "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
-"Show First Run Wizard again" => "Erakutsi berriz Lehenengo Aldiko Morroia",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
-"Password" => "Pasahitza",
-"Your password was changed" => "Zure pasahitza aldatu da",
-"Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
-"Current password" => "Uneko pasahitza",
-"New password" => "Pasahitz berria",
-"Change password" => "Aldatu pasahitza",
-"Full Name" => "Izena",
-"Email" => "E-posta",
-"Your email address" => "Zure e-posta",
-"Fill in an email address to enable password recovery and receive notifications" => "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
-"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.",
-"Your avatar is provided by your original account." => "Zure jatorrizko kontuak ezarri du zure avatar.",
-"Cancel" => "Ezeztatu",
-"Choose as profile image" => "Profil irudi bezala aukeratu",
-"Language" => "Hizkuntza",
-"Help translate" => "Lagundu itzultzen",
-"Issued By" => "Honek bidalita",
-"Import Root Certificate" => "Inportatu erro ziurtagiria",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
-"Restore Encryption Keys" => "Lehenera itzazu enkriptatze gakoak.",
-"Delete Encryption Keys" => "Ezabatu enkriptatze gakoak",
-"Show storage location" => "Erakutsi biltegiaren kokapena",
-"Show last log in" => "Erakutsi azkeneko saio hasiera",
-"Login Name" => "Sarrera Izena",
-"Create" => "Sortu",
-"Admin Recovery Password" => "Administratzailearen pasahitza berreskuratzea",
-"Enter the recovery password in order to recover the users files during password change" => "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-"Search Users and Groups" => "Bilatu erabiltzaileak eta taldeak",
-"Add Group" => "Gehitu taldea",
-"Group" => "Taldea",
-"Everyone" => "Edonor",
-"Admins" => "Administratzaileak",
-"Default Quota" => "Kuota lehentsia",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
-"Unlimited" => "Mugarik gabe",
-"Other" => "Bestelakoa",
-"Username" => "Erabiltzaile izena",
-"Quota" => "Kuota",
-"Storage Location" => "Biltegiaren kokapena",
-"Last Login" => "Azken saio hasiera",
-"change full name" => "aldatu izena",
-"set new password" => "ezarri pasahitz berria",
-"Default" => "Lehenetsia"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu_ES.js b/settings/l10n/eu_ES.js
new file mode 100644
index 00000000000..b5685139534
--- /dev/null
+++ b/settings/l10n/eu_ES.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Eskakizun baliogabea",
+    "Delete" : "Ezabatu",
+    "Cancel" : "Ezeztatu",
+    "Other" : "Bestea"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu_ES.json b/settings/l10n/eu_ES.json
new file mode 100644
index 00000000000..062f410b0e9
--- /dev/null
+++ b/settings/l10n/eu_ES.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Invalid request" : "Eskakizun baliogabea",
+    "Delete" : "Ezabatu",
+    "Cancel" : "Ezeztatu",
+    "Other" : "Bestea"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/eu_ES.php b/settings/l10n/eu_ES.php
deleted file mode 100644
index 280c7f05c0c..00000000000
--- a/settings/l10n/eu_ES.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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.js b/settings/l10n/fa.js
new file mode 100644
index 00000000000..47b3e0e5307
--- /dev/null
+++ b/settings/l10n/fa.js
@@ -0,0 +1,190 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "فعال شده",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Your full name has been changed." : "نام کامل شما تغییر یافت",
+    "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
+    "Group already exists" : "این گروه در حال حاضر موجود است",
+    "Unable to add group" : "افزودن گروه امکان پذیر نیست",
+    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
+    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
+    "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
+    "Email saved" : "ایمیل ذخیره شد",
+    "Invalid email" : "ایمیل غیر قابل قبول",
+    "Unable to delete group" : "حذف گروه امکان پذیر نیست",
+    "Unable to delete user" : "حذف کاربر امکان پذیر نیست",
+    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
+    "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" : "نمی‌توان رمز را تغییر داد",
+    "Saved" : "ذخیره شد",
+    "test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Email sent" : "ایمیل ارسال شد",
+    "Sending..." : "در حال ارسال...",
+    "All" : "همه",
+    "Please wait...." : "لطفا صبر کنید ...",
+    "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
+    "Disable" : "غیرفعال",
+    "Enable" : "فعال",
+    "Error while enabling app" : "خطا در هنگام فعال سازی برنامه",
+    "Updating...." : "در حال بروز رسانی...",
+    "Error while updating app" : "خطا در هنگام بهنگام سازی برنامه",
+    "Updated" : "بروز رسانی انجام شد",
+    "Uninstalling ...." : "در حال حذف...",
+    "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
+    "Uninstall" : "حذف",
+    "Select a profile picture" : "انتخاب تصویر پروفایل",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Delete" : "حذف",
+    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
+    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
+    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
+    "Groups" : "گروه ها",
+    "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
+    "Error creating group" : "خطا در هنگام ایجاد کروه",
+    "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
+    "deleted {groupName}" : "گروه {groupName} حذف شد",
+    "undo" : "بازگشت",
+    "never" : "هرگز",
+    "deleted {userName}" : "کاربر {userName} حذف شد",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "گواهی های اصلی SSL ",
+    "Encryption" : "رمزگذاری",
+    "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" : "اخطار امنیتی",
+    "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" : "هشدار راه اندازی",
+    "Database Performance Info" : "اطلاعات کارایی پایگاه داده",
+    "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 دریافت کنید.",
+    "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
+    "Locale not working" : "زبان محلی کار نمی کند.",
+    "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
+    "Cron" : "زمانبند",
+    "Last cron was executed at %s." : "کران قبلی در %s اجرا شد.",
+    "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
+    "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 فراخوانی شود.",
+    "Sharing" : "اشتراک گذاری",
+    "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
+    "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
+    "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
+    "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
+    "Expire after " : "اتمام اعتبار بعد از",
+    "days" : "روز",
+    "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
+    "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
+    "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." : "این برای ارسال هشدار ها استفاده می شود",
+    "Send mode" : "حالت ارسال",
+    "From address" : "آدرس فرستنده",
+    "mail" : "ایمیل",
+    "Authentication method" : "روش احراز هویت",
+    "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>, the <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>.",
+    "by" : "با",
+    "Documentation:" : "مستند سازی:",
+    "User Documentation" : "مستندات کاربر",
+    "Admin Documentation" : "مستند سازی مدیر",
+    "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
+    "Uninstall App" : "حذف برنامه",
+    "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" : "گذرواژه کنونی",
+    "New password" : "گذرواژه جدید",
+    "Change password" : "تغییر گذر واژه",
+    "Full Name" : "نام کامل",
+    "Email" : "ایمیل",
+    "Your email address" : "پست الکترونیکی شما",
+    "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" : "به ترجمه آن کمک کنید",
+    "Import Root Certificate" : "وارد کردن گواهی اصلی",
+    "Log-in password" : "رمز ورود",
+    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
+    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
+    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
+    "Login Name" : "نام کاربری",
+    "Create" : "ایجاد کردن",
+    "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
+    "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
+    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
+    "Add Group" : "افزودن گروه",
+    "Group" : "گروه",
+    "Everyone" : "همه",
+    "Admins" : "مدیران",
+    "Default Quota" : "سهم پیش فرض",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
+    "Unlimited" : "نامحدود",
+    "Other" : "دیگر",
+    "Username" : "نام کاربری",
+    "Quota" : "سهم",
+    "Storage Location" : "محل فضای ذخیره سازی",
+    "Last Login" : "اخرین ورود",
+    "change full name" : "تغییر نام کامل",
+    "set new password" : "تنظیم کلمه عبور جدید",
+    "Default" : "پیش فرض"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
new file mode 100644
index 00000000000..8d6c98b7c01
--- /dev/null
+++ b/settings/l10n/fa.json
@@ -0,0 +1,188 @@
+{ "translations": {
+    "Enabled" : "فعال شده",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Your full name has been changed." : "نام کامل شما تغییر یافت",
+    "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
+    "Group already exists" : "این گروه در حال حاضر موجود است",
+    "Unable to add group" : "افزودن گروه امکان پذیر نیست",
+    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
+    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
+    "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
+    "Email saved" : "ایمیل ذخیره شد",
+    "Invalid email" : "ایمیل غیر قابل قبول",
+    "Unable to delete group" : "حذف گروه امکان پذیر نیست",
+    "Unable to delete user" : "حذف کاربر امکان پذیر نیست",
+    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
+    "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" : "نمی‌توان رمز را تغییر داد",
+    "Saved" : "ذخیره شد",
+    "test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Email sent" : "ایمیل ارسال شد",
+    "Sending..." : "در حال ارسال...",
+    "All" : "همه",
+    "Please wait...." : "لطفا صبر کنید ...",
+    "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
+    "Disable" : "غیرفعال",
+    "Enable" : "فعال",
+    "Error while enabling app" : "خطا در هنگام فعال سازی برنامه",
+    "Updating...." : "در حال بروز رسانی...",
+    "Error while updating app" : "خطا در هنگام بهنگام سازی برنامه",
+    "Updated" : "بروز رسانی انجام شد",
+    "Uninstalling ...." : "در حال حذف...",
+    "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
+    "Uninstall" : "حذف",
+    "Select a profile picture" : "انتخاب تصویر پروفایل",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Delete" : "حذف",
+    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
+    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
+    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
+    "Groups" : "گروه ها",
+    "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
+    "Error creating group" : "خطا در هنگام ایجاد کروه",
+    "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
+    "deleted {groupName}" : "گروه {groupName} حذف شد",
+    "undo" : "بازگشت",
+    "never" : "هرگز",
+    "deleted {userName}" : "کاربر {userName} حذف شد",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "گواهی های اصلی SSL ",
+    "Encryption" : "رمزگذاری",
+    "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" : "اخطار امنیتی",
+    "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" : "هشدار راه اندازی",
+    "Database Performance Info" : "اطلاعات کارایی پایگاه داده",
+    "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 دریافت کنید.",
+    "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
+    "Locale not working" : "زبان محلی کار نمی کند.",
+    "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
+    "Cron" : "زمانبند",
+    "Last cron was executed at %s." : "کران قبلی در %s اجرا شد.",
+    "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
+    "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 فراخوانی شود.",
+    "Sharing" : "اشتراک گذاری",
+    "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
+    "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
+    "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
+    "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
+    "Expire after " : "اتمام اعتبار بعد از",
+    "days" : "روز",
+    "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
+    "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
+    "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." : "این برای ارسال هشدار ها استفاده می شود",
+    "Send mode" : "حالت ارسال",
+    "From address" : "آدرس فرستنده",
+    "mail" : "ایمیل",
+    "Authentication method" : "روش احراز هویت",
+    "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>, the <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>.",
+    "by" : "با",
+    "Documentation:" : "مستند سازی:",
+    "User Documentation" : "مستندات کاربر",
+    "Admin Documentation" : "مستند سازی مدیر",
+    "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
+    "Uninstall App" : "حذف برنامه",
+    "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" : "گذرواژه کنونی",
+    "New password" : "گذرواژه جدید",
+    "Change password" : "تغییر گذر واژه",
+    "Full Name" : "نام کامل",
+    "Email" : "ایمیل",
+    "Your email address" : "پست الکترونیکی شما",
+    "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" : "به ترجمه آن کمک کنید",
+    "Import Root Certificate" : "وارد کردن گواهی اصلی",
+    "Log-in password" : "رمز ورود",
+    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
+    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
+    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
+    "Login Name" : "نام کاربری",
+    "Create" : "ایجاد کردن",
+    "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
+    "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
+    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
+    "Add Group" : "افزودن گروه",
+    "Group" : "گروه",
+    "Everyone" : "همه",
+    "Admins" : "مدیران",
+    "Default Quota" : "سهم پیش فرض",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
+    "Unlimited" : "نامحدود",
+    "Other" : "دیگر",
+    "Username" : "نام کاربری",
+    "Quota" : "سهم",
+    "Storage Location" : "محل فضای ذخیره سازی",
+    "Last Login" : "اخرین ورود",
+    "change full name" : "تغییر نام کامل",
+    "set new password" : "تنظیم کلمه عبور جدید",
+    "Default" : "پیش فرض"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
deleted file mode 100644
index ef65cc8b78c..00000000000
--- a/settings/l10n/fa.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "فعال شده",
-"Authentication error" => "خطا در اعتبار سنجی",
-"Your full name has been changed." => "نام کامل شما تغییر یافت",
-"Unable to change full name" => "امکان تغییر نام کامل وجود ندارد",
-"Group already exists" => "این گروه در حال حاضر موجود است",
-"Unable to add group" => "افزودن گروه امکان پذیر نیست",
-"Files decrypted successfully" => "فایل ها با موفقیت رمزگشایی شدند.",
-"Encryption keys deleted permanently" => "کلیدهای رمزگذاری به طور کامل حذف شدند",
-"Couldn't remove app." => "امکان حذف برنامه وجود ندارد.",
-"Email saved" => "ایمیل ذخیره شد",
-"Invalid email" => "ایمیل غیر قابل قبول",
-"Unable to delete group" => "حذف گروه امکان پذیر نیست",
-"Unable to delete user" => "حذف کاربر امکان پذیر نیست",
-"Backups restored successfully" => "پشتیبان ها با موفقیت بازیابی شدند",
-"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" => "نمی‌توان رمز را تغییر داد",
-"Saved" => "ذخیره شد",
-"test email settings" => "تنظیمات ایمیل آزمایشی",
-"Email sent" => "ایمیل ارسال شد",
-"Sending..." => "در حال ارسال...",
-"All" => "همه",
-"Please wait...." => "لطفا صبر کنید ...",
-"Error while disabling app" => "خطا در هنگام غیر فعال سازی برنامه",
-"Disable" => "غیرفعال",
-"Enable" => "فعال",
-"Error while enabling app" => "خطا در هنگام فعال سازی برنامه",
-"Updating...." => "در حال بروز رسانی...",
-"Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
-"Updated" => "بروز رسانی انجام شد",
-"Uninstalling ...." => "در حال حذف...",
-"Error while uninstalling app" => "خطا در هنگام حذف برنامه....",
-"Uninstall" => "حذف",
-"Select a profile picture" => "انتخاب تصویر پروفایل",
-"Very weak password" => "رمز عبور بسیار ضعیف",
-"Weak password" => "رمز عبور ضعیف",
-"So-so password" => "رمز عبور متوسط",
-"Good password" => "رمز عبور خوب",
-"Strong password" => "رمز عبور قوی",
-"Delete" => "حذف",
-"Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
-"Delete encryption keys permanently." => "کلید های رمزگذاری به طوز کامل حذف شوند.",
-"Restore encryption keys." => "بازیابی کلیدهای  رمزگذاری.",
-"Groups" => "گروه ها",
-"Unable to delete {objName}" => "امکان حذف {objName} وجود ندارد",
-"Error creating group" => "خطا در هنگام ایجاد کروه",
-"A valid group name must be provided" => "نام کاربری معتبر می بایست وارد شود",
-"deleted {groupName}" => "گروه {groupName} حذف شد",
-"undo" => "بازگشت",
-"never" => "هرگز",
-"deleted {userName}" => "کاربر {userName} حذف شد",
-"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__" => "__language_name__",
-"SSL root certificates" => "گواهی های اصلی SSL ",
-"Encryption" => "رمزگذاری",
-"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" => "اخطار امنیتی",
-"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" => "هشدار راه اندازی",
-"Database Performance Info" => "اطلاعات کارایی پایگاه داده",
-"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 دریافت کنید.",
-"Your PHP version is outdated" => "نسخه PHP شما قدیمی است",
-"Locale not working" => "زبان محلی کار نمی کند.",
-"Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
-"Cron" => "زمانبند",
-"Last cron was executed at %s." => "کران قبلی در %s اجرا شد.",
-"Cron was not executed yet!" => "کران هنوز اجرا نشده است!",
-"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 فراخوانی شود.",
-"Sharing" => "اشتراک گذاری",
-"Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
-"Allow users to share via link" => "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
-"Enforce password protection" => "اجبار برای محافظت توسط رمز عبور",
-"Allow public uploads" => "اجازه بارگذاری عمومی",
-"Set default expiration date" => "اعمال تاریخ اتمام پیش فرض",
-"Expire after " => "اتمام اعتبار بعد از",
-"days" => "روز",
-"Enforce expiration date" => "اعمال تاریخ اتمام اشتراک گذاری",
-"Allow resharing" => "مجوز اشتراک گذاری مجدد",
-"Exclude groups from sharing" => "مستثنی شدن گروه ها از اشتراک گذاری",
-"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." => "این برای ارسال هشدار ها استفاده می شود",
-"Send mode" => "حالت ارسال",
-"From address" => "آدرس فرستنده",
-"mail" => "ایمیل",
-"Authentication method" => "روش احراز هویت",
-"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>, the <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>.",
-"by" => "با",
-"Documentation:" => "مستند سازی:",
-"User Documentation" => "مستندات کاربر",
-"Admin Documentation" => "مستند سازی مدیر",
-"Enable only for specific groups" => "فعال سازی تنها برای گروه های خاص",
-"Uninstall App" => "حذف برنامه",
-"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" => "گذرواژه کنونی",
-"New password" => "گذرواژه جدید",
-"Change password" => "تغییر گذر واژه",
-"Full Name" => "نام کامل",
-"Email" => "ایمیل",
-"Your email address" => "پست الکترونیکی شما",
-"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" => "به ترجمه آن کمک کنید",
-"Import Root Certificate" => "وارد کردن گواهی اصلی",
-"Log-in password" => "رمز ورود",
-"Decrypt all Files" => "تمام فایلها رمزگشایی شود",
-"Restore Encryption Keys" => "بازیابی کلید های رمزگذاری",
-"Delete Encryption Keys" => "حذف کلید های رمزگذاری",
-"Login Name" => "نام کاربری",
-"Create" => "ایجاد کردن",
-"Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
-"Enter the recovery password in order to recover the users files during password change" => "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
-"Search Users and Groups" => "جستجوی کاربران و گروه ها",
-"Add Group" => "افزودن گروه",
-"Group" => "گروه",
-"Everyone" => "همه",
-"Admins" => "مدیران",
-"Default Quota" => "سهم پیش فرض",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
-"Unlimited" => "نامحدود",
-"Other" => "دیگر",
-"Username" => "نام کاربری",
-"Quota" => "سهم",
-"Storage Location" => "محل فضای ذخیره سازی",
-"Last Login" => "اخرین ورود",
-"change full name" => "تغییر نام کامل",
-"set new password" => "تنظیم کلمه عبور جدید",
-"Default" => "پیش فرض"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
new file mode 100644
index 00000000000..ab2505062aa
--- /dev/null
+++ b/settings/l10n/fi_FI.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Your full name has been changed." : "Koko nimesi on muutettu.",
+    "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
+    "Group already exists" : "Ryhmä on jo olemassa",
+    "Unable to add group" : "Ryhmän lisäys epäonnistui",
+    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
+    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
+    "Email saved" : "Sähköposti tallennettu",
+    "Invalid email" : "Virheellinen sähköposti",
+    "Unable to delete group" : "Ryhmän poisto epäonnistui",
+    "Unable to delete user" : "Käyttäjän poisto epäonnistui",
+    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Language changed" : "Kieli on vaihdettu",
+    "Invalid request" : "Virheellinen pyyntö",
+    "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
+    "Unable to add user to group %s" : "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+    "Unable to remove user from group %s" : "Käyttäjän poistaminen ryhmästä %s ei onnistu",
+    "Couldn't update app." : "Sovelluksen päivitys epäonnistui.",
+    "Wrong password" : "Väärä salasana",
+    "No user supplied" : "Käyttäjää ei määritetty",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
+    "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
+    "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
+    "Add trusted domain" : "Lisää luotettu toimialue",
+    "Sending..." : "Lähetetään...",
+    "All" : "Kaikki",
+    "Please wait...." : "Odota hetki...",
+    "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
+    "Disable" : "Poista käytöstä",
+    "Enable" : "Käytä",
+    "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön",
+    "Updating...." : "Päivitetään...",
+    "Error while updating app" : "Virhe sovellusta päivittäessä",
+    "Updated" : "Päivitetty",
+    "Uninstalling ...." : "Poistetaan asennusta....",
+    "Error while uninstalling app" : "Virhe sovellusta poistaessa",
+    "Uninstall" : "Poista asennus",
+    "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",
+    "Valid until {date}" : "Kelvollinen {date} asti",
+    "Delete" : "Poista",
+    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
+    "Restore encryption keys." : "Palauta salausavaimet.",
+    "Groups" : "Ryhmät",
+    "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
+    "Error creating group" : "Virhe ryhmää luotaessa",
+    "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi",
+    "deleted {groupName}" : "poistettu {groupName}",
+    "undo" : "kumoa",
+    "no group" : "ei ryhmää",
+    "never" : "ei koskaan",
+    "deleted {userName}" : "poistettu {userName}",
+    "add group" : "lisää ryhmä",
+    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
+    "Error creating user" : "Virhe käyttäjää luotaessa",
+    "A valid password must be provided" : "Anna kelvollinen salasana",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
+    "__language_name__" : "_kielen_nimi_",
+    "Personal Info" : "Henkilökohtaiset tiedot",
+    "SSL root certificates" : "SSL-juurivarmenteet",
+    "Encryption" : "Salaus",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "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",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
+    "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Setup Warning" : "Asetusvaroitus",
+    "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+    "Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
+    "Your PHP version is outdated" : "Käytössä oleva PHP-versio on vanhentunut",
+    "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." : "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
+    "PHP charset is not set to UTF-8" : "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
+    "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.",
+    "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
+    "No problems found" : "Ongelmia ei löytynyt",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Sharing" : "Jakaminen",
+    "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
+    "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Allow public uploads" : "Salli julkiset lähetykset",
+    "Set default expiration date" : "Aseta oletusvanhenemispäivä",
+    "Expire after " : "Vanhenna",
+    "days" : "päivän jälkeen",
+    "Enforce expiration date" : "Pakota vanhenemispäivä",
+    "Allow resharing" : "Salli uudelleenjakaminen",
+    "Restrict users to only share with users in their groups" : "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
+    "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
+    "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
+    "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
+    "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.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
+    "Email Server" : "Sähköpostipalvelin",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Log" : "Loki",
+    "Log level" : "Lokitaso",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "Version" : "Versio",
+    "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>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
+    "More apps" : "Lisää sovelluksia",
+    "Add your app" : "Lisää sovelluksesi",
+    "by" : " Kirjoittaja:",
+    "licensed" : "lisensoitu",
+    "Documentation:" : "Ohjeistus:",
+    "User Documentation" : "Käyttäjäohjeistus",
+    "Admin Documentation" : "Ylläpitäjän ohjeistus",
+    "Update to %s" : "Päivitä versioon %s",
+    "Enable only for specific groups" : "Salli vain tietyille ryhmille",
+    "Uninstall App" : "Poista sovelluksen asennus",
+    "Administrator Documentation" : "Ylläpito-ohjeistus",
+    "Online Documentation" : "Verkko-ohjeistus",
+    "Forum" : "Keskustelupalsta",
+    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
+    "Commercial Support" : "Kaupallinen tuki",
+    "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
+    "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
+    "Password" : "Salasana",
+    "Your password was changed" : "Salasanasi vaihdettiin",
+    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
+    "Current password" : "Nykyinen salasana",
+    "New password" : "Uusi salasana",
+    "Change password" : "Vaihda salasana",
+    "Full Name" : "Koko nimi",
+    "Email" : "Sähköpostiosoite",
+    "Your email address" : "Sähköpostiosoitteesi",
+    "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. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
+    "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
+    "Cancel" : "Peru",
+    "Choose as profile image" : "Valitse profiilikuvaksi",
+    "Language" : "Kieli",
+    "Help translate" : "Auta kääntämisessä",
+    "Valid until" : "Kelvollinen",
+    "Issued By" : " Myöntänyt",
+    "Valid until %s" : "Kelvollinen %s asti",
+    "Import Root Certificate" : "Tuo juurivarmenne",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
+    "Log-in password" : "Kirjautumissalasana",
+    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
+    "Restore Encryption Keys" : "Palauta salausavaimet",
+    "Delete Encryption Keys" : "Poista salausavaimet",
+    "Show storage location" : "Näytä tallennustilan sijainti",
+    "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
+    "Login Name" : "Kirjautumisnimi",
+    "Create" : "Luo",
+    "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
+    "Add Group" : "Lisää ryhmä",
+    "Group" : "Ryhmä",
+    "Everyone" : "Kaikki",
+    "Admins" : "Ylläpitäjät",
+    "Default Quota" : "Oletuskiintiö",
+    "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",
+    "Group Admin for" : "Ryhmäylläpitäjä kohteille",
+    "Quota" : "Kiintiö",
+    "Storage Location" : "Tallennustilan sijainti",
+    "Last Login" : "Viimeisin kirjautuminen",
+    "change full name" : "muuta koko nimi",
+    "set new password" : "aseta uusi salasana",
+    "Default" : "Oletus"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
new file mode 100644
index 00000000000..971bebaed81
--- /dev/null
+++ b/settings/l10n/fi_FI.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Your full name has been changed." : "Koko nimesi on muutettu.",
+    "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
+    "Group already exists" : "Ryhmä on jo olemassa",
+    "Unable to add group" : "Ryhmän lisäys epäonnistui",
+    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
+    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
+    "Email saved" : "Sähköposti tallennettu",
+    "Invalid email" : "Virheellinen sähköposti",
+    "Unable to delete group" : "Ryhmän poisto epäonnistui",
+    "Unable to delete user" : "Käyttäjän poisto epäonnistui",
+    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Language changed" : "Kieli on vaihdettu",
+    "Invalid request" : "Virheellinen pyyntö",
+    "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
+    "Unable to add user to group %s" : "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+    "Unable to remove user from group %s" : "Käyttäjän poistaminen ryhmästä %s ei onnistu",
+    "Couldn't update app." : "Sovelluksen päivitys epäonnistui.",
+    "Wrong password" : "Väärä salasana",
+    "No user supplied" : "Käyttäjää ei määritetty",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
+    "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
+    "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
+    "Add trusted domain" : "Lisää luotettu toimialue",
+    "Sending..." : "Lähetetään...",
+    "All" : "Kaikki",
+    "Please wait...." : "Odota hetki...",
+    "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
+    "Disable" : "Poista käytöstä",
+    "Enable" : "Käytä",
+    "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön",
+    "Updating...." : "Päivitetään...",
+    "Error while updating app" : "Virhe sovellusta päivittäessä",
+    "Updated" : "Päivitetty",
+    "Uninstalling ...." : "Poistetaan asennusta....",
+    "Error while uninstalling app" : "Virhe sovellusta poistaessa",
+    "Uninstall" : "Poista asennus",
+    "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",
+    "Valid until {date}" : "Kelvollinen {date} asti",
+    "Delete" : "Poista",
+    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
+    "Restore encryption keys." : "Palauta salausavaimet.",
+    "Groups" : "Ryhmät",
+    "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
+    "Error creating group" : "Virhe ryhmää luotaessa",
+    "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi",
+    "deleted {groupName}" : "poistettu {groupName}",
+    "undo" : "kumoa",
+    "no group" : "ei ryhmää",
+    "never" : "ei koskaan",
+    "deleted {userName}" : "poistettu {userName}",
+    "add group" : "lisää ryhmä",
+    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
+    "Error creating user" : "Virhe käyttäjää luotaessa",
+    "A valid password must be provided" : "Anna kelvollinen salasana",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
+    "__language_name__" : "_kielen_nimi_",
+    "Personal Info" : "Henkilökohtaiset tiedot",
+    "SSL root certificates" : "SSL-juurivarmenteet",
+    "Encryption" : "Salaus",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "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",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
+    "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Setup Warning" : "Asetusvaroitus",
+    "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+    "Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
+    "Your PHP version is outdated" : "Käytössä oleva PHP-versio on vanhentunut",
+    "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." : "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
+    "PHP charset is not set to UTF-8" : "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
+    "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.",
+    "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
+    "No problems found" : "Ongelmia ei löytynyt",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Sharing" : "Jakaminen",
+    "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
+    "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Allow public uploads" : "Salli julkiset lähetykset",
+    "Set default expiration date" : "Aseta oletusvanhenemispäivä",
+    "Expire after " : "Vanhenna",
+    "days" : "päivän jälkeen",
+    "Enforce expiration date" : "Pakota vanhenemispäivä",
+    "Allow resharing" : "Salli uudelleenjakaminen",
+    "Restrict users to only share with users in their groups" : "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
+    "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
+    "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
+    "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
+    "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.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
+    "Email Server" : "Sähköpostipalvelin",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Log" : "Loki",
+    "Log level" : "Lokitaso",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "Version" : "Versio",
+    "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>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
+    "More apps" : "Lisää sovelluksia",
+    "Add your app" : "Lisää sovelluksesi",
+    "by" : " Kirjoittaja:",
+    "licensed" : "lisensoitu",
+    "Documentation:" : "Ohjeistus:",
+    "User Documentation" : "Käyttäjäohjeistus",
+    "Admin Documentation" : "Ylläpitäjän ohjeistus",
+    "Update to %s" : "Päivitä versioon %s",
+    "Enable only for specific groups" : "Salli vain tietyille ryhmille",
+    "Uninstall App" : "Poista sovelluksen asennus",
+    "Administrator Documentation" : "Ylläpito-ohjeistus",
+    "Online Documentation" : "Verkko-ohjeistus",
+    "Forum" : "Keskustelupalsta",
+    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
+    "Commercial Support" : "Kaupallinen tuki",
+    "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
+    "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
+    "Password" : "Salasana",
+    "Your password was changed" : "Salasanasi vaihdettiin",
+    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
+    "Current password" : "Nykyinen salasana",
+    "New password" : "Uusi salasana",
+    "Change password" : "Vaihda salasana",
+    "Full Name" : "Koko nimi",
+    "Email" : "Sähköpostiosoite",
+    "Your email address" : "Sähköpostiosoitteesi",
+    "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. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
+    "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
+    "Cancel" : "Peru",
+    "Choose as profile image" : "Valitse profiilikuvaksi",
+    "Language" : "Kieli",
+    "Help translate" : "Auta kääntämisessä",
+    "Valid until" : "Kelvollinen",
+    "Issued By" : " Myöntänyt",
+    "Valid until %s" : "Kelvollinen %s asti",
+    "Import Root Certificate" : "Tuo juurivarmenne",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
+    "Log-in password" : "Kirjautumissalasana",
+    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
+    "Restore Encryption Keys" : "Palauta salausavaimet",
+    "Delete Encryption Keys" : "Poista salausavaimet",
+    "Show storage location" : "Näytä tallennustilan sijainti",
+    "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
+    "Login Name" : "Kirjautumisnimi",
+    "Create" : "Luo",
+    "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
+    "Add Group" : "Lisää ryhmä",
+    "Group" : "Ryhmä",
+    "Everyone" : "Kaikki",
+    "Admins" : "Ylläpitäjät",
+    "Default Quota" : "Oletuskiintiö",
+    "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",
+    "Group Admin for" : "Ryhmäylläpitäjä kohteille",
+    "Quota" : "Kiintiö",
+    "Storage Location" : "Tallennustilan sijainti",
+    "Last Login" : "Viimeisin kirjautuminen",
+    "change full name" : "muuta koko nimi",
+    "set new password" : "aseta uusi salasana",
+    "Default" : "Oletus"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
deleted file mode 100644
index e09c2d019c5..00000000000
--- a/settings/l10n/fi_FI.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Käytössä",
-"Not enabled" => "Ei käytössä",
-"Recommended" => "Suositeltu",
-"Authentication error" => "Tunnistautumisvirhe",
-"Your full name has been changed." => "Koko nimesi on muutettu.",
-"Unable to change full name" => "Koko nimen muuttaminen epäonnistui",
-"Group already exists" => "Ryhmä on jo olemassa",
-"Unable to add group" => "Ryhmän lisäys epäonnistui",
-"Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
-"Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
-"Encryption keys deleted permanently" => "Salausavaimet poistettiin pysyvästi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
-"Couldn't remove app." => "Sovelluksen poistaminen epäonnistui.",
-"Email saved" => "Sähköposti tallennettu",
-"Invalid email" => "Virheellinen sähköposti",
-"Unable to delete group" => "Ryhmän poisto epäonnistui",
-"Unable to delete user" => "Käyttäjän poisto epäonnistui",
-"Backups restored successfully" => "Varmuuskopiot palautettiin onnistuneesti",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
-"Language changed" => "Kieli on vaihdettu",
-"Invalid request" => "Virheellinen pyyntö",
-"Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
-"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
-"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
-"Couldn't update app." => "Sovelluksen päivitys epäonnistui.",
-"Wrong password" => "Väärä salasana",
-"No user supplied" => "Käyttäjää ei määritetty",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
-"Wrong admin recovery password. Please check the password and try again." => "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
-"Unable to change password" => "Salasanan vaihto ei onnistunut",
-"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 email. Please revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
-"Add trusted domain" => "Lisää luotettu toimialue",
-"Sending..." => "Lähetetään...",
-"All" => "Kaikki",
-"Please wait...." => "Odota hetki...",
-"Error while disabling app" => "Virhe poistaessa sovellusta käytöstä",
-"Disable" => "Poista käytöstä",
-"Enable" => "Käytä",
-"Error while enabling app" => "Virhe ottaessa sovellusta käyttöön",
-"Updating...." => "Päivitetään...",
-"Error while updating app" => "Virhe sovellusta päivittäessä",
-"Updated" => "Päivitetty",
-"Uninstalling ...." => "Poistetaan asennusta....",
-"Error while uninstalling app" => "Virhe sovellusta poistaessa",
-"Uninstall" => "Poista asennus",
-"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",
-"Valid until {date}" => "Kelvollinen {date} asti",
-"Delete" => "Poista",
-"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
-"Restore encryption keys." => "Palauta salausavaimet.",
-"Groups" => "Ryhmät",
-"Unable to delete {objName}" => "Kohteen {objName} poistaminen epäonnistui",
-"Error creating group" => "Virhe ryhmää luotaessa",
-"A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
-"deleted {groupName}" => "poistettu {groupName}",
-"undo" => "kumoa",
-"no group" => "ei ryhmää",
-"never" => "ei koskaan",
-"deleted {userName}" => "poistettu {userName}",
-"add group" => "lisää ryhmä",
-"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
-"Error creating user" => "Virhe käyttäjää luotaessa",
-"A valid password must be provided" => "Anna kelvollinen salasana",
-"Warning: Home directory for user \"{user}\" already exists" => "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
-"__language_name__" => "_kielen_nimi_",
-"Personal Info" => "Henkilökohtaiset tiedot",
-"SSL root certificates" => "SSL-juurivarmenteet",
-"Encryption" => "Salaus",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
-"Info, warnings, errors and fatal issues" => "Tiedot, varoitukset, virheet ja vakavat ongelmat",
-"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",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
-"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." => "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
-"Setup Warning" => "Asetusvaroitus",
-"Database Performance Info" => "Tietokannan suorituskyvyn tiedot",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
-"Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
-"Your PHP version is outdated" => "Käytössä oleva PHP-versio on vanhentunut",
-"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." => "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
-"PHP charset is not set to UTF-8" => "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
-"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.",
-"URL generation in notification emails" => "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
-"No problems found" => "Ongelmia ei löytynyt",
-"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Viimeisin cron suoritettiin %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
-"Cron was not executed yet!" => "Cronia ei suoritettu vielä!",
-"Execute one task with each page loaded" => "Suorita yksi tehtävä jokaista ladattua sivua kohden",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-"Sharing" => "Jakaminen",
-"Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
-"Allow users to share via link" => "Salli käyttäjien jakaa linkkien kautta",
-"Allow public uploads" => "Salli julkiset lähetykset",
-"Set default expiration date" => "Aseta oletusvanhenemispäivä",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Enforce expiration date" => "Pakota vanhenemispäivä",
-"Allow resharing" => "Salli uudelleenjakaminen",
-"Restrict users to only share with users in their groups" => "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
-"Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
-"Exclude groups from sharing" => "Kiellä ryhmiä jakamasta",
-"These groups will still be able to receive shares, but not to initiate them." => "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
-"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.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
-"Email Server" => "Sähköpostipalvelin",
-"This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
-"Send mode" => "Lähetystila",
-"From address" => "Lähettäjän osoite",
-"Authentication method" => "Tunnistautumistapa",
-"Authentication required" => "Tunnistautuminen vaaditaan",
-"Server address" => "Palvelimen osoite",
-"Port" => "Portti",
-"Credentials" => "Tilitiedot",
-"SMTP Username" => "SMTP-käyttäjätunnus",
-"SMTP Password" => "SMTP-salasana",
-"Store credentials" => "Säilytä tilitiedot",
-"Test email settings" => "Testaa sähköpostiasetukset",
-"Send email" => "Lähetä sähköpostiviesti",
-"Log" => "Loki",
-"Log level" => "Lokitaso",
-"More" => "Enemmän",
-"Less" => "Vähemmän",
-"Version" => "Versio",
-"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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
-"More apps" => "Lisää sovelluksia",
-"Add your app" => "Lisää sovelluksesi",
-"by" => " Kirjoittaja:",
-"licensed" => "lisensoitu",
-"Documentation:" => "Ohjeistus:",
-"User Documentation" => "Käyttäjäohjeistus",
-"Admin Documentation" => "Ylläpitäjän ohjeistus",
-"Update to %s" => "Päivitä versioon %s",
-"Enable only for specific groups" => "Salli vain tietyille ryhmille",
-"Uninstall App" => "Poista sovelluksen asennus",
-"Administrator Documentation" => "Ylläpito-ohjeistus",
-"Online Documentation" => "Verkko-ohjeistus",
-"Forum" => "Keskustelupalsta",
-"Bugtracker" => "Ohjelmistovirheiden jäljitys",
-"Commercial Support" => "Kaupallinen tuki",
-"Get the apps to sync your files" => "Aseta sovellukset synkronoimaan tiedostosi",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
-"Show First Run Wizard again" => "Näytä ensimmäisen käyttökerran avustaja uudelleen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
-"Password" => "Salasana",
-"Your password was changed" => "Salasanasi vaihdettiin",
-"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
-"Current password" => "Nykyinen salasana",
-"New password" => "Uusi salasana",
-"Change password" => "Vaihda salasana",
-"Full Name" => "Koko nimi",
-"Email" => "Sähköpostiosoite",
-"Your email address" => "Sähköpostiosoitteesi",
-"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. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
-"Your avatar is provided by your original account." => "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
-"Cancel" => "Peru",
-"Choose as profile image" => "Valitse profiilikuvaksi",
-"Language" => "Kieli",
-"Help translate" => "Auta kääntämisessä",
-"Valid until" => "Kelvollinen",
-"Issued By" => " Myöntänyt",
-"Valid until %s" => "Kelvollinen %s asti",
-"Import Root Certificate" => "Tuo juurivarmenne",
-"The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
-"Log-in password" => "Kirjautumissalasana",
-"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
-"Restore Encryption Keys" => "Palauta salausavaimet",
-"Delete Encryption Keys" => "Poista salausavaimet",
-"Show storage location" => "Näytä tallennustilan sijainti",
-"Show last log in" => "Näytä viimeisin sisäänkirjautuminen",
-"Login Name" => "Kirjautumisnimi",
-"Create" => "Luo",
-"Admin Recovery Password" => "Ylläpitäjän palautussalasana",
-"Search Users and Groups" => "Etsi käyttäjiä ja ryhmiä",
-"Add Group" => "Lisää ryhmä",
-"Group" => "Ryhmä",
-"Everyone" => "Kaikki",
-"Admins" => "Ylläpitäjät",
-"Default Quota" => "Oletuskiintiö",
-"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",
-"Group Admin for" => "Ryhmäylläpitäjä kohteille",
-"Quota" => "Kiintiö",
-"Storage Location" => "Tallennustilan sijainti",
-"Last Login" => "Viimeisin kirjautuminen",
-"change full name" => "muuta koko nimi",
-"set new password" => "aseta uusi salasana",
-"Default" => "Oletus"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
new file mode 100644
index 00000000000..84da0f59d4b
--- /dev/null
+++ b/settings/l10n/fr.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activée",
+    "Not enabled" : "Désactivée",
+    "Recommended" : "Recommandée",
+    "Authentication error" : "Erreur d'authentification",
+    "Your full name has been changed." : "Votre nom complet a été modifié.",
+    "Unable to change full name" : "Impossible de changer le nom complet",
+    "Group already exists" : "Ce groupe existe déjà",
+    "Unable to add group" : "Impossible d'ajouter le groupe",
+    "Files decrypted successfully" : "Fichiers décryptés avec succès",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
+    "Couldn't decrypt your files, check your password and try again" : "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Couldn't remove app." : "Impossible de supprimer l'application.",
+    "Email saved" : "E-mail sauvegardé",
+    "Invalid email" : "E-mail invalide",
+    "Unable to delete group" : "Impossible de supprimer le groupe",
+    "Unable to delete user" : "Impossible de supprimer l'utilisateur",
+    "Backups restored successfully" : "La sauvegarde a été restaurée avec succès",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Language changed" : "Langue changée",
+    "Invalid request" : "Requête invalide",
+    "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
+    "Unable to add user to group %s" : "Impossible d'ajouter l'utilisateur au groupe %s",
+    "Unable to remove user from group %s" : "Impossible de supprimer l'utilisateur du groupe %s",
+    "Couldn't update app." : "Impossible de mettre à jour l'application",
+    "Wrong password" : "Mot de passe incorrect",
+    "No user supplied" : "Aucun utilisateur fourni",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
+    "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. 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",
+    "Saved" : "Sauvegardé",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+    "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Sending..." : "Envoi en cours...",
+    "All" : "Tous",
+    "Please wait...." : "Veuillez patienter…",
+    "Error while disabling app" : "Erreur lors de la désactivation de l'application",
+    "Disable" : "Désactiver",
+    "Enable" : "Activer",
+    "Error while enabling app" : "Erreur lors de l'activation de l'application",
+    "Updating...." : "Mise à jour...",
+    "Error while updating app" : "Erreur lors de la mise à jour de l'application",
+    "Updated" : "Mise à jour effectuée avec succès",
+    "Uninstalling ...." : "Désintallation...",
+    "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
+    "Uninstall" : "Désinstaller",
+    "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é",
+    "Valid until {date}" : "Valide jusqu'au {date}",
+    "Delete" : "Supprimer",
+    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
+    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
+    "Restore encryption keys." : "Restaurer les clés de chiffrement",
+    "Groups" : "Groupes",
+    "Unable to delete {objName}" : "Impossible de supprimer {objName}",
+    "Error creating group" : "Erreur lors de la création du groupe",
+    "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
+    "deleted {groupName}" : "{groupName} supprimé",
+    "undo" : "annuler",
+    "never" : "jamais",
+    "deleted {userName}" : "{userName} supprimé",
+    "add group" : "ajouter un groupe",
+    "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Error creating user" : "Erreur lors de la création de l'utilisateur",
+    "A valid password must be provided" : "Un mot de passe valide doit être saisi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
+    "__language_name__" : "Français",
+    "SSL root certificates" : "Certificats racine SSL",
+    "Encryption" : "Chiffrement",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
+    "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
+    "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.",
+    "Setup Warning" : "Avertissement, problème de configuration",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Performances de la base de données",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
+    "Your PHP version is outdated" : "Votre version de PHP est trop ancienne",
+    "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." : "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
+    "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
+    "Locale not working" : "Localisation non fonctionnelle",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity checks" : "Vérification de la connectivité",
+    "No problems found" : "Aucun problème trouvé",
+    "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
+    "Sharing" : "Partage",
+    "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
+    "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
+    "Enforce password protection" : "Obliger la protection par mot de passe",
+    "Allow public uploads" : "Autoriser les téléversements publics",
+    "Set default expiration date" : "Spécifier la date d'expiration par défaut",
+    "Expire after " : "Expiration après ",
+    "days" : "jours",
+    "Enforce expiration date" : "Imposer la date d'expiration",
+    "Allow resharing" : "Autoriser le repartage",
+    "Restrict users to only share with users in their groups" : "N'autoriser les partages qu'entre membres de même groupes",
+    "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
+    "Exclude groups from sharing" : "Empêcher certains groupes de partager",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
+    "Security" : "Sécurité",
+    "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.",
+    "Send mode" : "Mode d'envoi",
+    "From address" : "Adresse source",
+    "mail" : "courriel",
+    "Authentication method" : "Méthode d'authentification",
+    "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",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Log" : "Log",
+    "Log level" : "Niveau de log",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Plus d'applications",
+    "Add your app" : "Ajouter votre application",
+    "by" : "par",
+    "licensed" : "Sous licence",
+    "Documentation:" : "Documentation :",
+    "User Documentation" : "Documentation utilisateur",
+    "Admin Documentation" : "Documentation administrateur",
+    "Update to %s" : "Mettre à niveau vers la version %s",
+    "Enable only for specific groups" : "Activer uniquement pour certains groupes",
+    "Uninstall App" : "Désinstaller l'application",
+    "Administrator Documentation" : "Documentation administrateur",
+    "Online Documentation" : "Documentation en ligne",
+    "Forum" : "Forum",
+    "Bugtracker" : "Suivi de bugs",
+    "Commercial Support" : "Support commercial",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
+    "Password" : "Mot de passe",
+    "Your password was changed" : "Votre mot de passe a été changé",
+    "Unable to change your password" : "Impossible de changer votre mot de passe",
+    "Current password" : "Mot de passe actuel",
+    "New password" : "Nouveau mot de passe",
+    "Change password" : "Changer de mot de passe",
+    "Full Name" : "Nom complet",
+    "Email" : "Adresse mail",
+    "Your email address" : "Votre adresse e-mail",
+    "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" : "Nouvelle depuis votre ordinateur",
+    "Select new from Files" : "Nouvelle depuis les Fichiers",
+    "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 carrée mais vous pourrez la recadrer.",
+    "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
+    "Cancel" : "Annuler",
+    "Choose as profile image" : "Choisir en tant que photo de profil ",
+    "Language" : "Langue",
+    "Help translate" : "Aidez à traduire",
+    "Common Name" : "Nom d'usage",
+    "Valid until" : "Valide jusqu'à",
+    "Issued By" : "Délivré par",
+    "Valid until %s" : "Valide jusqu'à %s",
+    "Import Root Certificate" : "Importer un certificat racine",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
+    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
+    "Show storage location" : "Afficher l'emplacement du stockage",
+    "Show last log in" : "Montrer la dernière identification",
+    "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",
+    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
+    "Add Group" : "Ajouter un groupe",
+    "Group" : "Groupe",
+    "Everyone" : "Tout le monde",
+    "Admins" : "Administrateurs",
+    "Default Quota" : "Quota 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",
+    "Quota" : "Quota",
+    "Storage Location" : "Emplacement du Stockage",
+    "Last Login" : "Dernière Connexion",
+    "change full name" : "Modifier le nom complet",
+    "set new password" : "Changer le mot de passe",
+    "Default" : "Défaut"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
new file mode 100644
index 00000000000..21f2424729e
--- /dev/null
+++ b/settings/l10n/fr.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Activée",
+    "Not enabled" : "Désactivée",
+    "Recommended" : "Recommandée",
+    "Authentication error" : "Erreur d'authentification",
+    "Your full name has been changed." : "Votre nom complet a été modifié.",
+    "Unable to change full name" : "Impossible de changer le nom complet",
+    "Group already exists" : "Ce groupe existe déjà",
+    "Unable to add group" : "Impossible d'ajouter le groupe",
+    "Files decrypted successfully" : "Fichiers décryptés avec succès",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
+    "Couldn't decrypt your files, check your password and try again" : "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Couldn't remove app." : "Impossible de supprimer l'application.",
+    "Email saved" : "E-mail sauvegardé",
+    "Invalid email" : "E-mail invalide",
+    "Unable to delete group" : "Impossible de supprimer le groupe",
+    "Unable to delete user" : "Impossible de supprimer l'utilisateur",
+    "Backups restored successfully" : "La sauvegarde a été restaurée avec succès",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Language changed" : "Langue changée",
+    "Invalid request" : "Requête invalide",
+    "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
+    "Unable to add user to group %s" : "Impossible d'ajouter l'utilisateur au groupe %s",
+    "Unable to remove user from group %s" : "Impossible de supprimer l'utilisateur du groupe %s",
+    "Couldn't update app." : "Impossible de mettre à jour l'application",
+    "Wrong password" : "Mot de passe incorrect",
+    "No user supplied" : "Aucun utilisateur fourni",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
+    "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. 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",
+    "Saved" : "Sauvegardé",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+    "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Sending..." : "Envoi en cours...",
+    "All" : "Tous",
+    "Please wait...." : "Veuillez patienter…",
+    "Error while disabling app" : "Erreur lors de la désactivation de l'application",
+    "Disable" : "Désactiver",
+    "Enable" : "Activer",
+    "Error while enabling app" : "Erreur lors de l'activation de l'application",
+    "Updating...." : "Mise à jour...",
+    "Error while updating app" : "Erreur lors de la mise à jour de l'application",
+    "Updated" : "Mise à jour effectuée avec succès",
+    "Uninstalling ...." : "Désintallation...",
+    "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
+    "Uninstall" : "Désinstaller",
+    "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é",
+    "Valid until {date}" : "Valide jusqu'au {date}",
+    "Delete" : "Supprimer",
+    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
+    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
+    "Restore encryption keys." : "Restaurer les clés de chiffrement",
+    "Groups" : "Groupes",
+    "Unable to delete {objName}" : "Impossible de supprimer {objName}",
+    "Error creating group" : "Erreur lors de la création du groupe",
+    "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
+    "deleted {groupName}" : "{groupName} supprimé",
+    "undo" : "annuler",
+    "never" : "jamais",
+    "deleted {userName}" : "{userName} supprimé",
+    "add group" : "ajouter un groupe",
+    "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Error creating user" : "Erreur lors de la création de l'utilisateur",
+    "A valid password must be provided" : "Un mot de passe valide doit être saisi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
+    "__language_name__" : "Français",
+    "SSL root certificates" : "Certificats racine SSL",
+    "Encryption" : "Chiffrement",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
+    "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
+    "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.",
+    "Setup Warning" : "Avertissement, problème de configuration",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Performances de la base de données",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
+    "Your PHP version is outdated" : "Votre version de PHP est trop ancienne",
+    "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." : "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
+    "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
+    "Locale not working" : "Localisation non fonctionnelle",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity checks" : "Vérification de la connectivité",
+    "No problems found" : "Aucun problème trouvé",
+    "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
+    "Sharing" : "Partage",
+    "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
+    "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
+    "Enforce password protection" : "Obliger la protection par mot de passe",
+    "Allow public uploads" : "Autoriser les téléversements publics",
+    "Set default expiration date" : "Spécifier la date d'expiration par défaut",
+    "Expire after " : "Expiration après ",
+    "days" : "jours",
+    "Enforce expiration date" : "Imposer la date d'expiration",
+    "Allow resharing" : "Autoriser le repartage",
+    "Restrict users to only share with users in their groups" : "N'autoriser les partages qu'entre membres de même groupes",
+    "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
+    "Exclude groups from sharing" : "Empêcher certains groupes de partager",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
+    "Security" : "Sécurité",
+    "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.",
+    "Send mode" : "Mode d'envoi",
+    "From address" : "Adresse source",
+    "mail" : "courriel",
+    "Authentication method" : "Méthode d'authentification",
+    "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",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Log" : "Log",
+    "Log level" : "Niveau de log",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Plus d'applications",
+    "Add your app" : "Ajouter votre application",
+    "by" : "par",
+    "licensed" : "Sous licence",
+    "Documentation:" : "Documentation :",
+    "User Documentation" : "Documentation utilisateur",
+    "Admin Documentation" : "Documentation administrateur",
+    "Update to %s" : "Mettre à niveau vers la version %s",
+    "Enable only for specific groups" : "Activer uniquement pour certains groupes",
+    "Uninstall App" : "Désinstaller l'application",
+    "Administrator Documentation" : "Documentation administrateur",
+    "Online Documentation" : "Documentation en ligne",
+    "Forum" : "Forum",
+    "Bugtracker" : "Suivi de bugs",
+    "Commercial Support" : "Support commercial",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
+    "Password" : "Mot de passe",
+    "Your password was changed" : "Votre mot de passe a été changé",
+    "Unable to change your password" : "Impossible de changer votre mot de passe",
+    "Current password" : "Mot de passe actuel",
+    "New password" : "Nouveau mot de passe",
+    "Change password" : "Changer de mot de passe",
+    "Full Name" : "Nom complet",
+    "Email" : "Adresse mail",
+    "Your email address" : "Votre adresse e-mail",
+    "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" : "Nouvelle depuis votre ordinateur",
+    "Select new from Files" : "Nouvelle depuis les Fichiers",
+    "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 carrée mais vous pourrez la recadrer.",
+    "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
+    "Cancel" : "Annuler",
+    "Choose as profile image" : "Choisir en tant que photo de profil ",
+    "Language" : "Langue",
+    "Help translate" : "Aidez à traduire",
+    "Common Name" : "Nom d'usage",
+    "Valid until" : "Valide jusqu'à",
+    "Issued By" : "Délivré par",
+    "Valid until %s" : "Valide jusqu'à %s",
+    "Import Root Certificate" : "Importer un certificat racine",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
+    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
+    "Show storage location" : "Afficher l'emplacement du stockage",
+    "Show last log in" : "Montrer la dernière identification",
+    "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",
+    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
+    "Add Group" : "Ajouter un groupe",
+    "Group" : "Groupe",
+    "Everyone" : "Tout le monde",
+    "Admins" : "Administrateurs",
+    "Default Quota" : "Quota 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",
+    "Quota" : "Quota",
+    "Storage Location" : "Emplacement du Stockage",
+    "Last Login" : "Dernière Connexion",
+    "change full name" : "Modifier le nom complet",
+    "set new password" : "Changer le mot de passe",
+    "Default" : "Défaut"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
deleted file mode 100644
index 56c89bc412d..00000000000
--- a/settings/l10n/fr.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activées",
-"Not enabled" => "Désactivées",
-"Recommended" => "Recommandées",
-"Authentication error" => "Erreur d'authentification",
-"Your full name has been changed." => "Votre nom complet a été modifié.",
-"Unable to change full name" => "Impossible de changer le nom complet",
-"Group already exists" => "Ce groupe existe déjà",
-"Unable to add group" => "Impossible d'ajouter le groupe",
-"Files decrypted successfully" => "Fichiers décryptés avec succès",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
-"Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
-"Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
-"Couldn't remove app." => "Impossible de supprimer l'application.",
-"Email saved" => "E-mail sauvegardé",
-"Invalid email" => "E-mail invalide",
-"Unable to delete group" => "Impossible de supprimer le groupe",
-"Unable to delete user" => "Impossible de supprimer l'utilisateur",
-"Backups restored successfully" => "La sauvegarde a été restaurée avec succès",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
-"Language changed" => "Langue changée",
-"Invalid request" => "Requête invalide",
-"Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
-"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
-"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
-"Couldn't update app." => "Impossible de mettre à jour l'application",
-"Wrong password" => "Mot de passe incorrect",
-"No user supplied" => "Aucun utilisateur fourni",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
-"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données non valable. 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",
-"Saved" => "Sauvegardé",
-"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 email. Please revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
-"Add trusted domain" => "Ajouter un domaine de confiance",
-"Sending..." => "Envoi en cours...",
-"All" => "Tous",
-"Please wait...." => "Veuillez patienter…",
-"Error while disabling app" => "Erreur lors de la désactivation de l'application",
-"Disable" => "Désactiver",
-"Enable" => "Activer",
-"Error while enabling app" => "Erreur lors de l'activation de l'application",
-"Updating...." => "Mise à jour...",
-"Error while updating app" => "Erreur lors de la mise à jour de l'application",
-"Updated" => "Mise à jour effectuée avec succès",
-"Uninstalling ...." => "Désintallation...",
-"Error while uninstalling app" => "Erreur lors de la désinstallation de l'application",
-"Uninstall" => "Désinstaller",
-"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é",
-"Valid until {date}" => "Valide jusqu'au {date}",
-"Delete" => "Supprimer",
-"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
-"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
-"Restore encryption keys." => "Restaurer les clés de chiffrement",
-"Groups" => "Groupes",
-"Unable to delete {objName}" => "Impossible de supprimer {objName}",
-"Error creating group" => "Erreur lors de la création du groupe",
-"A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
-"deleted {groupName}" => "{groupName} supprimé",
-"undo" => "annuler",
-"no group" => "Aucun groupe",
-"never" => "jamais",
-"deleted {userName}" => "{userName} supprimé",
-"add group" => "ajouter un groupe",
-"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
-"Error creating user" => "Erreur lors de la création de l'utilisateur",
-"A valid password must be provided" => "Un mot de passe valide doit être saisi",
-"Warning: Home directory for user \"{user}\" already exists" => "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
-"__language_name__" => "Français",
-"Personal Info" => "Informations personnelles",
-"SSL root certificates" => "Certificats racine SSL",
-"Encryption" => "Chiffrement",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
-"Info, warnings, errors and fatal issues" => "Informations, avertissements, erreurs et erreurs fatales",
-"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.",
-"Setup Warning" => "Avertissement, problème de configuration",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
-"Database Performance Info" => "Performances de la base de données",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
-"Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
-"Your PHP version is outdated" => "Votre version de PHP est trop ancienne",
-"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." => "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
-"PHP charset is not set to UTF-8" => "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
-"Locale not working" => "Localisation non fonctionnelle",
-"System locale can not be set to a one which supports UTF-8." => "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
-"URL generation in notification emails" => "Génération d'URL dans les mails de notification",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
-"Connectivity checks" => "Vérification de la connectivité",
-"No problems found" => "Aucun problème trouvé",
-"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Le dernier cron s'est exécuté à %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
-"Cron was not executed yet!" => "Le cron n'a pas encore été exécuté !",
-"Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-"Sharing" => "Partage",
-"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
-"Allow users to share via link" => "Autoriser les utilisateurs à partager par lien",
-"Enforce password protection" => "Obliger la protection par mot de passe",
-"Allow public uploads" => "Autoriser les téléversements publics",
-"Set default expiration date" => "Spécifier la date d'expiration par défaut",
-"Expire after " => "Expiration après ",
-"days" => "jours",
-"Enforce expiration date" => "Imposer la date d'expiration",
-"Allow resharing" => "Autoriser le repartage",
-"Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
-"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
-"Exclude groups from sharing" => "Empêcher certains groupes de partager",
-"These groups will still be able to receive shares, but not to initiate them." => "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
-"Security" => "Sécurité",
-"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.",
-"Send mode" => "Mode d'envoi",
-"From address" => "Adresse source",
-"mail" => "courriel",
-"Authentication method" => "Méthode d'authentification",
-"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",
-"Store credentials" => "Enregistrer les identifiants",
-"Test email settings" => "Tester les paramètres e-mail",
-"Send email" => "Envoyer un e-mail",
-"Log" => "Log",
-"Log level" => "Niveau de log",
-"More" => "Plus",
-"Less" => "Moins",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Plus d'applications",
-"Add your app" => "Ajouter votre application",
-"by" => "par",
-"licensed" => "Sous licence",
-"Documentation:" => "Documentation :",
-"User Documentation" => "Documentation utilisateur",
-"Admin Documentation" => "Documentation administrateur",
-"Update to %s" => "Mettre à niveau vers la version %s",
-"Enable only for specific groups" => "Activer uniquement pour certains groupes",
-"Uninstall App" => "Désinstaller l'application",
-"Administrator Documentation" => "Documentation administrateur",
-"Online Documentation" => "Documentation en ligne",
-"Forum" => "Forum",
-"Bugtracker" => "Suivi de bugs",
-"Commercial Support" => "Support commercial",
-"Get the apps to sync your files" => "Obtenez les applications de synchronisation de vos fichiers",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
-"Show First Run Wizard again" => "Revoir le premier lancement de l'installeur",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
-"Password" => "Mot de passe",
-"Your password was changed" => "Votre mot de passe a été changé",
-"Unable to change your password" => "Impossible de changer votre mot de passe",
-"Current password" => "Mot de passe actuel",
-"New password" => "Nouveau mot de passe",
-"Change password" => "Changer de mot de passe",
-"Full Name" => "Nom complet",
-"Email" => "Adresse mail",
-"Your email address" => "Votre adresse e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
-"Profile picture" => "Photo de profil",
-"Upload new" => "Nouvelle depuis votre ordinateur",
-"Select new from Files" => "Nouvelle depuis les Fichiers",
-"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 carrée mais vous pourrez la recadrer.",
-"Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
-"Cancel" => "Annuler",
-"Choose as profile image" => "Choisir en tant que photo de profil ",
-"Language" => "Langue",
-"Help translate" => "Aidez à traduire",
-"Common Name" => "Nom d'usage",
-"Valid until" => "Valide jusqu'à",
-"Issued By" => "Délivré par",
-"Valid until %s" => "Valide jusqu'à %s",
-"Import Root Certificate" => "Importer un certificat racine",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
-"Restore Encryption Keys" => "Restaurer les clés de chiffrement",
-"Delete Encryption Keys" => "Supprimer les clés de chiffrement",
-"Show storage location" => "Afficher l'emplacement du stockage",
-"Show last log in" => "Montrer la dernière identification",
-"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",
-"Search Users and Groups" => "Chercher parmi les utilisateurs et groupes",
-"Add Group" => "Ajouter un groupe",
-"Group" => "Groupe",
-"Everyone" => "Tout le monde",
-"Admins" => "Administrateurs",
-"Default Quota" => "Quota 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",
-"Group Admin for" => "Administrateur de groupe pour",
-"Quota" => "Quota",
-"Storage Location" => "Emplacement du Stockage",
-"Last Login" => "Dernière Connexion",
-"change full name" => "Modifier le nom complet",
-"set new password" => "Changer le mot de passe",
-"Default" => "Défaut"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
new file mode 100644
index 00000000000..6a9f27f524f
--- /dev/null
+++ b/settings/l10n/gl.js
@@ -0,0 +1,219 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activado",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Your full name has been changed." : "O seu nome completo foi cambiado",
+    "Unable to change full name" : "Non é posíbel cambiar o nome completo",
+    "Group already exists" : "O grupo xa existe",
+    "Unable to add group" : "Non é posíbel engadir o grupo",
+    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
+    "Email saved" : "Correo gardado",
+    "Invalid email" : "Correo incorrecto",
+    "Unable to delete group" : "Non é posíbel eliminar o grupo.",
+    "Unable to delete user" : "Non é posíbel eliminar o usuario",
+    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Language changed" : "O idioma cambiou",
+    "Invalid request" : "Petición incorrecta",
+    "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
+    "Unable to add user to group %s" : "Non é posíbel engadir o usuario ao grupo %s",
+    "Unable to remove user from group %s" : "Non é posíbel eliminar o usuario do grupo %s",
+    "Couldn't update app." : "Non foi posíbel actualizar a aplicación.",
+    "Wrong password" : "Contrasinal incorrecto",
+    "No user supplied" : "Non subministrado polo usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
+    "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",
+    "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.",
+    "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.",
+    "Sending..." : "Enviando...",
+    "All" : "Todo",
+    "Please wait...." : "Agarde...",
+    "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Produciuse un erro ao activar a aplicación",
+    "Updating...." : "Actualizando...",
+    "Error while updating app" : "Produciuse un erro mentres actualizaba a aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo",
+    "Uninstall" : "Desinstalar",
+    "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",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
+    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
+    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
+    "Error creating group" : "Produciuse un erro ao crear o grupo",
+    "A valid group name must be provided" : "Debe fornecer un nome de grupo",
+    "deleted {groupName}" : "{groupName} foi eliminado",
+    "undo" : "desfacer",
+    "never" : "nunca",
+    "deleted {userName}" : "{userName} foi eliminado",
+    "add group" : "engadir un grupo",
+    "A valid username must be provided" : "Debe fornecer un nome de usuario",
+    "Error creating user" : "Produciuse un erro ao crear o usuario",
+    "A valid password must be provided" : "Debe fornecer un contrasinal",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
+    "__language_name__" : "Galego",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
+    "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.",
+    "Setup Warning" : "Configurar os avisos",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Información do rendemento da base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+    "Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+    "Your PHP version is outdated" : "A versión de PHP está desactualizada",
+    "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." : "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
+    "Locale not working" : "A configuración rexional non funciona",
+    "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
+    "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
+    "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
+    "Sharing" : "Compartindo",
+    "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
+    "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
+    "Enforce password protection" : "Forzar a protección por contrasinal",
+    "Allow public uploads" : "Permitir os envíos públicos",
+    "Set default expiration date" : "Definir a data predeterminada de caducidade",
+    "Expire after " : "Caduca após",
+    "days" : "días",
+    "Enforce expiration date" : "Obrigar a data de caducidade",
+    "Allow resharing" : "Permitir compartir",
+    "Restrict users to only share with users in their groups" : "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
+    "Exclude groups from sharing" : "Excluír grupos da compartición",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
+    "Security" : "Seguranza",
+    "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.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde o enderezo",
+    "mail" : "correo",
+    "Authentication method" : "Método de autenticación",
+    "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",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Máis aplicativos",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación do usuario",
+    "Admin Documentation" : "Documentación do administrador",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar unha aplicación",
+    "Administrator Documentation" : "Documentación do administrador",
+    "Online Documentation" : "Documentación na Rede",
+    "Forum" : "Foro",
+    "Bugtracker" : "Seguemento de fallos",
+    "Commercial Support" : "Asistencia comercial",
+    "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
+    "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
+    "Password" : "Contrasinal",
+    "Your password was changed" : "O seu contrasinal foi cambiado",
+    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
+    "Current password" : "Contrasinal actual",
+    "New password" : "Novo contrasinal",
+    "Change password" : "Cambiar o contrasinal",
+    "Full Name" : "Nome completo",
+    "Email" : "Correo",
+    "Your email address" : "O seu enderezo de correo",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolla unha imaxe para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Axude na tradución",
+    "Import Root Certificate" : "Importar o certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
+    "Log-in password" : "Contrasinal de acceso",
+    "Decrypt all Files" : "Descifrar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
+    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Login Name" : "Nome de acceso",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
+    "Search Users and Groups" : "Buscar usuarios e grupos",
+    "Add Group" : "Engadir un grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cota por omisión",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
+    "Unlimited" : "Sen límites",
+    "Other" : "Outro",
+    "Username" : "Nome de usuario",
+    "Quota" : "Cota",
+    "Storage Location" : "Localización do almacenamento",
+    "Last Login" : "Último acceso",
+    "change full name" : "Cambiar o nome completo",
+    "set new password" : "estabelecer un novo contrasinal",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
new file mode 100644
index 00000000000..96cf3364244
--- /dev/null
+++ b/settings/l10n/gl.json
@@ -0,0 +1,217 @@
+{ "translations": {
+    "Enabled" : "Activado",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Your full name has been changed." : "O seu nome completo foi cambiado",
+    "Unable to change full name" : "Non é posíbel cambiar o nome completo",
+    "Group already exists" : "O grupo xa existe",
+    "Unable to add group" : "Non é posíbel engadir o grupo",
+    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
+    "Email saved" : "Correo gardado",
+    "Invalid email" : "Correo incorrecto",
+    "Unable to delete group" : "Non é posíbel eliminar o grupo.",
+    "Unable to delete user" : "Non é posíbel eliminar o usuario",
+    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Language changed" : "O idioma cambiou",
+    "Invalid request" : "Petición incorrecta",
+    "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
+    "Unable to add user to group %s" : "Non é posíbel engadir o usuario ao grupo %s",
+    "Unable to remove user from group %s" : "Non é posíbel eliminar o usuario do grupo %s",
+    "Couldn't update app." : "Non foi posíbel actualizar a aplicación.",
+    "Wrong password" : "Contrasinal incorrecto",
+    "No user supplied" : "Non subministrado polo usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
+    "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",
+    "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.",
+    "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.",
+    "Sending..." : "Enviando...",
+    "All" : "Todo",
+    "Please wait...." : "Agarde...",
+    "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Produciuse un erro ao activar a aplicación",
+    "Updating...." : "Actualizando...",
+    "Error while updating app" : "Produciuse un erro mentres actualizaba a aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo",
+    "Uninstall" : "Desinstalar",
+    "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",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
+    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
+    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
+    "Error creating group" : "Produciuse un erro ao crear o grupo",
+    "A valid group name must be provided" : "Debe fornecer un nome de grupo",
+    "deleted {groupName}" : "{groupName} foi eliminado",
+    "undo" : "desfacer",
+    "never" : "nunca",
+    "deleted {userName}" : "{userName} foi eliminado",
+    "add group" : "engadir un grupo",
+    "A valid username must be provided" : "Debe fornecer un nome de usuario",
+    "Error creating user" : "Produciuse un erro ao crear o usuario",
+    "A valid password must be provided" : "Debe fornecer un contrasinal",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
+    "__language_name__" : "Galego",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
+    "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.",
+    "Setup Warning" : "Configurar os avisos",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Información do rendemento da base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+    "Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+    "Your PHP version is outdated" : "A versión de PHP está desactualizada",
+    "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." : "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
+    "Locale not working" : "A configuración rexional non funciona",
+    "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
+    "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
+    "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
+    "Sharing" : "Compartindo",
+    "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
+    "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
+    "Enforce password protection" : "Forzar a protección por contrasinal",
+    "Allow public uploads" : "Permitir os envíos públicos",
+    "Set default expiration date" : "Definir a data predeterminada de caducidade",
+    "Expire after " : "Caduca após",
+    "days" : "días",
+    "Enforce expiration date" : "Obrigar a data de caducidade",
+    "Allow resharing" : "Permitir compartir",
+    "Restrict users to only share with users in their groups" : "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
+    "Exclude groups from sharing" : "Excluír grupos da compartición",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
+    "Security" : "Seguranza",
+    "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.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde o enderezo",
+    "mail" : "correo",
+    "Authentication method" : "Método de autenticación",
+    "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",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Máis aplicativos",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación do usuario",
+    "Admin Documentation" : "Documentación do administrador",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar unha aplicación",
+    "Administrator Documentation" : "Documentación do administrador",
+    "Online Documentation" : "Documentación na Rede",
+    "Forum" : "Foro",
+    "Bugtracker" : "Seguemento de fallos",
+    "Commercial Support" : "Asistencia comercial",
+    "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
+    "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
+    "Password" : "Contrasinal",
+    "Your password was changed" : "O seu contrasinal foi cambiado",
+    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
+    "Current password" : "Contrasinal actual",
+    "New password" : "Novo contrasinal",
+    "Change password" : "Cambiar o contrasinal",
+    "Full Name" : "Nome completo",
+    "Email" : "Correo",
+    "Your email address" : "O seu enderezo de correo",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolla unha imaxe para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Axude na tradución",
+    "Import Root Certificate" : "Importar o certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
+    "Log-in password" : "Contrasinal de acceso",
+    "Decrypt all Files" : "Descifrar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
+    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Login Name" : "Nome de acceso",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
+    "Search Users and Groups" : "Buscar usuarios e grupos",
+    "Add Group" : "Engadir un grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cota por omisión",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
+    "Unlimited" : "Sen límites",
+    "Other" : "Outro",
+    "Username" : "Nome de usuario",
+    "Quota" : "Cota",
+    "Storage Location" : "Localización do almacenamento",
+    "Last Login" : "Último acceso",
+    "change full name" : "Cambiar o nome completo",
+    "set new password" : "estabelecer un novo contrasinal",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
deleted file mode 100644
index 1399257d9c5..00000000000
--- a/settings/l10n/gl.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activado",
-"Authentication error" => "Produciuse un erro de autenticación",
-"Your full name has been changed." => "O seu nome completo foi cambiado",
-"Unable to change full name" => "Non é posíbel cambiar o nome completo",
-"Group already exists" => "O grupo xa existe",
-"Unable to add group" => "Non é posíbel engadir o grupo",
-"Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
-"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Couldn't remove app." => "Non foi posíbel retirar a aplicación.",
-"Email saved" => "Correo gardado",
-"Invalid email" => "Correo incorrecto",
-"Unable to delete group" => "Non é posíbel eliminar o grupo.",
-"Unable to delete user" => "Non é posíbel eliminar o usuario",
-"Backups restored successfully" => "As copias de seguranza foron restauradas satisfactoriamente",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Language changed" => "O idioma cambiou",
-"Invalid request" => "Petición incorrecta",
-"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
-"Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s",
-"Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s",
-"Couldn't update app." => "Non foi posíbel actualizar a aplicación.",
-"Wrong password" => "Contrasinal incorrecto",
-"No user supplied" => "Non subministrado polo usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
-"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",
-"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.",
-"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.",
-"Sending..." => "Enviando...",
-"All" => "Todo",
-"Please wait...." => "Agarde...",
-"Error while disabling app" => "Produciuse un erro ao desactivar a aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Produciuse un erro ao activar a aplicación",
-"Updating...." => "Actualizando...",
-"Error while updating app" => "Produciuse un erro mentres actualizaba a aplicación",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Produciuse un erro ao desinstalar o aplicatvo",
-"Uninstall" => "Desinstalar",
-"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",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
-"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
-"Restore encryption keys." => "Restaurar as chaves de cifrado.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Non é posíbel eliminar {objName}",
-"Error creating group" => "Produciuse un erro ao crear o grupo",
-"A valid group name must be provided" => "Debe fornecer un nome de grupo",
-"deleted {groupName}" => "{groupName} foi eliminado",
-"undo" => "desfacer",
-"never" => "nunca",
-"deleted {userName}" => "{userName} foi eliminado",
-"add group" => "engadir un grupo",
-"A valid username must be provided" => "Debe fornecer un nome de usuario",
-"Error creating user" => "Produciuse un erro ao crear o usuario",
-"A valid password must be provided" => "Debe fornecer un contrasinal",
-"Warning: Home directory for user \"{user}\" already exists" => "Aviso: O directorio persoal para o usuario «{user}» xa existe",
-"__language_name__" => "Galego",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (problemas críticos, erros, avisos, información, depuración)",
-"Info, warnings, errors and fatal issues" => "Información, avisos, erros e problemas críticos",
-"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.",
-"Setup Warning" => "Configurar os avisos",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
-"Database Performance Info" => "Información do rendemento da base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
-"Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
-"Your PHP version is outdated" => "A versión de PHP está desactualizada",
-"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." => "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
-"PHP charset is not set to UTF-8" => "O xogo de caracteres de PHP non está estabelecido a UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
-"Locale not working" => "A configuración rexional non funciona",
-"System locale can not be set to a one which supports UTF-8." => "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
-"URL generation in notification emails" => "Xeración dos URL nos correos de notificación",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
-"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "O último «cron» executouse ás %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
-"Cron was not executed yet!" => "«Cron» aínda non foi executado!",
-"Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-"Sharing" => "Compartindo",
-"Allow apps to use the Share API" => "Permitir que as aplicacións empreguen o API para compartir",
-"Allow users to share via link" => "Permitir que os usuarios compartan a través de ligazóns",
-"Enforce password protection" => "Forzar a protección por contrasinal",
-"Allow public uploads" => "Permitir os envíos públicos",
-"Set default expiration date" => "Definir a data predeterminada de caducidade",
-"Expire after " => "Caduca após",
-"days" => "días",
-"Enforce expiration date" => "Obrigar a data de caducidade",
-"Allow resharing" => "Permitir compartir",
-"Restrict users to only share with users in their groups" => "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
-"Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
-"Exclude groups from sharing" => "Excluír grupos da compartición",
-"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderán recibir comparticións, mais non inicialas.",
-"Security" => "Seguranza",
-"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.",
-"Send mode" => "Modo de envío",
-"From address" => "Desde o enderezo",
-"mail" => "correo",
-"Authentication method" => "Método de autenticación",
-"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",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Máis aplicativos",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación do usuario",
-"Admin Documentation" => "Documentación do administrador",
-"Enable only for specific groups" => "Activar só para grupos específicos",
-"Uninstall App" => "Desinstalar unha aplicación",
-"Administrator Documentation" => "Documentación do administrador",
-"Online Documentation" => "Documentación na Rede",
-"Forum" => "Foro",
-"Bugtracker" => "Seguemento de fallos",
-"Commercial Support" => "Asistencia comercial",
-"Get the apps to sync your files" => "Obteña as aplicacións para sincronizar os seus ficheiros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
-"Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
-"Password" => "Contrasinal",
-"Your password was changed" => "O seu contrasinal foi cambiado",
-"Unable to change your password" => "Non é posíbel cambiar o seu contrasinal",
-"Current password" => "Contrasinal actual",
-"New password" => "Novo contrasinal",
-"Change password" => "Cambiar o contrasinal",
-"Full Name" => "Nome completo",
-"Email" => "Correo",
-"Your email address" => "O seu enderezo de correo",
-"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.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolla unha imaxe para o perfil",
-"Language" => "Idioma",
-"Help translate" => "Axude na tradución",
-"Import Root Certificate" => "Importar o certificado raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "A aplicación de cifrado non está activada, descifre todos os ficheiros",
-"Log-in password" => "Contrasinal de acceso",
-"Decrypt all Files" => "Descifrar todos os ficheiros",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
-"Restore Encryption Keys" => "Restaurar as chaves de cifrado",
-"Delete Encryption Keys" => "Eliminar as chaves de cifrado",
-"Login Name" => "Nome de acceso",
-"Create" => "Crear",
-"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-"Search Users and Groups" => "Buscar usuarios e grupos",
-"Add Group" => "Engadir un grupo",
-"Group" => "Grupo",
-"Everyone" => "Todos",
-"Admins" => "Administradores",
-"Default Quota" => "Cota por omisión",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
-"Unlimited" => "Sen límites",
-"Other" => "Outro",
-"Username" => "Nome de usuario",
-"Quota" => "Cota",
-"Storage Location" => "Localización do almacenamento",
-"Last Login" => "Último acceso",
-"change full name" => "Cambiar o nome completo",
-"set new password" => "estabelecer un novo contrasinal",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
new file mode 100644
index 00000000000..de7df02ef12
--- /dev/null
+++ b/settings/l10n/he.js
@@ -0,0 +1,95 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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." : "לא ניתן לעדכן את היישום.",
+    "Saved" : "נשמר",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "All" : "הכל",
+    "Please wait...." : "נא להמתין…",
+    "Disable" : "בטל",
+    "Enable" : "הפעלה",
+    "Updating...." : "מתבצע עדכון…",
+    "Error while updating app" : "אירעה שגיאה בעת עדכון היישום",
+    "Updated" : "מעודכן",
+    "Delete" : "מחיקה",
+    "Groups" : "קבוצות",
+    "undo" : "ביטול",
+    "never" : "לעולם לא",
+    "add group" : "הוספת קבוצה",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "Error creating user" : "יצירת המשתמש נכשלה",
+    "A valid password must be provided" : "יש לספק ססמה תקנית",
+    "__language_name__" : "עברית",
+    "SSL root certificates" : "שורש אישורי אבטחת SSL ",
+    "Encryption" : "הצפנה",
+    "None" : "כלום",
+    "Login" : "התחברות",
+    "Security Warning" : "אזהרת אבטחה",
+    "Setup Warning" : "שגיאת הגדרה",
+    "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
+    "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Sharing" : "שיתוף",
+    "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
+    "Allow resharing" : "לאפשר שיתוף מחדש",
+    "Security" : "אבטחה",
+    "Enforce HTTPS" : "לאלץ HTTPS",
+    "Server address" : "כתובת שרת",
+    "Port" : "פורט",
+    "Credentials" : "פרטי גישה",
+    "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>.",
+    "More apps" : "יישומים נוספים",
+    "by" : "על ידי",
+    "User Documentation" : "תיעוד משתמש",
+    "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" : "ססמה נוכחית",
+    "New password" : "ססמה חדשה",
+    "Change password" : "שינוי ססמה",
+    "Email" : "דואר אלקטרוני",
+    "Your email address" : "כתובת הדוא״ל שלך",
+    "Profile picture" : "תמונת פרופיל",
+    "Cancel" : "ביטול",
+    "Language" : "פה",
+    "Help translate" : "עזרה בתרגום",
+    "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
+    "Login Name" : "שם כניסה",
+    "Create" : "יצירה",
+    "Admin Recovery Password" : "ססמת השחזור של המנהל",
+    "Group" : "קבוצה",
+    "Default Quota" : "מכסת בררת המחדל",
+    "Unlimited" : "ללא הגבלה",
+    "Other" : "אחר",
+    "Username" : "שם משתמש",
+    "Quota" : "מכסה",
+    "set new password" : "הגדרת ססמה חדשה",
+    "Default" : "בררת מחדל"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
new file mode 100644
index 00000000000..904531fd5da
--- /dev/null
+++ b/settings/l10n/he.json
@@ -0,0 +1,93 @@
+{ "translations": {
+    "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." : "לא ניתן לעדכן את היישום.",
+    "Saved" : "נשמר",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "All" : "הכל",
+    "Please wait...." : "נא להמתין…",
+    "Disable" : "בטל",
+    "Enable" : "הפעלה",
+    "Updating...." : "מתבצע עדכון…",
+    "Error while updating app" : "אירעה שגיאה בעת עדכון היישום",
+    "Updated" : "מעודכן",
+    "Delete" : "מחיקה",
+    "Groups" : "קבוצות",
+    "undo" : "ביטול",
+    "never" : "לעולם לא",
+    "add group" : "הוספת קבוצה",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "Error creating user" : "יצירת המשתמש נכשלה",
+    "A valid password must be provided" : "יש לספק ססמה תקנית",
+    "__language_name__" : "עברית",
+    "SSL root certificates" : "שורש אישורי אבטחת SSL ",
+    "Encryption" : "הצפנה",
+    "None" : "כלום",
+    "Login" : "התחברות",
+    "Security Warning" : "אזהרת אבטחה",
+    "Setup Warning" : "שגיאת הגדרה",
+    "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
+    "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Sharing" : "שיתוף",
+    "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
+    "Allow resharing" : "לאפשר שיתוף מחדש",
+    "Security" : "אבטחה",
+    "Enforce HTTPS" : "לאלץ HTTPS",
+    "Server address" : "כתובת שרת",
+    "Port" : "פורט",
+    "Credentials" : "פרטי גישה",
+    "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>.",
+    "More apps" : "יישומים נוספים",
+    "by" : "על ידי",
+    "User Documentation" : "תיעוד משתמש",
+    "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" : "ססמה נוכחית",
+    "New password" : "ססמה חדשה",
+    "Change password" : "שינוי ססמה",
+    "Email" : "דואר אלקטרוני",
+    "Your email address" : "כתובת הדוא״ל שלך",
+    "Profile picture" : "תמונת פרופיל",
+    "Cancel" : "ביטול",
+    "Language" : "פה",
+    "Help translate" : "עזרה בתרגום",
+    "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
+    "Login Name" : "שם כניסה",
+    "Create" : "יצירה",
+    "Admin Recovery Password" : "ססמת השחזור של המנהל",
+    "Group" : "קבוצה",
+    "Default Quota" : "מכסת בררת המחדל",
+    "Unlimited" : "ללא הגבלה",
+    "Other" : "אחר",
+    "Username" : "שם משתמש",
+    "Quota" : "מכסה",
+    "set new password" : "הגדרת ססמה חדשה",
+    "Default" : "בררת מחדל"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
deleted file mode 100644
index 0e626c9059a..00000000000
--- a/settings/l10n/he.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "לא ניתן לעדכן את היישום.",
-"Saved" => "נשמר",
-"Email sent" => "הודעת הדוא״ל נשלחה",
-"All" => "הכל",
-"Please wait...." => "נא להמתין…",
-"Disable" => "בטל",
-"Enable" => "הפעלה",
-"Updating...." => "מתבצע עדכון…",
-"Error while updating app" => "אירעה שגיאה בעת עדכון היישום",
-"Updated" => "מעודכן",
-"Delete" => "מחיקה",
-"Groups" => "קבוצות",
-"undo" => "ביטול",
-"never" => "לעולם לא",
-"add group" => "הוספת קבוצה",
-"A valid username must be provided" => "יש לספק שם משתמש תקני",
-"Error creating user" => "יצירת המשתמש נכשלה",
-"A valid password must be provided" => "יש לספק ססמה תקנית",
-"__language_name__" => "עברית",
-"SSL root certificates" => "שורש אישורי אבטחת SSL ",
-"Encryption" => "הצפנה",
-"None" => "כלום",
-"Login" => "התחברות",
-"Security Warning" => "אזהרת אבטחה",
-"Setup Warning" => "שגיאת הגדרה",
-"Module 'fileinfo' missing" => "המודול „fileinfo“ חסר",
-"Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "יש להפעיל משימה אחת עם כל עמוד שנטען",
-"Sharing" => "שיתוף",
-"Allow apps to use the Share API" => "לאפשר ליישום להשתמש ב־API השיתוף",
-"Allow resharing" => "לאפשר שיתוף מחדש",
-"Security" => "אבטחה",
-"Enforce HTTPS" => "לאלץ HTTPS",
-"Server address" => "כתובת שרת",
-"Port" => "פורט",
-"Credentials" => "פרטי גישה",
-"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>.",
-"More apps" => "יישומים נוספים",
-"by" => "על ידי",
-"User Documentation" => "תיעוד משתמש",
-"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" => "ססמה נוכחית",
-"New password" => "ססמה חדשה",
-"Change password" => "שינוי ססמה",
-"Email" => "דואר אלקטרוני",
-"Your email address" => "כתובת הדוא״ל שלך",
-"Profile picture" => "תמונת פרופיל",
-"Cancel" => "ביטול",
-"Language" => "פה",
-"Help translate" => "עזרה בתרגום",
-"Import Root Certificate" => "ייבוא אישור אבטחת שורש",
-"Login Name" => "שם כניסה",
-"Create" => "יצירה",
-"Admin Recovery Password" => "ססמת השחזור של המנהל",
-"Group" => "קבוצה",
-"Default Quota" => "מכסת בררת המחדל",
-"Unlimited" => "ללא הגבלה",
-"Other" => "אחר",
-"Username" => "שם משתמש",
-"Quota" => "מכסה",
-"set new password" => "הגדרת ססמה חדשה",
-"Default" => "בררת מחדל"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hi.js b/settings/l10n/hi.js
new file mode 100644
index 00000000000..8a4b37ea206
--- /dev/null
+++ b/settings/l10n/hi.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "More" : "और अधिक",
+    "Password" : "पासवर्ड",
+    "New password" : "नया पासवर्ड",
+    "Cancel" : "रद्द करें ",
+    "Username" : "प्रयोक्ता का नाम"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hi.json b/settings/l10n/hi.json
new file mode 100644
index 00000000000..30207c79fe0
--- /dev/null
+++ b/settings/l10n/hi.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "More" : "और अधिक",
+    "Password" : "पासवर्ड",
+    "New password" : "नया पासवर्ड",
+    "Cancel" : "रद्द करें ",
+    "Username" : "प्रयोक्ता का नाम"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
deleted file mode 100644
index a328b3700aa..00000000000
--- a/settings/l10n/hi.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Email sent" => "ईमेल भेज दिया गया है ",
-"Security Warning" => "सुरक्षा चेतावनी ",
-"More" => "और अधिक",
-"Password" => "पासवर्ड",
-"New password" => "नया पासवर्ड",
-"Cancel" => "रद्द करें ",
-"Username" => "प्रयोक्ता का नाम"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
new file mode 100644
index 00000000000..8a39d4f4bd5
--- /dev/null
+++ b/settings/l10n/hr.js
@@ -0,0 +1,227 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktivirano",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
+    "Unable to change full name" : "Puno ime nije moguće promijeniti.",
+    "Group already exists" : "Grupa već postoji",
+    "Unable to add group" : "Grupu nije moguće dodati",
+    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
+    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't remove app." : "Nije moguće ukloniti app.",
+    "Email saved" : "E-pošta spremljena",
+    "Invalid email" : "E-pošta neispravna",
+    "Unable to delete group" : "Grupu nije moguće izbrisati",
+    "Unable to delete user" : "Korisnika nije moguće izbrisati",
+    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Language changed" : "Promjena jezika",
+    "Invalid request" : "Zahtjev neispravan",
+    "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
+    "Unable to add user to group %s" : "Dodavanje korisnika grupi %s nije moguće",
+    "Unable to remove user from group %s" : "Uklanjanje korisnika iz grupe %s nije moguće",
+    "Couldn't update app." : "Ažuriranje aplikacija nije moguće",
+    "Wrong password" : "Pogrešna lozinka",
+    "No user supplied" : "Nijedan korisnik nije dostavljen",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
+    "Unable to change password" : "Promjena lozinke nije moguća",
+    "Saved" : "Spremljeno",
+    "test email settings" : "Postavke za testiranje e-pošte",
+    "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
+    "Email sent" : "E-pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
+    "Add trusted domain" : "Dodajte pouzdanu domenu",
+    "Sending..." : "Slanje...",
+    "All" : "Sve",
+    "Please wait...." : "Molimo pričekajte...",
+    "Error while disabling app" : "Pogreška pri onemogućavanju app",
+    "Disable" : "Onemogućite",
+    "Enable" : "Omogućite",
+    "Error while enabling app" : "Pogreška pri omogućavanju app",
+    "Updating...." : "Ažuriranje...",
+    "Error while updating app" : "Pogreška pri ažuriranju app",
+    "Updated" : "Ažurirano",
+    "Uninstalling ...." : "Deinstaliranje....",
+    "Error while uninstalling app" : "Pogreška pri deinstaliranju app",
+    "Uninstall" : "Deinstalirajte",
+    "Select a profile picture" : "Odaberite sliku profila",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Izbrišite",
+    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
+    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
+    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
+    "Groups" : "Grupe",
+    "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
+    "Error creating group" : "Pogrešno kreiranje grupe",
+    "A valid group name must be provided" : "Nužno je navesti valjani naziv grupe",
+    "deleted {groupName}" : "izbrisana {groupName}",
+    "undo" : "poništite",
+    "never" : "nikad",
+    "deleted {userName}" : "izbrisano {userName}",
+    "add group" : "dodajte grupu",
+    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
+    "Error creating user" : "Pogrešno kreiranje korisnika",
+    "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
+    "__language_name__" : "__jezik_naziv___",
+    "SSL root certificates" : "SSL Root certifikati",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
+    "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
+    "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
+    "Errors and fatal issues" : "Pogreške i kobni problemi",
+    "Fatal issues only" : "Samo kobni problemi",
+    "None" : "Ništa",
+    "Login" : "Prijava",
+    "Plain" : "Čisti tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje 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šem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
+    "Setup Warning" : "Upozorenje programa za postavljanje",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
+    "Database Performance Info" : "Info o performansi baze podataka",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
+    "Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
+    "Your PHP version is outdated" : "Vaša verzija PHP je zastarjela",
+    "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." : "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
+    "PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
+    "Locale not working" : "Regionalna shema ne radi",
+    "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
+    "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
+    "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
+    "Cron was not executed yet!" : "Cron još nije izvršen!",
+    "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
+    "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
+    "Enforce password protection" : "Nametnite zaštitu lozinki",
+    "Allow public uploads" : "Dopustite javno učitavanje sadržaja",
+    "Set default expiration date" : "Postavite zadani datum isteka",
+    "Expire after " : "Istek nakon",
+    "days" : "dana",
+    "Enforce expiration date" : "Nametnite datum isteka",
+    "Allow resharing" : "Dopustite ponovno dijeljenje zajedničkih resursa",
+    "Restrict users to only share with users in their groups" : "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
+    "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
+    "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
+    "Security" : "Sigurnost",
+    "Enforce HTTPS" : "Nametnite HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
+    "Email Server" : "Poslužitelj e-pošte",
+    "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
+    "Send mode" : "Način rada za slanje",
+    "From address" : "S adrese",
+    "mail" : "pošta",
+    "Authentication method" : "Postupak autentikacije",
+    "Authentication required" : "Potrebna autentikacija",
+    "Server address" : "Adresa poslužitelja",
+    "Port" : "Priključak",
+    "Credentials" : "Vjerodajnice",
+    "SMTP Username" : "Korisničko ime SMTP",
+    "SMTP Password" : "Lozinka SMPT",
+    "Test email settings" : "Postavke za testnu e-poštu",
+    "Send email" : "Pošaljite e-poštu",
+    "Log" : "Zapisnik",
+    "Log level" : "Razina zapisnika",
+    "More" : "Više",
+    "Less" : "Manje",
+    "Version" : "Verzija",
+    "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>." : "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+    "by" : "od strane",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Korisnička dokumentacija",
+    "Admin Documentation" : "Admin dokumentacija",
+    "Enable only for specific groups" : "Omogućite samo za specifične grupe",
+    "Uninstall App" : "Deinstalirajte app",
+    "Administrator Documentation" : "Dokumentacija administratora",
+    "Online Documentation" : "Online dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komercijalna podrška",
+    "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
+    "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
+    "Password" : "Lozinka",
+    "Your password was changed" : "Vaša je lozinka promijenjena",
+    "Unable to change your password" : "Vašu lozinku nije moguće promijeniti",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Promijenite lozinku",
+    "Full Name" : "Puno ime",
+    "Email" : "E-pošta",
+    "Your email address" : "Vaša adresa e-pošte",
+    "Fill in an email address to enable password recovery and receive notifications" : "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Učitajte novu",
+    "Select new from Files" : "Odaberite novu iz datoteka",
+    "Remove image" : "Uklonite sliku",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
+    "Your avatar is provided by your original account." : "Vaš avatar je isporučen od strane vašeg izvornog računa",
+    "Cancel" : "Odustanite",
+    "Choose as profile image" : "Odaberite kao sliku profila",
+    "Language" : "Jezik",
+    "Help translate" : "Pomozite prevesti",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Uvoz Root certifikata",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
+    "Log-in password" : "Lozinka za prijavu",
+    "Decrypt all Files" : "Dešifrirajte sve datoteke",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
+    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
+    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
+    "Show storage location" : "Prikaži mjesto pohrane",
+    "Show last log in" : "Prikaži zadnje spajanje",
+    "Login Name" : "Ime za prijavu",
+    "Create" : "Kreirajte",
+    "Admin Recovery Password" : "Admin lozinka za oporavak",
+    "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
+    "Search Users and Groups" : "Pretražite korisnike i grupe",
+    "Add Group" : "Dodajte grupu",
+    "Group" : "Grupa",
+    "Everyone" : "Svi",
+    "Admins" : "Admins",
+    "Default Quota" : "Zadana kvota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
+    "Unlimited" : "Neograničeno",
+    "Other" : "Ostalo",
+    "Username" : "Korisničko ime",
+    "Quota" : "Kvota",
+    "Storage Location" : "Mjesto za spremanje",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "promijenite puno ime",
+    "set new password" : "postavite novu lozinku",
+    "Default" : "Zadano"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
new file mode 100644
index 00000000000..187f7a90c0f
--- /dev/null
+++ b/settings/l10n/hr.json
@@ -0,0 +1,225 @@
+{ "translations": {
+    "Enabled" : "Aktivirano",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
+    "Unable to change full name" : "Puno ime nije moguće promijeniti.",
+    "Group already exists" : "Grupa već postoji",
+    "Unable to add group" : "Grupu nije moguće dodati",
+    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
+    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't remove app." : "Nije moguće ukloniti app.",
+    "Email saved" : "E-pošta spremljena",
+    "Invalid email" : "E-pošta neispravna",
+    "Unable to delete group" : "Grupu nije moguće izbrisati",
+    "Unable to delete user" : "Korisnika nije moguće izbrisati",
+    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Language changed" : "Promjena jezika",
+    "Invalid request" : "Zahtjev neispravan",
+    "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
+    "Unable to add user to group %s" : "Dodavanje korisnika grupi %s nije moguće",
+    "Unable to remove user from group %s" : "Uklanjanje korisnika iz grupe %s nije moguće",
+    "Couldn't update app." : "Ažuriranje aplikacija nije moguće",
+    "Wrong password" : "Pogrešna lozinka",
+    "No user supplied" : "Nijedan korisnik nije dostavljen",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
+    "Unable to change password" : "Promjena lozinke nije moguća",
+    "Saved" : "Spremljeno",
+    "test email settings" : "Postavke za testiranje e-pošte",
+    "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
+    "Email sent" : "E-pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
+    "Add trusted domain" : "Dodajte pouzdanu domenu",
+    "Sending..." : "Slanje...",
+    "All" : "Sve",
+    "Please wait...." : "Molimo pričekajte...",
+    "Error while disabling app" : "Pogreška pri onemogućavanju app",
+    "Disable" : "Onemogućite",
+    "Enable" : "Omogućite",
+    "Error while enabling app" : "Pogreška pri omogućavanju app",
+    "Updating...." : "Ažuriranje...",
+    "Error while updating app" : "Pogreška pri ažuriranju app",
+    "Updated" : "Ažurirano",
+    "Uninstalling ...." : "Deinstaliranje....",
+    "Error while uninstalling app" : "Pogreška pri deinstaliranju app",
+    "Uninstall" : "Deinstalirajte",
+    "Select a profile picture" : "Odaberite sliku profila",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Izbrišite",
+    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
+    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
+    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
+    "Groups" : "Grupe",
+    "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
+    "Error creating group" : "Pogrešno kreiranje grupe",
+    "A valid group name must be provided" : "Nužno je navesti valjani naziv grupe",
+    "deleted {groupName}" : "izbrisana {groupName}",
+    "undo" : "poništite",
+    "never" : "nikad",
+    "deleted {userName}" : "izbrisano {userName}",
+    "add group" : "dodajte grupu",
+    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
+    "Error creating user" : "Pogrešno kreiranje korisnika",
+    "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
+    "__language_name__" : "__jezik_naziv___",
+    "SSL root certificates" : "SSL Root certifikati",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
+    "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
+    "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
+    "Errors and fatal issues" : "Pogreške i kobni problemi",
+    "Fatal issues only" : "Samo kobni problemi",
+    "None" : "Ništa",
+    "Login" : "Prijava",
+    "Plain" : "Čisti tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje 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šem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
+    "Setup Warning" : "Upozorenje programa za postavljanje",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
+    "Database Performance Info" : "Info o performansi baze podataka",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
+    "Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
+    "Your PHP version is outdated" : "Vaša verzija PHP je zastarjela",
+    "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." : "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
+    "PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
+    "Locale not working" : "Regionalna shema ne radi",
+    "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
+    "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
+    "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
+    "Cron was not executed yet!" : "Cron još nije izvršen!",
+    "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
+    "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
+    "Enforce password protection" : "Nametnite zaštitu lozinki",
+    "Allow public uploads" : "Dopustite javno učitavanje sadržaja",
+    "Set default expiration date" : "Postavite zadani datum isteka",
+    "Expire after " : "Istek nakon",
+    "days" : "dana",
+    "Enforce expiration date" : "Nametnite datum isteka",
+    "Allow resharing" : "Dopustite ponovno dijeljenje zajedničkih resursa",
+    "Restrict users to only share with users in their groups" : "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
+    "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
+    "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
+    "Security" : "Sigurnost",
+    "Enforce HTTPS" : "Nametnite HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
+    "Email Server" : "Poslužitelj e-pošte",
+    "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
+    "Send mode" : "Način rada za slanje",
+    "From address" : "S adrese",
+    "mail" : "pošta",
+    "Authentication method" : "Postupak autentikacije",
+    "Authentication required" : "Potrebna autentikacija",
+    "Server address" : "Adresa poslužitelja",
+    "Port" : "Priključak",
+    "Credentials" : "Vjerodajnice",
+    "SMTP Username" : "Korisničko ime SMTP",
+    "SMTP Password" : "Lozinka SMPT",
+    "Test email settings" : "Postavke za testnu e-poštu",
+    "Send email" : "Pošaljite e-poštu",
+    "Log" : "Zapisnik",
+    "Log level" : "Razina zapisnika",
+    "More" : "Više",
+    "Less" : "Manje",
+    "Version" : "Verzija",
+    "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>." : "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+    "by" : "od strane",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Korisnička dokumentacija",
+    "Admin Documentation" : "Admin dokumentacija",
+    "Enable only for specific groups" : "Omogućite samo za specifične grupe",
+    "Uninstall App" : "Deinstalirajte app",
+    "Administrator Documentation" : "Dokumentacija administratora",
+    "Online Documentation" : "Online dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komercijalna podrška",
+    "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
+    "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
+    "Password" : "Lozinka",
+    "Your password was changed" : "Vaša je lozinka promijenjena",
+    "Unable to change your password" : "Vašu lozinku nije moguće promijeniti",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Promijenite lozinku",
+    "Full Name" : "Puno ime",
+    "Email" : "E-pošta",
+    "Your email address" : "Vaša adresa e-pošte",
+    "Fill in an email address to enable password recovery and receive notifications" : "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Učitajte novu",
+    "Select new from Files" : "Odaberite novu iz datoteka",
+    "Remove image" : "Uklonite sliku",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
+    "Your avatar is provided by your original account." : "Vaš avatar je isporučen od strane vašeg izvornog računa",
+    "Cancel" : "Odustanite",
+    "Choose as profile image" : "Odaberite kao sliku profila",
+    "Language" : "Jezik",
+    "Help translate" : "Pomozite prevesti",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Uvoz Root certifikata",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
+    "Log-in password" : "Lozinka za prijavu",
+    "Decrypt all Files" : "Dešifrirajte sve datoteke",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
+    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
+    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
+    "Show storage location" : "Prikaži mjesto pohrane",
+    "Show last log in" : "Prikaži zadnje spajanje",
+    "Login Name" : "Ime za prijavu",
+    "Create" : "Kreirajte",
+    "Admin Recovery Password" : "Admin lozinka za oporavak",
+    "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
+    "Search Users and Groups" : "Pretražite korisnike i grupe",
+    "Add Group" : "Dodajte grupu",
+    "Group" : "Grupa",
+    "Everyone" : "Svi",
+    "Admins" : "Admins",
+    "Default Quota" : "Zadana kvota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
+    "Unlimited" : "Neograničeno",
+    "Other" : "Ostalo",
+    "Username" : "Korisničko ime",
+    "Quota" : "Kvota",
+    "Storage Location" : "Mjesto za spremanje",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "promijenite puno ime",
+    "set new password" : "postavite novu lozinku",
+    "Default" : "Zadano"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
deleted file mode 100644
index 1c6e178abdd..00000000000
--- a/settings/l10n/hr.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktivirano",
-"Authentication error" => "Pogrešna autentikacija",
-"Your full name has been changed." => "Vaše puno ime je promijenjeno.",
-"Unable to change full name" => "Puno ime nije moguće promijeniti.",
-"Group already exists" => "Grupa već postoji",
-"Unable to add group" => "Grupu nije moguće dodati",
-"Files decrypted successfully" => "Datoteke uspješno dešifrirane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Couldn't decrypt your files, check your password and try again" => "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
-"Encryption keys deleted permanently" => "Ključevi za šifriranje trajno izbrisani",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Couldn't remove app." => "Nije moguće ukloniti app.",
-"Email saved" => "E-pošta spremljena",
-"Invalid email" => "E-pošta neispravna",
-"Unable to delete group" => "Grupu nije moguće izbrisati",
-"Unable to delete user" => "Korisnika nije moguće izbrisati",
-"Backups restored successfully" => "Sigurnosne kopije uspješno obnovljene",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Language changed" => "Promjena jezika",
-"Invalid request" => "Zahtjev neispravan",
-"Admins can't remove themself from the admin group" => "Administratori ne mogu sami sebe ukloniti iz admin grupe",
-"Unable to add user to group %s" => "Dodavanje korisnika grupi %s nije moguće",
-"Unable to remove user from group %s" => "Uklanjanje korisnika iz grupe %s nije moguće",
-"Couldn't update app." => "Ažuriranje aplikacija nije moguće",
-"Wrong password" => "Pogrešna lozinka",
-"No user supplied" => "Nijedan korisnik nije dostavljen",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
-"Wrong admin recovery password. Please check the password and try again." => "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
-"Unable to change password" => "Promjena lozinke nije moguća",
-"Saved" => "Spremljeno",
-"test email settings" => "Postavke za testiranje e-pošte",
-"If you received this email, the settings seem to be correct." => "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
-"Email sent" => "E-pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
-"Add trusted domain" => "Dodajte pouzdanu domenu",
-"Sending..." => "Slanje...",
-"All" => "Sve",
-"Please wait...." => "Molimo pričekajte...",
-"Error while disabling app" => "Pogreška pri onemogućavanju app",
-"Disable" => "Onemogućite",
-"Enable" => "Omogućite",
-"Error while enabling app" => "Pogreška pri omogućavanju app",
-"Updating...." => "Ažuriranje...",
-"Error while updating app" => "Pogreška pri ažuriranju app",
-"Updated" => "Ažurirano",
-"Uninstalling ...." => "Deinstaliranje....",
-"Error while uninstalling app" => "Pogreška pri deinstaliranju app",
-"Uninstall" => "Deinstalirajte",
-"Select a profile picture" => "Odaberite sliku profila",
-"Very weak password" => "Lozinka vrlo slaba",
-"Weak password" => "Lozinka slaba",
-"So-so password" => "Lozinka tako-tako",
-"Good password" => "Lozinka dobra",
-"Strong password" => "Lozinka snažna",
-"Valid until {date}" => "Valid until {date}",
-"Delete" => "Izbrišite",
-"Decrypting files... Please wait, this can take some time." => "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
-"Delete encryption keys permanently." => "Trajno izbrišite ključeve za šifriranje",
-"Restore encryption keys." => "Obnovite ključeve za šifriranje",
-"Groups" => "Grupe",
-"Unable to delete {objName}" => "Nije moguće izbrisati {objName}",
-"Error creating group" => "Pogrešno kreiranje grupe",
-"A valid group name must be provided" => "Nužno je navesti valjani naziv grupe",
-"deleted {groupName}" => "izbrisana {groupName}",
-"undo" => "poništite",
-"never" => "nikad",
-"deleted {userName}" => "izbrisano {userName}",
-"add group" => "dodajte grupu",
-"A valid username must be provided" => "Nužno je navesti valjano korisničko ime",
-"Error creating user" => "Pogrešno kreiranje korisnika",
-"A valid password must be provided" => "Nužno je navesti valjanu lozinku",
-"Warning: Home directory for user \"{user}\" already exists" => "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
-"__language_name__" => "__jezik_naziv___",
-"SSL root certificates" => "SSL Root certifikati",
-"Encryption" => "Šifriranje",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
-"Info, warnings, errors and fatal issues" => "Informacije, upozorenja, pogreške i kobni problemi",
-"Warnings, errors and fatal issues" => "Upozorenja, pogreške i kobni problemi",
-"Errors and fatal issues" => "Pogreške i kobni problemi",
-"Fatal issues only" => "Samo kobni problemi",
-"None" => "Ništa",
-"Login" => "Prijava",
-"Plain" => "Čisti tekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sigurnosno upozorenje",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje 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šem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
-"Setup Warning" => "Upozorenje programa za postavljanje",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
-"Database Performance Info" => "Info o performansi baze podataka",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
-"Module 'fileinfo' missing" => "Nedostaje modul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
-"Your PHP version is outdated" => "Vaša verzija PHP je zastarjela",
-"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." => "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
-"PHP charset is not set to UTF-8" => "PHP Charset nije postavljen na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
-"Locale not working" => "Regionalna shema ne radi",
-"System locale can not be set to a one which supports UTF-8." => "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
-"URL generation in notification emails" => "Generiranje URL-a u notifikacijskoj e-pošti",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
-"Please double check the <a href='%s'>installation guides</a>." => "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Zadnji cron je izvršen na %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
-"Cron was not executed yet!" => "Cron još nije izvršen!",
-"Execute one task with each page loaded" => "Izvršite jedan zadatak sa svakom učitanom stranicom",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
-"Sharing" => "Dijeljenje zajedničkih resursa",
-"Allow apps to use the Share API" => "Dopustite apps korištenje Share API",
-"Allow users to share via link" => "Dopustite korisnicia dijeljenje putem veze",
-"Enforce password protection" => "Nametnite zaštitu lozinki",
-"Allow public uploads" => "Dopustite javno učitavanje sadržaja",
-"Set default expiration date" => "Postavite zadani datum isteka",
-"Expire after " => "Istek nakon",
-"days" => "dana",
-"Enforce expiration date" => "Nametnite datum isteka",
-"Allow resharing" => "Dopustite ponovno dijeljenje zajedničkih resursa",
-"Restrict users to only share with users in their groups" => "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
-"Allow users to send mail notification for shared files" => "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
-"Exclude groups from sharing" => "Isključite grupe iz dijeljenja zajedničkih resursa",
-"These groups will still be able to receive shares, but not to initiate them." => "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
-"Security" => "Sigurnost",
-"Enforce HTTPS" => "Nametnite HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
-"Email Server" => "Poslužitelj e-pošte",
-"This is used for sending out notifications." => "Ovo se koristi za slanje notifikacija.",
-"Send mode" => "Način rada za slanje",
-"From address" => "S adrese",
-"mail" => "pošta",
-"Authentication method" => "Postupak autentikacije",
-"Authentication required" => "Potrebna autentikacija",
-"Server address" => "Adresa poslužitelja",
-"Port" => "Priključak",
-"Credentials" => "Vjerodajnice",
-"SMTP Username" => "Korisničko ime SMTP",
-"SMTP Password" => "Lozinka SMPT",
-"Test email settings" => "Postavke za testnu e-poštu",
-"Send email" => "Pošaljite e-poštu",
-"Log" => "Zapisnik",
-"Log level" => "Razina zapisnika",
-"More" => "Više",
-"Less" => "Manje",
-"Version" => "Verzija",
-"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>." => "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
-"by" => "od strane",
-"Documentation:" => "Dokumentacija:",
-"User Documentation" => "Korisnička dokumentacija",
-"Admin Documentation" => "Admin dokumentacija",
-"Enable only for specific groups" => "Omogućite samo za specifične grupe",
-"Uninstall App" => "Deinstalirajte app",
-"Administrator Documentation" => "Dokumentacija administratora",
-"Online Documentation" => "Online dokumentacija",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Komercijalna podrška",
-"Get the apps to sync your files" => "Koristite aplikacije za sinkronizaciju svojih datoteka",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
-"Show First Run Wizard again" => "Opet pokažite First Run Wizard",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
-"Password" => "Lozinka",
-"Your password was changed" => "Vaša je lozinka promijenjena",
-"Unable to change your password" => "Vašu lozinku nije moguće promijeniti",
-"Current password" => "Trenutna lozinka",
-"New password" => "Nova lozinka",
-"Change password" => "Promijenite lozinku",
-"Full Name" => "Puno ime",
-"Email" => "E-pošta",
-"Your email address" => "Vaša adresa e-pošte",
-"Fill in an email address to enable password recovery and receive notifications" => "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
-"Profile picture" => "Slika profila",
-"Upload new" => "Učitajte novu",
-"Select new from Files" => "Odaberite novu iz datoteka",
-"Remove image" => "Uklonite sliku",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
-"Your avatar is provided by your original account." => "Vaš avatar je isporučen od strane vašeg izvornog računa",
-"Cancel" => "Odustanite",
-"Choose as profile image" => "Odaberite kao sliku profila",
-"Language" => "Jezik",
-"Help translate" => "Pomozite prevesti",
-"Common Name" => "Common Name",
-"Valid until" => "Valid until",
-"Issued By" => "Issued By",
-"Valid until %s" => "Valid until %s",
-"Import Root Certificate" => "Uvoz Root certifikata",
-"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
-"Log-in password" => "Lozinka za prijavu",
-"Decrypt all Files" => "Dešifrirajte sve datoteke",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
-"Restore Encryption Keys" => "Obnovite ključeve za šifriranje",
-"Delete Encryption Keys" => "Izbrišite ključeve za šifriranje",
-"Show storage location" => "Prikaži mjesto pohrane",
-"Show last log in" => "Prikaži zadnje spajanje",
-"Login Name" => "Ime za prijavu",
-"Create" => "Kreirajte",
-"Admin Recovery Password" => "Admin lozinka za oporavak",
-"Enter the recovery password in order to recover the users files during password change" => "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
-"Search Users and Groups" => "Pretražite korisnike i grupe",
-"Add Group" => "Dodajte grupu",
-"Group" => "Grupa",
-"Everyone" => "Svi",
-"Admins" => "Admins",
-"Default Quota" => "Zadana kvota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
-"Unlimited" => "Neograničeno",
-"Other" => "Ostalo",
-"Username" => "Korisničko ime",
-"Quota" => "Kvota",
-"Storage Location" => "Mjesto za spremanje",
-"Last Login" => "Zadnja prijava",
-"change full name" => "promijenite puno ime",
-"set new password" => "postavite novu lozinku",
-"Default" => "Zadano"
-);
-$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
new file mode 100644
index 00000000000..bc8aa694060
--- /dev/null
+++ b/settings/l10n/hu_HU.js
@@ -0,0 +1,221 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
+    "Authentication error" : "Azonosítási hiba",
+    "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
+    "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
+    "Group already exists" : "A csoport már létezik",
+    "Unable to add group" : "A csoport nem hozható létre",
+    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
+    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
+    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
+    "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
+    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid email" : "Hibás e-mail",
+    "Unable to delete group" : "A csoport nem törölhető",
+    "Unable to delete user" : "A felhasználó nem törölhető",
+    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
+    "Language changed" : "A nyelv megváltozott",
+    "Invalid request" : "Érvénytelen kérés",
+    "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
+    "Unable to add user to group %s" : "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
+    "Unable to remove user from group %s" : "A felhasználó nem távolítható el ebből a csoportból: %s",
+    "Couldn't update app." : "A program frissítése nem sikerült.",
+    "Wrong password" : "Hibás jelszó",
+    "No user supplied" : "Nincs megadva felhasználó",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
+    "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
+    "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
+    "Saved" : "Elmentve",
+    "test email settings" : "e-mail beállítások ellenőrzése",
+    "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
+    "Email sent" : "Az e-mailt elküldtük",
+    "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
+    "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Sending..." : "Küldés...",
+    "All" : "Mind",
+    "Please wait...." : "Kérem várjon...",
+    "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
+    "Disable" : "Letiltás",
+    "Enable" : "Engedélyezés",
+    "Error while enabling app" : "Hiba az alkalmazás engedélyezése közben",
+    "Updating...." : "Frissítés folyamatban...",
+    "Error while updating app" : "Hiba történt az alkalmazás frissítése közben",
+    "Updated" : "Frissítve",
+    "Uninstalling ...." : "Eltávolítás ...",
+    "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
+    "Uninstall" : "Eltávolítás",
+    "Select a profile picture" : "Válasszon profilképet!",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Delete" : "Törlés",
+    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
+    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
+    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
+    "Groups" : "Csoportok",
+    "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
+    "Error creating group" : "Hiba történt a csoport létrehozása közben",
+    "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
+    "deleted {groupName}" : "törölve: {groupName}",
+    "undo" : "visszavonás",
+    "never" : "soha",
+    "deleted {userName}" : "törölve: {userName}",
+    "add group" : "csoport hozzáadása",
+    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
+    "Error creating user" : "A felhasználó nem hozható létre",
+    "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "Warning: Home directory for user \"{user}\" already exists" : "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL tanúsítványok",
+    "Encryption" : "Titkosítás",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "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" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
+    "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.",
+    "Setup Warning" : "A beállítással kapcsolatos figyelmeztetés",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
+    "Database Performance Info" : "Információ az adatbázis teljesítményéről",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
+    "Your PHP version is outdated" : "A PHP verzió túl régi",
+    "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." : "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
+    "PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
+    "Locale not working" : "A nyelvi lokalizáció nem működik",
+    "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
+    "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Sharing" : "Megosztás",
+    "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
+    "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
+    "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
+    "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
+    "Set default expiration date" : "Alapértelmezett lejárati idő beállítása",
+    "Expire after " : "A lejárat legyen",
+    "days" : "nap",
+    "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
+    "Allow resharing" : "A megosztás továbbadásának engedélyezése",
+    "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttéről",
+    "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
+    "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Security" : "Biztonság",
+    "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, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
+    "Email Server" : "E-mail kiszolgáló",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Log" : "Naplózás",
+    "Log level" : "Naplózási szint",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "Version" : "Verzió",
+    "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 programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
+    "by" : "közreadta:",
+    "Documentation:" : "Leírások:",
+    "User Documentation" : "Felhasználói leírás",
+    "Admin Documentation" : "Adminisztrátori leírás",
+    "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
+    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Administrator Documentation" : "Üzemeltetői leírás",
+    "Online Documentation" : "Online leírás",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Hibabejelentések",
+    "Commercial Support" : "Megvásárolható támogatás",
+    "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
+    "Password" : "Jelszó",
+    "Your password was changed" : "A jelszava megváltozott",
+    "Unable to change your password" : "A jelszó nem változtatható meg",
+    "Current password" : "A jelenlegi jelszó",
+    "New password" : "Az új jelszó",
+    "Change password" : "A jelszó megváltoztatása",
+    "Full Name" : "Teljes név",
+    "Email" : "E-mail",
+    "Your email address" : "Az Ön e-mail címe",
+    "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "Profile picture" : "Profilkép",
+    "Upload new" : "Új feltöltése",
+    "Select new from Files" : "Új kiválasztása a Fájlokból",
+    "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
+    "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
+    "Cancel" : "Mégsem",
+    "Choose as profile image" : "Válasszuk ki profilképnek",
+    "Language" : "Nyelv",
+    "Help translate" : "Segítsen a fordításban!",
+    "Import Root Certificate" : "SSL tanúsítványok importálása",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
+    "Log-in password" : "Bejelentkezési jelszó",
+    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
+    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
+    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
+    "Login Name" : "Bejelentkezési név",
+    "Create" : "Létrehozás",
+    "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
+    "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
+    "Add Group" : "Csoport létrehozása",
+    "Group" : "Csoport",
+    "Everyone" : "Mindenki",
+    "Admins" : "Adminok",
+    "Default Quota" : "Alapértelmezett kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
+    "Unlimited" : "Korlátlan",
+    "Other" : "Más",
+    "Username" : "Felhasználónév",
+    "Quota" : "Kvóta",
+    "Storage Location" : "A háttértár helye",
+    "Last Login" : "Utolsó bejelentkezés",
+    "change full name" : "a teljes név megváltoztatása",
+    "set new password" : "új jelszó beállítása",
+    "Default" : "Alapértelmezett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
new file mode 100644
index 00000000000..83e38d98f5a
--- /dev/null
+++ b/settings/l10n/hu_HU.json
@@ -0,0 +1,219 @@
+{ "translations": {
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
+    "Authentication error" : "Azonosítási hiba",
+    "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
+    "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
+    "Group already exists" : "A csoport már létezik",
+    "Unable to add group" : "A csoport nem hozható létre",
+    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
+    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
+    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
+    "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
+    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid email" : "Hibás e-mail",
+    "Unable to delete group" : "A csoport nem törölhető",
+    "Unable to delete user" : "A felhasználó nem törölhető",
+    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
+    "Language changed" : "A nyelv megváltozott",
+    "Invalid request" : "Érvénytelen kérés",
+    "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
+    "Unable to add user to group %s" : "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
+    "Unable to remove user from group %s" : "A felhasználó nem távolítható el ebből a csoportból: %s",
+    "Couldn't update app." : "A program frissítése nem sikerült.",
+    "Wrong password" : "Hibás jelszó",
+    "No user supplied" : "Nincs megadva felhasználó",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
+    "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
+    "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
+    "Saved" : "Elmentve",
+    "test email settings" : "e-mail beállítások ellenőrzése",
+    "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
+    "Email sent" : "Az e-mailt elküldtük",
+    "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
+    "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Sending..." : "Küldés...",
+    "All" : "Mind",
+    "Please wait...." : "Kérem várjon...",
+    "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
+    "Disable" : "Letiltás",
+    "Enable" : "Engedélyezés",
+    "Error while enabling app" : "Hiba az alkalmazás engedélyezése közben",
+    "Updating...." : "Frissítés folyamatban...",
+    "Error while updating app" : "Hiba történt az alkalmazás frissítése közben",
+    "Updated" : "Frissítve",
+    "Uninstalling ...." : "Eltávolítás ...",
+    "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
+    "Uninstall" : "Eltávolítás",
+    "Select a profile picture" : "Válasszon profilképet!",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Delete" : "Törlés",
+    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
+    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
+    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
+    "Groups" : "Csoportok",
+    "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
+    "Error creating group" : "Hiba történt a csoport létrehozása közben",
+    "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
+    "deleted {groupName}" : "törölve: {groupName}",
+    "undo" : "visszavonás",
+    "never" : "soha",
+    "deleted {userName}" : "törölve: {userName}",
+    "add group" : "csoport hozzáadása",
+    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
+    "Error creating user" : "A felhasználó nem hozható létre",
+    "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "Warning: Home directory for user \"{user}\" already exists" : "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL tanúsítványok",
+    "Encryption" : "Titkosítás",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "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" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
+    "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.",
+    "Setup Warning" : "A beállítással kapcsolatos figyelmeztetés",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
+    "Database Performance Info" : "Információ az adatbázis teljesítményéről",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
+    "Your PHP version is outdated" : "A PHP verzió túl régi",
+    "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." : "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
+    "PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
+    "Locale not working" : "A nyelvi lokalizáció nem működik",
+    "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
+    "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Sharing" : "Megosztás",
+    "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
+    "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
+    "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
+    "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
+    "Set default expiration date" : "Alapértelmezett lejárati idő beállítása",
+    "Expire after " : "A lejárat legyen",
+    "days" : "nap",
+    "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
+    "Allow resharing" : "A megosztás továbbadásának engedélyezése",
+    "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttéről",
+    "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
+    "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Security" : "Biztonság",
+    "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, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
+    "Email Server" : "E-mail kiszolgáló",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Log" : "Naplózás",
+    "Log level" : "Naplózási szint",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "Version" : "Verzió",
+    "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 programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
+    "by" : "közreadta:",
+    "Documentation:" : "Leírások:",
+    "User Documentation" : "Felhasználói leírás",
+    "Admin Documentation" : "Adminisztrátori leírás",
+    "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
+    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Administrator Documentation" : "Üzemeltetői leírás",
+    "Online Documentation" : "Online leírás",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Hibabejelentések",
+    "Commercial Support" : "Megvásárolható támogatás",
+    "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
+    "Password" : "Jelszó",
+    "Your password was changed" : "A jelszava megváltozott",
+    "Unable to change your password" : "A jelszó nem változtatható meg",
+    "Current password" : "A jelenlegi jelszó",
+    "New password" : "Az új jelszó",
+    "Change password" : "A jelszó megváltoztatása",
+    "Full Name" : "Teljes név",
+    "Email" : "E-mail",
+    "Your email address" : "Az Ön e-mail címe",
+    "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "Profile picture" : "Profilkép",
+    "Upload new" : "Új feltöltése",
+    "Select new from Files" : "Új kiválasztása a Fájlokból",
+    "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
+    "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
+    "Cancel" : "Mégsem",
+    "Choose as profile image" : "Válasszuk ki profilképnek",
+    "Language" : "Nyelv",
+    "Help translate" : "Segítsen a fordításban!",
+    "Import Root Certificate" : "SSL tanúsítványok importálása",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
+    "Log-in password" : "Bejelentkezési jelszó",
+    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
+    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
+    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
+    "Login Name" : "Bejelentkezési név",
+    "Create" : "Létrehozás",
+    "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
+    "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
+    "Add Group" : "Csoport létrehozása",
+    "Group" : "Csoport",
+    "Everyone" : "Mindenki",
+    "Admins" : "Adminok",
+    "Default Quota" : "Alapértelmezett kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
+    "Unlimited" : "Korlátlan",
+    "Other" : "Más",
+    "Username" : "Felhasználónév",
+    "Quota" : "Kvóta",
+    "Storage Location" : "A háttértár helye",
+    "Last Login" : "Utolsó bejelentkezés",
+    "change full name" : "a teljes név megváltoztatása",
+    "set new password" : "új jelszó beállítása",
+    "Default" : "Alapértelmezett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
deleted file mode 100644
index 9049326a12a..00000000000
--- a/settings/l10n/hu_HU.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Bekapcsolva",
-"Recommended" => "Ajánlott",
-"Authentication error" => "Azonosítási hiba",
-"Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
-"Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
-"Group already exists" => "A csoport már létezik",
-"Unable to add group" => "A csoport nem hozható létre",
-"Files decrypted successfully" => "A fájlok titkosítását sikeresen megszüntettük.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
-"Couldn't decrypt your files, check your password and try again" => "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
-"Encryption keys deleted permanently" => "A titkosítási kulcsait véglegesen töröltük.",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
-"Couldn't remove app." => "Az alkalmazást nem sikerült eltávolítani.",
-"Email saved" => "Elmentettük az e-mail címet",
-"Invalid email" => "Hibás e-mail",
-"Unable to delete group" => "A csoport nem törölhető",
-"Unable to delete user" => "A felhasználó nem törölhető",
-"Backups restored successfully" => "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
-"Language changed" => "A nyelv megváltozott",
-"Invalid request" => "Érvénytelen kérés",
-"Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
-"Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
-"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
-"Couldn't update app." => "A program frissítése nem sikerült.",
-"Wrong password" => "Hibás jelszó",
-"No user supplied" => "Nincs megadva felhasználó",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
-"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
-"Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
-"Saved" => "Elmentve",
-"test email settings" => "e-mail beállítások ellenőrzése",
-"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
-"Email sent" => "Az e-mailt elküldtük",
-"You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
-"Add trusted domain" => "Megbízható tartomány hozzáadása",
-"Sending..." => "Küldés...",
-"All" => "Mind",
-"Please wait...." => "Kérem várjon...",
-"Error while disabling app" => "Hiba az alkalmazás letiltása közben",
-"Disable" => "Letiltás",
-"Enable" => "Engedélyezés",
-"Error while enabling app" => "Hiba az alkalmazás engedélyezése közben",
-"Updating...." => "Frissítés folyamatban...",
-"Error while updating app" => "Hiba történt az alkalmazás frissítése közben",
-"Updated" => "Frissítve",
-"Uninstalling ...." => "Eltávolítás ...",
-"Error while uninstalling app" => "Hiba történt az alkalmazás eltávolítása közben",
-"Uninstall" => "Eltávolítás",
-"Select a profile picture" => "Válasszon profilképet!",
-"Very weak password" => "Nagyon gyenge jelszó",
-"Weak password" => "Gyenge jelszó",
-"So-so password" => "Nem túl jó jelszó",
-"Good password" => "Jó jelszó",
-"Strong password" => "Erős jelszó",
-"Delete" => "Törlés",
-"Decrypting files... Please wait, this can take some time." => "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
-"Delete encryption keys permanently." => "A tikosítási kulcsok végleges törlése.",
-"Restore encryption keys." => "A titkosítási kulcsok visszaállítása.",
-"Groups" => "Csoportok",
-"Unable to delete {objName}" => "Ezt nem sikerült törölni: {objName}",
-"Error creating group" => "Hiba történt a csoport létrehozása közben",
-"A valid group name must be provided" => "Érvényes csoportnevet kell megadni",
-"deleted {groupName}" => "törölve: {groupName}",
-"undo" => "visszavonás",
-"never" => "soha",
-"deleted {userName}" => "törölve: {userName}",
-"add group" => "csoport hozzáadása",
-"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
-"Error creating user" => "A felhasználó nem hozható létre",
-"A valid password must be provided" => "Érvényes jelszót kell megadnia",
-"Warning: Home directory for user \"{user}\" already exists" => "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL tanúsítványok",
-"Encryption" => "Titkosítás",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
-"Info, warnings, errors and fatal issues" => "Információk, figyelmeztetések, hibák és végzetes hibák",
-"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" => "Login",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Biztonsági figyelmeztetés",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
-"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.",
-"Setup Warning" => "A beállítással kapcsolatos figyelmeztetés",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
-"Database Performance Info" => "Információ az adatbázis teljesítményéről",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
-"Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
-"Your PHP version is outdated" => "A PHP verzió túl régi",
-"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." => "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
-"PHP charset is not set to UTF-8" => "A PHP-karakterkészlet nem UTF-8-ra van állítva",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
-"Locale not working" => "A nyelvi lokalizáció nem működik",
-"System locale can not be set to a one which supports UTF-8." => "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
-"This means that there might be problems with certain characters in file names." => "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
-"URL generation in notification emails" => "URL-képzés az értesítő e-mailekben",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
-"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
-"Cron" => "Ütemezett feladatok",
-"Last cron was executed at %s." => "Az utolsó cron feladat ekkor futott le: %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
-"Cron was not executed yet!" => "A cron feladat még nem futott le!",
-"Execute one task with each page loaded" => "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-"Sharing" => "Megosztás",
-"Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
-"Allow users to share via link" => "Engedjük meg az állományok linkekkel történő megosztását",
-"Enforce password protection" => "Legyen kötelező a linkek jelszóval való védelme",
-"Allow public uploads" => "Nyilvános feltöltés engedélyezése",
-"Set default expiration date" => "Alapértelmezett lejárati idő beállítása",
-"Expire after " => "A lejárat legyen",
-"days" => "nap",
-"Enforce expiration date" => "A beállított lejárati idő legyen kötelezően érvényes",
-"Allow resharing" => "A megosztás továbbadásának engedélyezése",
-"Restrict users to only share with users in their groups" => "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
-"Allow users to send mail notification for shared files" => "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttéről",
-"Exclude groups from sharing" => "Csoportok megosztási jogának tiltása",
-"These groups will still be able to receive shares, but not to initiate them." => "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
-"Security" => "Biztonság",
-"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, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
-"Email Server" => "E-mail kiszolgáló",
-"This is used for sending out notifications." => "Ezt használjuk a jelentések kiküldésére.",
-"Send mode" => "Küldési mód",
-"From address" => "A feladó címe",
-"mail" => "mail",
-"Authentication method" => "A felhasználóazonosítás módszere",
-"Authentication required" => "Felhasználóazonosítás szükséges",
-"Server address" => "A kiszolgáló címe",
-"Port" => "Port",
-"Credentials" => "Azonosítók",
-"SMTP Username" => "SMTP felhasználónév",
-"SMTP Password" => "SMTP jelszó",
-"Test email settings" => "Az e-mail beállítások ellenőrzése",
-"Send email" => "E-mail küldése",
-"Log" => "Naplózás",
-"Log level" => "Naplózási szint",
-"More" => "Több",
-"Less" => "Kevesebb",
-"Version" => "Verzió",
-"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 programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
-"by" => "közreadta:",
-"Documentation:" => "Leírások:",
-"User Documentation" => "Felhasználói leírás",
-"Admin Documentation" => "Adminisztrátori leírás",
-"Enable only for specific groups" => "Csak bizonyos csoportok számára tegyük elérhetővé",
-"Uninstall App" => "Az alkalmazás eltávolítása",
-"Administrator Documentation" => "Üzemeltetői leírás",
-"Online Documentation" => "Online leírás",
-"Forum" => "Fórum",
-"Bugtracker" => "Hibabejelentések",
-"Commercial Support" => "Megvásárolható támogatás",
-"Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat!",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
-"Show First Run Wizard again" => "Nézzük meg újra az első bejelentkezéskori segítséget!",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
-"Password" => "Jelszó",
-"Your password was changed" => "A jelszava megváltozott",
-"Unable to change your password" => "A jelszó nem változtatható meg",
-"Current password" => "A jelenlegi jelszó",
-"New password" => "Az új jelszó",
-"Change password" => "A jelszó megváltoztatása",
-"Full Name" => "Teljes név",
-"Email" => "E-mail",
-"Your email address" => "Az Ön e-mail címe",
-"Fill in an email address to enable password recovery and receive notifications" => "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
-"Profile picture" => "Profilkép",
-"Upload new" => "Új feltöltése",
-"Select new from Files" => "Új kiválasztása a Fájlokból",
-"Remove image" => "A kép eltávolítása",
-"Either png or jpg. Ideally square but you will be able to crop it." => "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
-"Your avatar is provided by your original account." => "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
-"Cancel" => "Mégsem",
-"Choose as profile image" => "Válasszuk ki profilképnek",
-"Language" => "Nyelv",
-"Help translate" => "Segítsen a fordításban!",
-"Import Root Certificate" => "SSL tanúsítványok importálása",
-"The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
-"Log-in password" => "Bejelentkezési jelszó",
-"Decrypt all Files" => "Mentesíti a titkosítástól az összes fájlt",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
-"Restore Encryption Keys" => "A titkosító kulcsok visszaállítása",
-"Delete Encryption Keys" => "A titkosító kulcsok törlése",
-"Login Name" => "Bejelentkezési név",
-"Create" => "Létrehozás",
-"Admin Recovery Password" => "Adminisztrátori jelszó az állományok visszanyerésére",
-"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
-"Search Users and Groups" => "Keresés a felhasználók és a csoportok között",
-"Add Group" => "Csoport létrehozása",
-"Group" => "Csoport",
-"Everyone" => "Mindenki",
-"Admins" => "Adminok",
-"Default Quota" => "Alapértelmezett kvóta",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
-"Unlimited" => "Korlátlan",
-"Other" => "Más",
-"Username" => "Felhasználónév",
-"Quota" => "Kvóta",
-"Storage Location" => "A háttértár helye",
-"Last Login" => "Utolsó bejelentkezés",
-"change full name" => "a teljes név megváltoztatása",
-"set new password" => "új jelszó beállítása",
-"Default" => "Alapértelmezett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hy.js b/settings/l10n/hy.js
new file mode 100644
index 00000000000..e73644e2e08
--- /dev/null
+++ b/settings/l10n/hy.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Delete" : "Ջնջել",
+    "Other" : "Այլ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hy.json b/settings/l10n/hy.json
new file mode 100644
index 00000000000..e3706d9554d
--- /dev/null
+++ b/settings/l10n/hy.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Delete" : "Ջնջել",
+    "Other" : "Այլ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
deleted file mode 100644
index d73cb37a765..00000000000
--- a/settings/l10n/hy.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ջնջել",
-"Other" => "Այլ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
new file mode 100644
index 00000000000..ffc7220a423
--- /dev/null
+++ b/settings/l10n/ia.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Language changed" : "Linguage cambiate",
+    "Invalid request" : "Requesta invalide",
+    "Saved" : "Salveguardate",
+    "Email sent" : "Message de e-posta inviate",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Delete" : "Deler",
+    "Groups" : "Gruppos",
+    "never" : "nunquam",
+    "__language_name__" : "Interlingua",
+    "Security Warning" : "Aviso de securitate",
+    "Log" : "Registro",
+    "More" : "Plus",
+    "by" : "per",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
+    "Password" : "Contrasigno",
+    "Unable to change your password" : "Non pote cambiar tu contrasigno",
+    "Current password" : "Contrasigno currente",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "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",
+    "Group" : "Gruppo",
+    "Default Quota" : "Quota predeterminate",
+    "Other" : "Altere",
+    "Username" : "Nomine de usator",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
new file mode 100644
index 00000000000..b231ba1664e
--- /dev/null
+++ b/settings/l10n/ia.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Language changed" : "Linguage cambiate",
+    "Invalid request" : "Requesta invalide",
+    "Saved" : "Salveguardate",
+    "Email sent" : "Message de e-posta inviate",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Delete" : "Deler",
+    "Groups" : "Gruppos",
+    "never" : "nunquam",
+    "__language_name__" : "Interlingua",
+    "Security Warning" : "Aviso de securitate",
+    "Log" : "Registro",
+    "More" : "Plus",
+    "by" : "per",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
+    "Password" : "Contrasigno",
+    "Unable to change your password" : "Non pote cambiar tu contrasigno",
+    "Current password" : "Contrasigno currente",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "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",
+    "Group" : "Gruppo",
+    "Default Quota" : "Quota predeterminate",
+    "Other" : "Altere",
+    "Username" : "Nomine de usator",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
deleted file mode 100644
index f348af78212..00000000000
--- a/settings/l10n/ia.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Language changed" => "Linguage cambiate",
-"Invalid request" => "Requesta invalide",
-"Saved" => "Salveguardate",
-"Email sent" => "Message de e-posta inviate",
-"Very weak password" => "Contrasigno multo debile",
-"Weak password" => "Contrasigno debile",
-"So-so password" => "Contrasigno passabile",
-"Good password" => "Contrasigno bon",
-"Strong password" => "Contrasigno forte",
-"Delete" => "Deler",
-"Groups" => "Gruppos",
-"never" => "nunquam",
-"__language_name__" => "Interlingua",
-"Security Warning" => "Aviso de securitate",
-"Log" => "Registro",
-"More" => "Plus",
-"by" => "per",
-"Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files",
-"Password" => "Contrasigno",
-"Unable to change your password" => "Non pote cambiar tu contrasigno",
-"Current password" => "Contrasigno currente",
-"New password" => "Nove contrasigno",
-"Change password" => "Cambiar contrasigno",
-"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",
-"Group" => "Gruppo",
-"Default Quota" => "Quota predeterminate",
-"Other" => "Altere",
-"Username" => "Nomine de usator",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
new file mode 100644
index 00000000000..7a27913daf0
--- /dev/null
+++ b/settings/l10n/id.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
+    "Authentication error" : "Terjadi kesalahan saat otentikasi",
+    "Your full name has been changed." : "Nama lengkap Anda telah diubah",
+    "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
+    "Group already exists" : "Grup sudah ada",
+    "Unable to add group" : "Tidak dapat menambah grup",
+    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
+    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
+    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
+    "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
+    "Email saved" : "Email disimpan",
+    "Invalid email" : "Email tidak valid",
+    "Unable to delete group" : "Tidak dapat menghapus grup",
+    "Unable to delete user" : "Tidak dapat menghapus pengguna",
+    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
+    "Language changed" : "Bahasa telah diubah",
+    "Invalid request" : "Permintaan tidak valid",
+    "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
+    "Unable to add user to group %s" : "Tidak dapat menambahkan pengguna ke grup %s",
+    "Unable to remove user from group %s" : "Tidak dapat menghapus pengguna dari grup %s",
+    "Couldn't update app." : "Tidak dapat memperbarui aplikasi.",
+    "Wrong password" : "Sandi salah",
+    "No user supplied" : "Tidak ada pengguna yang diberikan",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
+    "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",
+    "Saved" : "Disimpan",
+    "test email settings" : "pengaturan email percobaan",
+    "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
+    "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
+    "Email sent" : "Email terkirim",
+    "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
+    "Add trusted domain" : "Tambah domain terpercaya",
+    "Sending..." : "Mengirim",
+    "All" : "Semua",
+    "Please wait...." : "Mohon tunggu....",
+    "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
+    "Disable" : "Nonaktifkan",
+    "Enable" : "Aktifkan",
+    "Error while enabling app" : "Terjadi kesalahan saat mengakifkan aplikasi",
+    "Updating...." : "Memperbarui....",
+    "Error while updating app" : "Terjadi kesalahan saat memperbarui aplikasi",
+    "Updated" : "Diperbarui",
+    "Uninstalling ...." : "Mencopot ...",
+    "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
+    "Uninstall" : "Copot",
+    "Select a profile picture" : "Pilih foto profil",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Valid until {date}" : "Berlaku sampai {date}",
+    "Delete" : "Hapus",
+    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
+    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
+    "Restore encryption keys." : "memulihkan kunci enkripsi.",
+    "Groups" : "Grup",
+    "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
+    "Error creating group" : "Terjadi kesalahan saat membuat grup",
+    "A valid group name must be provided" : "Harus memberikan nama grup yang benar.",
+    "deleted {groupName}" : "menghapus {groupName}",
+    "undo" : "urungkan",
+    "no group" : "tanpa grup",
+    "never" : "tidak pernah",
+    "deleted {userName}" : "menghapus {userName}",
+    "add group" : "tambah grup",
+    "A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
+    "Error creating user" : "Terjadi kesalahan saat membuat pengguna",
+    "A valid password must be provided" : "Harus memberikan sandi yang benar",
+    "Warning: Home directory for user \"{user}\" already exists" : "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Info Pribadi",
+    "SSL root certificates" : "Sertifikat root SSL",
+    "Encryption" : "Enkripsi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
+    "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",
+    "Plain" : "Biasa",
+    "NT LAN Manager" : "Manajer NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Peringatan Pengaturan",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
+    "Database Performance Info" : "Info Performa Basis Data",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Your PHP version is outdated" : "Versi PHP telah usang",
+    "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." : "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
+    "PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
+    "Locale not working" : "Kode pelokalan tidak berfungsi",
+    "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
+    "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+    "Connectivity checks" : "Pemeriksaan konektivitas",
+    "No problems found" : "Masalah tidak ditemukan",
+    "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+    "Sharing" : "Berbagi",
+    "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
+    "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
+    "Enforce password protection" : "Berlakukan perlindungan sandi",
+    "Allow public uploads" : "Izinkan unggahan publik",
+    "Set default expiration date" : "Atur tanggal kadaluarsa default",
+    "Expire after " : "Kadaluarsa setelah",
+    "days" : "hari",
+    "Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
+    "Allow resharing" : "Izinkan pembagian ulang",
+    "Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+    "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
+    "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+    "Security" : "Keamanan",
+    "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.",
+    "Email Server" : "Server Email",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Log" : "Log",
+    "Log level" : "Level log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "Version" : "Versi",
+    "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>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Lebih banyak aplikasi",
+    "Add your app" : "Tambah aplikasi Anda",
+    "by" : "oleh",
+    "licensed" : "dilisensikan",
+    "Documentation:" : "Dokumentasi:",
+    "User Documentation" : "Dokumentasi Pengguna",
+    "Admin Documentation" : "Dokumentasi Admin",
+    "Update to %s" : "Perbarui ke %s",
+    "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
+    "Uninstall App" : "Copot aplikasi",
+    "Administrator Documentation" : "Dokumentasi Administrator",
+    "Online Documentation" : "Dokumentasi Online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Dukungan Komersial",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
+    "Password" : "Sandi",
+    "Your password was changed" : "Sandi Anda telah diubah",
+    "Unable to change your password" : "Gagal mengubah sandi Anda",
+    "Current password" : "Sandi saat ini",
+    "New password" : "Sandi baru",
+    "Change password" : "Ubah sandi",
+    "Full Name" : "Nama Lengkap",
+    "Email" : "Email",
+    "Your email address" : "Alamat email Anda",
+    "Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+    "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." : "Boleh 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.",
+    "Cancel" : "Batal",
+    "Choose as profile image" : "Pilih sebagai gambar profil",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu menerjemahkan",
+    "Common Name" : "Nama umum",
+    "Valid until" : "Berlaku sampai",
+    "Issued By" : "Diterbitkan oleh",
+    "Valid until %s" : "Berlaku sampai %s",
+    "Import Root Certificate" : "Impor Sertifikat Root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
+    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
+    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
+    "Show storage location" : "Tampilkan kolasi penyimpanan",
+    "Show last log in" : "Tampilkan masuk terakhir",
+    "Login Name" : "Nama Masuk",
+    "Create" : "Buat",
+    "Admin Recovery Password" : "Sandi pemulihan Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
+    "Add Group" : "Tambah Grup",
+    "Group" : "Grup",
+    "Everyone" : "Semua orang",
+    "Admins" : "Admin",
+    "Default Quota" : "Kuota default",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
+    "Unlimited" : "Tak terbatas",
+    "Other" : "Lainnya",
+    "Username" : "Nama pengguna",
+    "Group Admin for" : "Grup Admin untuk",
+    "Quota" : "Quota",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "Last Login" : "Masuk Terakhir",
+    "change full name" : "ubah nama lengkap",
+    "set new password" : "setel sandi baru",
+    "Default" : "Default"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
new file mode 100644
index 00000000000..cbfecf00f2a
--- /dev/null
+++ b/settings/l10n/id.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
+    "Authentication error" : "Terjadi kesalahan saat otentikasi",
+    "Your full name has been changed." : "Nama lengkap Anda telah diubah",
+    "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
+    "Group already exists" : "Grup sudah ada",
+    "Unable to add group" : "Tidak dapat menambah grup",
+    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
+    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
+    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
+    "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
+    "Email saved" : "Email disimpan",
+    "Invalid email" : "Email tidak valid",
+    "Unable to delete group" : "Tidak dapat menghapus grup",
+    "Unable to delete user" : "Tidak dapat menghapus pengguna",
+    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
+    "Language changed" : "Bahasa telah diubah",
+    "Invalid request" : "Permintaan tidak valid",
+    "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
+    "Unable to add user to group %s" : "Tidak dapat menambahkan pengguna ke grup %s",
+    "Unable to remove user from group %s" : "Tidak dapat menghapus pengguna dari grup %s",
+    "Couldn't update app." : "Tidak dapat memperbarui aplikasi.",
+    "Wrong password" : "Sandi salah",
+    "No user supplied" : "Tidak ada pengguna yang diberikan",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
+    "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",
+    "Saved" : "Disimpan",
+    "test email settings" : "pengaturan email percobaan",
+    "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
+    "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
+    "Email sent" : "Email terkirim",
+    "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
+    "Add trusted domain" : "Tambah domain terpercaya",
+    "Sending..." : "Mengirim",
+    "All" : "Semua",
+    "Please wait...." : "Mohon tunggu....",
+    "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
+    "Disable" : "Nonaktifkan",
+    "Enable" : "Aktifkan",
+    "Error while enabling app" : "Terjadi kesalahan saat mengakifkan aplikasi",
+    "Updating...." : "Memperbarui....",
+    "Error while updating app" : "Terjadi kesalahan saat memperbarui aplikasi",
+    "Updated" : "Diperbarui",
+    "Uninstalling ...." : "Mencopot ...",
+    "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
+    "Uninstall" : "Copot",
+    "Select a profile picture" : "Pilih foto profil",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Valid until {date}" : "Berlaku sampai {date}",
+    "Delete" : "Hapus",
+    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
+    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
+    "Restore encryption keys." : "memulihkan kunci enkripsi.",
+    "Groups" : "Grup",
+    "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
+    "Error creating group" : "Terjadi kesalahan saat membuat grup",
+    "A valid group name must be provided" : "Harus memberikan nama grup yang benar.",
+    "deleted {groupName}" : "menghapus {groupName}",
+    "undo" : "urungkan",
+    "no group" : "tanpa grup",
+    "never" : "tidak pernah",
+    "deleted {userName}" : "menghapus {userName}",
+    "add group" : "tambah grup",
+    "A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
+    "Error creating user" : "Terjadi kesalahan saat membuat pengguna",
+    "A valid password must be provided" : "Harus memberikan sandi yang benar",
+    "Warning: Home directory for user \"{user}\" already exists" : "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Info Pribadi",
+    "SSL root certificates" : "Sertifikat root SSL",
+    "Encryption" : "Enkripsi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
+    "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",
+    "Plain" : "Biasa",
+    "NT LAN Manager" : "Manajer NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Peringatan Pengaturan",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
+    "Database Performance Info" : "Info Performa Basis Data",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Your PHP version is outdated" : "Versi PHP telah usang",
+    "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." : "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
+    "PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
+    "Locale not working" : "Kode pelokalan tidak berfungsi",
+    "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
+    "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+    "Connectivity checks" : "Pemeriksaan konektivitas",
+    "No problems found" : "Masalah tidak ditemukan",
+    "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+    "Sharing" : "Berbagi",
+    "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
+    "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
+    "Enforce password protection" : "Berlakukan perlindungan sandi",
+    "Allow public uploads" : "Izinkan unggahan publik",
+    "Set default expiration date" : "Atur tanggal kadaluarsa default",
+    "Expire after " : "Kadaluarsa setelah",
+    "days" : "hari",
+    "Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
+    "Allow resharing" : "Izinkan pembagian ulang",
+    "Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+    "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
+    "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+    "Security" : "Keamanan",
+    "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.",
+    "Email Server" : "Server Email",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Log" : "Log",
+    "Log level" : "Level log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "Version" : "Versi",
+    "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>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Lebih banyak aplikasi",
+    "Add your app" : "Tambah aplikasi Anda",
+    "by" : "oleh",
+    "licensed" : "dilisensikan",
+    "Documentation:" : "Dokumentasi:",
+    "User Documentation" : "Dokumentasi Pengguna",
+    "Admin Documentation" : "Dokumentasi Admin",
+    "Update to %s" : "Perbarui ke %s",
+    "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
+    "Uninstall App" : "Copot aplikasi",
+    "Administrator Documentation" : "Dokumentasi Administrator",
+    "Online Documentation" : "Dokumentasi Online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Dukungan Komersial",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
+    "Password" : "Sandi",
+    "Your password was changed" : "Sandi Anda telah diubah",
+    "Unable to change your password" : "Gagal mengubah sandi Anda",
+    "Current password" : "Sandi saat ini",
+    "New password" : "Sandi baru",
+    "Change password" : "Ubah sandi",
+    "Full Name" : "Nama Lengkap",
+    "Email" : "Email",
+    "Your email address" : "Alamat email Anda",
+    "Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+    "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." : "Boleh 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.",
+    "Cancel" : "Batal",
+    "Choose as profile image" : "Pilih sebagai gambar profil",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu menerjemahkan",
+    "Common Name" : "Nama umum",
+    "Valid until" : "Berlaku sampai",
+    "Issued By" : "Diterbitkan oleh",
+    "Valid until %s" : "Berlaku sampai %s",
+    "Import Root Certificate" : "Impor Sertifikat Root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
+    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
+    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
+    "Show storage location" : "Tampilkan kolasi penyimpanan",
+    "Show last log in" : "Tampilkan masuk terakhir",
+    "Login Name" : "Nama Masuk",
+    "Create" : "Buat",
+    "Admin Recovery Password" : "Sandi pemulihan Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
+    "Add Group" : "Tambah Grup",
+    "Group" : "Grup",
+    "Everyone" : "Semua orang",
+    "Admins" : "Admin",
+    "Default Quota" : "Kuota default",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
+    "Unlimited" : "Tak terbatas",
+    "Other" : "Lainnya",
+    "Username" : "Nama pengguna",
+    "Group Admin for" : "Grup Admin untuk",
+    "Quota" : "Quota",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "Last Login" : "Masuk Terakhir",
+    "change full name" : "ubah nama lengkap",
+    "set new password" : "setel sandi baru",
+    "Default" : "Default"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
deleted file mode 100644
index 639d62b7114..00000000000
--- a/settings/l10n/id.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Diaktifkan",
-"Not enabled" => "Tidak diaktifkan",
-"Recommended" => "Direkomendasikan",
-"Authentication error" => "Terjadi kesalahan saat otentikasi",
-"Your full name has been changed." => "Nama lengkap Anda telah diubah",
-"Unable to change full name" => "Tidak dapat mengubah nama lengkap",
-"Group already exists" => "Grup sudah ada",
-"Unable to add group" => "Tidak dapat menambah grup",
-"Files decrypted successfully" => "Berkas berhasil dideskripsi",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
-"Couldn't decrypt your files, check your password and try again" => "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
-"Encryption keys deleted permanently" => "Kunci enkripsi dihapus secara permanen",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
-"Couldn't remove app." => "Tidak dapat menghapus aplikasi.",
-"Email saved" => "Email disimpan",
-"Invalid email" => "Email tidak valid",
-"Unable to delete group" => "Tidak dapat menghapus grup",
-"Unable to delete user" => "Tidak dapat menghapus pengguna",
-"Backups restored successfully" => "Cadangan berhasil dipulihkan",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
-"Language changed" => "Bahasa telah diubah",
-"Invalid request" => "Permintaan tidak valid",
-"Admins can't remove themself from the admin group" => "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
-"Unable to add user to group %s" => "Tidak dapat menambahkan pengguna ke grup %s",
-"Unable to remove user from group %s" => "Tidak dapat menghapus pengguna dari grup %s",
-"Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
-"Wrong password" => "Sandi salah",
-"No user supplied" => "Tidak ada pengguna yang diberikan",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
-"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",
-"Saved" => "Disimpan",
-"test email settings" => "pengaturan email percobaan",
-"If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
-"A problem occurred while sending the email. Please revise your settings." => "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
-"Email sent" => "Email terkirim",
-"You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
-"Add trusted domain" => "Tambah domain terpercaya",
-"Sending..." => "Mengirim",
-"All" => "Semua",
-"Please wait...." => "Mohon tunggu....",
-"Error while disabling app" => "Terjadi kesalahan saat menonaktifkan aplikasi",
-"Disable" => "Nonaktifkan",
-"Enable" => "Aktifkan",
-"Error while enabling app" => "Terjadi kesalahan saat mengakifkan aplikasi",
-"Updating...." => "Memperbarui....",
-"Error while updating app" => "Terjadi kesalahan saat memperbarui aplikasi",
-"Updated" => "Diperbarui",
-"Uninstalling ...." => "Mencopot ...",
-"Error while uninstalling app" => "Terjadi kesalahan saat mencopot aplikasi",
-"Uninstall" => "Copot",
-"Select a profile picture" => "Pilih foto profil",
-"Very weak password" => "Sandi sangat lemah",
-"Weak password" => "Sandi lemah",
-"So-so password" => "Sandi lumayan",
-"Good password" => "Sandi baik",
-"Strong password" => "Sandi kuat",
-"Valid until {date}" => "Berlaku sampai {date}",
-"Delete" => "Hapus",
-"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
-"Delete encryption keys permanently." => "Hapus kunci enkripsi secara permanen.",
-"Restore encryption keys." => "memulihkan kunci enkripsi.",
-"Groups" => "Grup",
-"Unable to delete {objName}" => "Tidak dapat menghapus {objName}",
-"Error creating group" => "Terjadi kesalahan saat membuat grup",
-"A valid group name must be provided" => "Harus memberikan nama grup yang benar.",
-"deleted {groupName}" => "menghapus {groupName}",
-"undo" => "urungkan",
-"no group" => "tanpa grup",
-"never" => "tidak pernah",
-"deleted {userName}" => "menghapus {userName}",
-"add group" => "tambah grup",
-"A valid username must be provided" => "Harus memberikan nama pengguna yang benar",
-"Error creating user" => "Terjadi kesalahan saat membuat pengguna",
-"A valid password must be provided" => "Harus memberikan sandi yang benar",
-"Warning: Home directory for user \"{user}\" already exists" => "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Info Pribadi",
-"SSL root certificates" => "Sertifikat root SSL",
-"Encryption" => "Enkripsi",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, peringatan, galat dan masalah fatal",
-"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",
-"Plain" => "Biasa",
-"NT LAN Manager" => "Manajer NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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.",
-"Setup Warning" => "Peringatan Pengaturan",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
-"Database Performance Info" => "Info Performa Basis Data",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modul 'fileinfo' tidak ada",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
-"Your PHP version is outdated" => "Versi PHP telah usang",
-"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." => "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
-"PHP charset is not set to UTF-8" => "Charset PHP tidak disetel ke UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
-"Locale not working" => "Kode pelokalan tidak berfungsi",
-"System locale can not be set to a one which supports UTF-8." => "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
-"URL generation in notification emails" => "URL dibuat dalam email pemberitahuan",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
-"Connectivity checks" => "Pemeriksaan konektivitas",
-"No problems found" => "Masalah tidak ditemukan",
-"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron terakhir dieksekusi pada %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
-"Cron was not executed yet!" => "Cron masih belum dieksekusi!",
-"Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
-"Sharing" => "Berbagi",
-"Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
-"Allow users to share via link" => "Izinkan pengguna untuk membagikan via tautan",
-"Enforce password protection" => "Berlakukan perlindungan sandi",
-"Allow public uploads" => "Izinkan unggahan publik",
-"Set default expiration date" => "Atur tanggal kadaluarsa default",
-"Expire after " => "Kadaluarsa setelah",
-"days" => "hari",
-"Enforce expiration date" => "Berlakukan tanggal kadaluarsa",
-"Allow resharing" => "Izinkan pembagian ulang",
-"Restrict users to only share with users in their groups" => "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
-"Allow users to send mail notification for shared files" => "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
-"Exclude groups from sharing" => "Tidak termasuk grup untuk berbagi",
-"These groups will still be able to receive shares, but not to initiate them." => "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
-"Security" => "Keamanan",
-"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.",
-"Email Server" => "Server Email",
-"This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
-"Send mode" => "Modus kirim",
-"From address" => "Dari alamat",
-"mail" => "email",
-"Authentication method" => "Metode otentikasi",
-"Authentication required" => "Diperlukan otentikasi",
-"Server address" => "Alamat server",
-"Port" => "port",
-"Credentials" => "Kredensial",
-"SMTP Username" => "Nama pengguna SMTP",
-"SMTP Password" => "Sandi SMTP",
-"Store credentials" => "Simpan kredensial",
-"Test email settings" => "Pengaturan email percobaan",
-"Send email" => "Kirim email",
-"Log" => "Log",
-"Log level" => "Level log",
-"More" => "Lainnya",
-"Less" => "Ciutkan",
-"Version" => "Versi",
-"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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Lebih banyak aplikasi",
-"Add your app" => "Tambah aplikasi Anda",
-"by" => "oleh",
-"licensed" => "dilisensikan",
-"Documentation:" => "Dokumentasi:",
-"User Documentation" => "Dokumentasi Pengguna",
-"Admin Documentation" => "Dokumentasi Admin",
-"Update to %s" => "Perbarui ke %s",
-"Enable only for specific groups" => "Aktifkan hanya untuk grup tertentu",
-"Uninstall App" => "Copot aplikasi",
-"Administrator Documentation" => "Dokumentasi Administrator",
-"Online Documentation" => "Dokumentasi Online",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Dukungan Komersial",
-"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
-"Show First Run Wizard again" => "Tampilkan Penuntun Konfigurasi Awal",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
-"Password" => "Sandi",
-"Your password was changed" => "Sandi Anda telah diubah",
-"Unable to change your password" => "Gagal mengubah sandi Anda",
-"Current password" => "Sandi saat ini",
-"New password" => "Sandi baru",
-"Change password" => "Ubah sandi",
-"Full Name" => "Nama Lengkap",
-"Email" => "Email",
-"Your email address" => "Alamat email Anda",
-"Fill in an email address to enable password recovery and receive notifications" => "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
-"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." => "Boleh 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.",
-"Cancel" => "Batal",
-"Choose as profile image" => "Pilih sebagai gambar profil",
-"Language" => "Bahasa",
-"Help translate" => "Bantu menerjemahkan",
-"Common Name" => "Nama umum",
-"Valid until" => "Berlaku sampai",
-"Issued By" => "Diterbitkan oleh",
-"Valid until %s" => "Berlaku sampai %s",
-"Import Root Certificate" => "Impor Sertifikat Root",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
-"Restore Encryption Keys" => "Pulihkan Kunci Enkripsi",
-"Delete Encryption Keys" => "Hapus Kuncu Enkripsi",
-"Show storage location" => "Tampilkan kolasi penyimpanan",
-"Show last log in" => "Tampilkan masuk terakhir",
-"Login Name" => "Nama Masuk",
-"Create" => "Buat",
-"Admin Recovery Password" => "Sandi pemulihan Admin",
-"Enter the recovery password in order to recover the users files during password change" => "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-"Search Users and Groups" => "Telusuri Pengguna dan Grup",
-"Add Group" => "Tambah Grup",
-"Group" => "Grup",
-"Everyone" => "Semua orang",
-"Admins" => "Admin",
-"Default Quota" => "Kuota default",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
-"Unlimited" => "Tak terbatas",
-"Other" => "Lainnya",
-"Username" => "Nama pengguna",
-"Group Admin for" => "Grup Admin untuk",
-"Quota" => "Quota",
-"Storage Location" => "Lokasi Penyimpanan",
-"Last Login" => "Masuk Terakhir",
-"change full name" => "ubah nama lengkap",
-"set new password" => "setel sandi baru",
-"Default" => "Default"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
new file mode 100644
index 00000000000..b73009b405f
--- /dev/null
+++ b/settings/l10n/is.js
@@ -0,0 +1,62 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Villa við auðkenningu",
+    "Group already exists" : "Hópur er þegar til",
+    "Unable to add group" : "Ekki tókst að bæta við hóp",
+    "Email saved" : "Netfang vistað",
+    "Invalid email" : "Ógilt netfang",
+    "Unable to delete group" : "Ekki tókst að eyða hóp",
+    "Unable to delete user" : "Ekki tókst að eyða notenda",
+    "Language changed" : "Tungumáli breytt",
+    "Invalid request" : "Ógild fyrirspurn",
+    "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",
+    "Email sent" : "Tölvupóstur sendur",
+    "Please wait...." : "Andartak....",
+    "Disable" : "Gera óvirkt",
+    "Enable" : "Virkja",
+    "Updating...." : "Uppfæri...",
+    "Updated" : "Uppfært",
+    "Delete" : "Eyða",
+    "Groups" : "Hópar",
+    "undo" : "afturkalla",
+    "never" : "aldrei",
+    "__language_name__" : "__nafn_tungumáls__",
+    "SSL root certificates" : "SSL rótar skilríki",
+    "Encryption" : "Dulkóðun",
+    "None" : "Ekkert",
+    "Security Warning" : "Öryggis aðvörun",
+    "Server address" : "Host nafn netþjóns",
+    "More" : "Meira",
+    "Less" : "Minna",
+    "Version" : "Útgáfa",
+    "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>." : "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "af",
+    "User Documentation" : "Notenda handbók",
+    "Administrator Documentation" : "Stjórnenda handbók",
+    "Online Documentation" : "Handbók á netinu",
+    "Forum" : "Vefspjall",
+    "Bugtracker" : "Villubókhald",
+    "Commercial Support" : "Borgaður stuðningur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
+    "Password" : "Lykilorð",
+    "Your password was changed" : "Lykilorði þínu hefur verið breytt",
+    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Change password" : "Breyta lykilorði",
+    "Email" : "Netfang",
+    "Your email address" : "Netfangið þitt",
+    "Cancel" : "Hætta við",
+    "Language" : "Tungumál",
+    "Help translate" : "Hjálpa við þýðingu",
+    "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Create" : "Búa til",
+    "Unlimited" : "Ótakmarkað",
+    "Other" : "Annað",
+    "Username" : "Notendanafn",
+    "Default" : "Sjálfgefið"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
new file mode 100644
index 00000000000..5a70c190216
--- /dev/null
+++ b/settings/l10n/is.json
@@ -0,0 +1,60 @@
+{ "translations": {
+    "Authentication error" : "Villa við auðkenningu",
+    "Group already exists" : "Hópur er þegar til",
+    "Unable to add group" : "Ekki tókst að bæta við hóp",
+    "Email saved" : "Netfang vistað",
+    "Invalid email" : "Ógilt netfang",
+    "Unable to delete group" : "Ekki tókst að eyða hóp",
+    "Unable to delete user" : "Ekki tókst að eyða notenda",
+    "Language changed" : "Tungumáli breytt",
+    "Invalid request" : "Ógild fyrirspurn",
+    "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",
+    "Email sent" : "Tölvupóstur sendur",
+    "Please wait...." : "Andartak....",
+    "Disable" : "Gera óvirkt",
+    "Enable" : "Virkja",
+    "Updating...." : "Uppfæri...",
+    "Updated" : "Uppfært",
+    "Delete" : "Eyða",
+    "Groups" : "Hópar",
+    "undo" : "afturkalla",
+    "never" : "aldrei",
+    "__language_name__" : "__nafn_tungumáls__",
+    "SSL root certificates" : "SSL rótar skilríki",
+    "Encryption" : "Dulkóðun",
+    "None" : "Ekkert",
+    "Security Warning" : "Öryggis aðvörun",
+    "Server address" : "Host nafn netþjóns",
+    "More" : "Meira",
+    "Less" : "Minna",
+    "Version" : "Útgáfa",
+    "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>." : "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "af",
+    "User Documentation" : "Notenda handbók",
+    "Administrator Documentation" : "Stjórnenda handbók",
+    "Online Documentation" : "Handbók á netinu",
+    "Forum" : "Vefspjall",
+    "Bugtracker" : "Villubókhald",
+    "Commercial Support" : "Borgaður stuðningur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
+    "Password" : "Lykilorð",
+    "Your password was changed" : "Lykilorði þínu hefur verið breytt",
+    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Change password" : "Breyta lykilorði",
+    "Email" : "Netfang",
+    "Your email address" : "Netfangið þitt",
+    "Cancel" : "Hætta við",
+    "Language" : "Tungumál",
+    "Help translate" : "Hjálpa við þýðingu",
+    "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Create" : "Búa til",
+    "Unlimited" : "Ótakmarkað",
+    "Other" : "Annað",
+    "Username" : "Notendanafn",
+    "Default" : "Sjálfgefið"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
deleted file mode 100644
index 45f15f8dab3..00000000000
--- a/settings/l10n/is.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Villa við auðkenningu",
-"Group already exists" => "Hópur er þegar til",
-"Unable to add group" => "Ekki tókst að bæta við hóp",
-"Email saved" => "Netfang vistað",
-"Invalid email" => "Ógilt netfang",
-"Unable to delete group" => "Ekki tókst að eyða hóp",
-"Unable to delete user" => "Ekki tókst að eyða notenda",
-"Language changed" => "Tungumáli breytt",
-"Invalid request" => "Ógild fyrirspurn",
-"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",
-"Email sent" => "Tölvupóstur sendur",
-"Please wait...." => "Andartak....",
-"Disable" => "Gera óvirkt",
-"Enable" => "Virkja",
-"Updating...." => "Uppfæri...",
-"Updated" => "Uppfært",
-"Delete" => "Eyða",
-"Groups" => "Hópar",
-"undo" => "afturkalla",
-"never" => "aldrei",
-"__language_name__" => "__nafn_tungumáls__",
-"SSL root certificates" => "SSL rótar skilríki",
-"Encryption" => "Dulkóðun",
-"None" => "Ekkert",
-"Security Warning" => "Öryggis aðvörun",
-"Server address" => "Host nafn netþjóns",
-"More" => "Meira",
-"Less" => "Minna",
-"Version" => "Útgáfa",
-"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>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "af",
-"User Documentation" => "Notenda handbók",
-"Administrator Documentation" => "Stjórnenda handbók",
-"Online Documentation" => "Handbók á netinu",
-"Forum" => "Vefspjall",
-"Bugtracker" => "Villubókhald",
-"Commercial Support" => "Borgaður stuðningur",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
-"Password" => "Lykilorð",
-"Your password was changed" => "Lykilorði þínu hefur verið breytt",
-"Unable to change your password" => "Ekki tókst að breyta lykilorðinu þínu",
-"Current password" => "Núverandi lykilorð",
-"New password" => "Nýtt lykilorð",
-"Change password" => "Breyta lykilorði",
-"Email" => "Netfang",
-"Your email address" => "Netfangið þitt",
-"Cancel" => "Hætta við",
-"Language" => "Tungumál",
-"Help translate" => "Hjálpa við þýðingu",
-"Import Root Certificate" => "Flytja inn rótar skilríki",
-"Create" => "Búa til",
-"Unlimited" => "Ótakmarkað",
-"Other" => "Annað",
-"Username" => "Notendanafn",
-"Default" => "Sjálfgefið"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
new file mode 100644
index 00000000000..0e873936417
--- /dev/null
+++ b/settings/l10n/it.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
+    "Authentication error" : "Errore di autenticazione",
+    "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
+    "Unable to change full name" : "Impossibile cambiare il nome completo",
+    "Group already exists" : "Il gruppo esiste già",
+    "Unable to add group" : "Impossibile aggiungere il gruppo",
+    "Files decrypted successfully" : "File decifrato correttamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
+    "Email saved" : "Email salvata",
+    "Invalid email" : "Email non valida",
+    "Unable to delete group" : "Impossibile eliminare il gruppo",
+    "Unable to delete user" : "Impossibile eliminare l'utente",
+    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Language changed" : "Lingua modificata",
+    "Invalid request" : "Richiesta non valida",
+    "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
+    "Unable to add user to group %s" : "Impossibile aggiungere l'utente al gruppo %s",
+    "Unable to remove user from group %s" : "Impossibile rimuovere l'utente dal gruppo %s",
+    "Couldn't update app." : "Impossibile aggiornate l'applicazione.",
+    "Wrong password" : "Password errata",
+    "No user supplied" : "Non è stato fornito alcun utente",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
+    "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",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
+    "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Sending..." : "Invio in corso...",
+    "All" : "Tutti",
+    "Please wait...." : "Attendere...",
+    "Error while disabling app" : "Errore durante la disattivazione",
+    "Disable" : "Disabilita",
+    "Enable" : "Abilita",
+    "Error while enabling app" : "Errore durante l'attivazione",
+    "Updating...." : "Aggiornamento in corso...",
+    "Error while updating app" : "Errore durante l'aggiornamento",
+    "Updated" : "Aggiornato",
+    "Uninstalling ...." : "Disinstallazione...",
+    "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
+    "Uninstall" : "Disinstalla",
+    "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",
+    "Valid until {date}" : "Valido fino al {date}",
+    "Delete" : "Elimina",
+    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
+    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
+    "Groups" : "Gruppi",
+    "Unable to delete {objName}" : "Impossibile eliminare {objName}",
+    "Error creating group" : "Errore durante la creazione del gruppo",
+    "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
+    "deleted {groupName}" : "{groupName} eliminato",
+    "undo" : "annulla",
+    "never" : "mai",
+    "deleted {userName}" : "{userName} eliminato",
+    "add group" : "aggiungi gruppo",
+    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
+    "Error creating user" : "Errore durante la creazione dell'utente",
+    "A valid password must be provided" : "Deve essere fornita una password valida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avviso: la cartella home dell'utente \"{user}\" esiste già",
+    "__language_name__" : "Italiano",
+    "Personal Info" : "Informazioni personali",
+    "SSL root certificates" : "Certificati SSL radice",
+    "Encryption" : "Cifratura",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "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.",
+    "Setup Warning" : "Avviso di configurazione",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informazioni prestazioni del database",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Your PHP version is outdated" : "La tua versione di PHP è 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 tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
+    "PHP charset is not set to UTF-8" : "Il set di caratteri di PHP non è impostato a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
+    "Locale not working" : "Locale non funzionante",
+    "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s.",
+    "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity checks" : "Controlli di connettività",
+    "No problems found" : "Nessun problema trovato",
+    "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Sharing" : "Condivisione",
+    "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
+    "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+    "Enforce password protection" : "Imponi la protezione con password",
+    "Allow public uploads" : "Consenti caricamenti pubblici",
+    "Set default expiration date" : "Imposta data di scadenza predefinita",
+    "Expire after " : "Scadenza dopo",
+    "days" : "giorni",
+    "Enforce expiration date" : "Forza la data di scadenza",
+    "Allow resharing" : "Consenti la ri-condivisione",
+    "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
+    "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
+    "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
+    "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
+    "Security" : "Protezione",
+    "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.",
+    "Send mode" : "Modalità di invio",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Log" : "Log",
+    "Log level" : "Livello di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "Version" : "Versione",
+    "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>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Altre applicazioni",
+    "Add your app" : "Aggiungi la tua applicazione",
+    "by" : "di",
+    "licensed" : "sotto licenza",
+    "Documentation:" : "Documentazione:",
+    "User Documentation" : "Documentazione utente",
+    "Admin Documentation" : "Documentazione di amministrazione",
+    "Update to %s" : "Aggiornato a %s",
+    "Enable only for specific groups" : "Abilita solo per gruppi specifici",
+    "Uninstall App" : "Disinstalla applicazione",
+    "Administrator Documentation" : "Documentazione amministratore",
+    "Online Documentation" : "Documentazione in linea",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sistema di tracciamento bug",
+    "Commercial Support" : "Supporto commerciale",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
+    "Password" : "Password",
+    "Your password was changed" : "La tua password è cambiata",
+    "Unable to change your password" : "Modifica password non riuscita",
+    "Current password" : "Password attuale",
+    "New password" : "Nuova password",
+    "Change password" : "Modifica password",
+    "Full Name" : "Nome completo",
+    "Email" : "Posta elettronica",
+    "Your email address" : "Il tuo indirizzo email",
+    "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.",
+    "Cancel" : "Annulla",
+    "Choose as profile image" : "Scegli come immagine del profilo",
+    "Language" : "Lingua",
+    "Help translate" : "Migliora la traduzione",
+    "Common Name" : "Nome comune",
+    "Valid until" : "Valido fino al",
+    "Issued By" : "Emesso da",
+    "Valid until %s" : "Valido fino al %s",
+    "Import Root Certificate" : "Importa certificato radice",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
+    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
+    "Show storage location" : "Mostra posizione di archiviazione",
+    "Show last log in" : "Mostra ultimo accesso",
+    "Login Name" : "Nome utente",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Password di ripristino amministrativa",
+    "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users and Groups" : "Cerca utenti e gruppi",
+    "Add Group" : "Aggiungi gruppo",
+    "Group" : "Gruppo",
+    "Everyone" : "Chiunque",
+    "Admins" : "Amministratori",
+    "Default Quota" : "Quota predefinita",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Illimitata",
+    "Other" : "Altro",
+    "Username" : "Nome utente",
+    "Quota" : "Quote",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso",
+    "change full name" : "modica nome completo",
+    "set new password" : "imposta una nuova password",
+    "Default" : "Predefinito"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
new file mode 100644
index 00000000000..f8766d05fff
--- /dev/null
+++ b/settings/l10n/it.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
+    "Authentication error" : "Errore di autenticazione",
+    "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
+    "Unable to change full name" : "Impossibile cambiare il nome completo",
+    "Group already exists" : "Il gruppo esiste già",
+    "Unable to add group" : "Impossibile aggiungere il gruppo",
+    "Files decrypted successfully" : "File decifrato correttamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
+    "Email saved" : "Email salvata",
+    "Invalid email" : "Email non valida",
+    "Unable to delete group" : "Impossibile eliminare il gruppo",
+    "Unable to delete user" : "Impossibile eliminare l'utente",
+    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Language changed" : "Lingua modificata",
+    "Invalid request" : "Richiesta non valida",
+    "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
+    "Unable to add user to group %s" : "Impossibile aggiungere l'utente al gruppo %s",
+    "Unable to remove user from group %s" : "Impossibile rimuovere l'utente dal gruppo %s",
+    "Couldn't update app." : "Impossibile aggiornate l'applicazione.",
+    "Wrong password" : "Password errata",
+    "No user supplied" : "Non è stato fornito alcun utente",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
+    "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",
+    "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 email. Please revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
+    "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Sending..." : "Invio in corso...",
+    "All" : "Tutti",
+    "Please wait...." : "Attendere...",
+    "Error while disabling app" : "Errore durante la disattivazione",
+    "Disable" : "Disabilita",
+    "Enable" : "Abilita",
+    "Error while enabling app" : "Errore durante l'attivazione",
+    "Updating...." : "Aggiornamento in corso...",
+    "Error while updating app" : "Errore durante l'aggiornamento",
+    "Updated" : "Aggiornato",
+    "Uninstalling ...." : "Disinstallazione...",
+    "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
+    "Uninstall" : "Disinstalla",
+    "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",
+    "Valid until {date}" : "Valido fino al {date}",
+    "Delete" : "Elimina",
+    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
+    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
+    "Groups" : "Gruppi",
+    "Unable to delete {objName}" : "Impossibile eliminare {objName}",
+    "Error creating group" : "Errore durante la creazione del gruppo",
+    "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
+    "deleted {groupName}" : "{groupName} eliminato",
+    "undo" : "annulla",
+    "never" : "mai",
+    "deleted {userName}" : "{userName} eliminato",
+    "add group" : "aggiungi gruppo",
+    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
+    "Error creating user" : "Errore durante la creazione dell'utente",
+    "A valid password must be provided" : "Deve essere fornita una password valida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avviso: la cartella home dell'utente \"{user}\" esiste già",
+    "__language_name__" : "Italiano",
+    "Personal Info" : "Informazioni personali",
+    "SSL root certificates" : "Certificati SSL radice",
+    "Encryption" : "Cifratura",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "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.",
+    "Setup Warning" : "Avviso di configurazione",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informazioni prestazioni del database",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Your PHP version is outdated" : "La tua versione di PHP è 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 tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
+    "PHP charset is not set to UTF-8" : "Il set di caratteri di PHP non è impostato a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
+    "Locale not working" : "Locale non funzionante",
+    "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s.",
+    "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity checks" : "Controlli di connettività",
+    "No problems found" : "Nessun problema trovato",
+    "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Sharing" : "Condivisione",
+    "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
+    "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+    "Enforce password protection" : "Imponi la protezione con password",
+    "Allow public uploads" : "Consenti caricamenti pubblici",
+    "Set default expiration date" : "Imposta data di scadenza predefinita",
+    "Expire after " : "Scadenza dopo",
+    "days" : "giorni",
+    "Enforce expiration date" : "Forza la data di scadenza",
+    "Allow resharing" : "Consenti la ri-condivisione",
+    "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
+    "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
+    "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
+    "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
+    "Security" : "Protezione",
+    "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.",
+    "Send mode" : "Modalità di invio",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Log" : "Log",
+    "Log level" : "Livello di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "Version" : "Versione",
+    "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>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Altre applicazioni",
+    "Add your app" : "Aggiungi la tua applicazione",
+    "by" : "di",
+    "licensed" : "sotto licenza",
+    "Documentation:" : "Documentazione:",
+    "User Documentation" : "Documentazione utente",
+    "Admin Documentation" : "Documentazione di amministrazione",
+    "Update to %s" : "Aggiornato a %s",
+    "Enable only for specific groups" : "Abilita solo per gruppi specifici",
+    "Uninstall App" : "Disinstalla applicazione",
+    "Administrator Documentation" : "Documentazione amministratore",
+    "Online Documentation" : "Documentazione in linea",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sistema di tracciamento bug",
+    "Commercial Support" : "Supporto commerciale",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
+    "Password" : "Password",
+    "Your password was changed" : "La tua password è cambiata",
+    "Unable to change your password" : "Modifica password non riuscita",
+    "Current password" : "Password attuale",
+    "New password" : "Nuova password",
+    "Change password" : "Modifica password",
+    "Full Name" : "Nome completo",
+    "Email" : "Posta elettronica",
+    "Your email address" : "Il tuo indirizzo email",
+    "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.",
+    "Cancel" : "Annulla",
+    "Choose as profile image" : "Scegli come immagine del profilo",
+    "Language" : "Lingua",
+    "Help translate" : "Migliora la traduzione",
+    "Common Name" : "Nome comune",
+    "Valid until" : "Valido fino al",
+    "Issued By" : "Emesso da",
+    "Valid until %s" : "Valido fino al %s",
+    "Import Root Certificate" : "Importa certificato radice",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
+    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
+    "Show storage location" : "Mostra posizione di archiviazione",
+    "Show last log in" : "Mostra ultimo accesso",
+    "Login Name" : "Nome utente",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Password di ripristino amministrativa",
+    "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users and Groups" : "Cerca utenti e gruppi",
+    "Add Group" : "Aggiungi gruppo",
+    "Group" : "Gruppo",
+    "Everyone" : "Chiunque",
+    "Admins" : "Amministratori",
+    "Default Quota" : "Quota predefinita",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Illimitata",
+    "Other" : "Altro",
+    "Username" : "Nome utente",
+    "Quota" : "Quote",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso",
+    "change full name" : "modica nome completo",
+    "set new password" : "imposta una nuova password",
+    "Default" : "Predefinito"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
deleted file mode 100644
index 727017740ae..00000000000
--- a/settings/l10n/it.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Abilitata",
-"Not enabled" => "Non abilitata",
-"Recommended" => "Consigliata",
-"Authentication error" => "Errore di autenticazione",
-"Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
-"Unable to change full name" => "Impossibile cambiare il nome completo",
-"Group already exists" => "Il gruppo esiste già",
-"Unable to add group" => "Impossibile aggiungere il gruppo",
-"Files decrypted successfully" => "File decifrato correttamente",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
-"Encryption keys deleted permanently" => "Chiavi di cifratura eliminate definitivamente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Couldn't remove app." => "Impossibile rimuovere l'applicazione.",
-"Email saved" => "Email salvata",
-"Invalid email" => "Email non valida",
-"Unable to delete group" => "Impossibile eliminare il gruppo",
-"Unable to delete user" => "Impossibile eliminare l'utente",
-"Backups restored successfully" => "Copie di sicurezza ripristinate correttamente",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Language changed" => "Lingua modificata",
-"Invalid request" => "Richiesta non valida",
-"Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
-"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
-"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
-"Couldn't update app." => "Impossibile aggiornate l'applicazione.",
-"Wrong password" => "Password errata",
-"No user supplied" => "Non è stato fornito alcun utente",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
-"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",
-"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 email. Please revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
-"Add trusted domain" => "Aggiungi dominio attendibile",
-"Sending..." => "Invio in corso...",
-"All" => "Tutti",
-"Please wait...." => "Attendere...",
-"Error while disabling app" => "Errore durante la disattivazione",
-"Disable" => "Disabilita",
-"Enable" => "Abilita",
-"Error while enabling app" => "Errore durante l'attivazione",
-"Updating...." => "Aggiornamento in corso...",
-"Error while updating app" => "Errore durante l'aggiornamento",
-"Updated" => "Aggiornato",
-"Uninstalling ...." => "Disinstallazione...",
-"Error while uninstalling app" => "Errore durante la disinstallazione dell'applicazione",
-"Uninstall" => "Disinstalla",
-"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",
-"Valid until {date}" => "Valido fino al {date}",
-"Delete" => "Elimina",
-"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
-"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
-"Groups" => "Gruppi",
-"Unable to delete {objName}" => "Impossibile eliminare {objName}",
-"Error creating group" => "Errore durante la creazione del gruppo",
-"A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
-"deleted {groupName}" => "{groupName} eliminato",
-"undo" => "annulla",
-"no group" => "nessun gruppo",
-"never" => "mai",
-"deleted {userName}" => "{userName} eliminato",
-"add group" => "aggiungi gruppo",
-"A valid username must be provided" => "Deve essere fornito un nome utente valido",
-"Error creating user" => "Errore durante la creazione dell'utente",
-"A valid password must be provided" => "Deve essere fornita una password valida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avviso: la cartella home dell'utente \"{user}\" esiste già",
-"__language_name__" => "Italiano",
-"Personal Info" => "Informazioni personali",
-"SSL root certificates" => "Certificati SSL radice",
-"Encryption" => "Cifratura",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
-"Info, warnings, errors and fatal issues" => "Informazioni, avvisi, errori e problemi gravi",
-"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.",
-"Setup Warning" => "Avviso di configurazione",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Informazioni prestazioni del database",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
-"Your PHP version is outdated" => "La tua versione di PHP è 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 tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
-"PHP charset is not set to UTF-8" => "Il set di caratteri di PHP non è impostato a UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
-"Locale not working" => "Locale non funzionante",
-"System locale can not be set to a one which supports UTF-8." => "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s.",
-"URL generation in notification emails" => "Generazione di URL nelle email di notifica",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
-"Connectivity checks" => "Controlli di connettività",
-"No problems found" => "Nessun problema trovato",
-"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "L'ultimo cron è stato eseguito alle %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
-"Cron was not executed yet!" => "Cron non è stato ancora eseguito!",
-"Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-"Sharing" => "Condivisione",
-"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
-"Allow users to share via link" => "Consenti agli utenti di condivere tramite collegamento",
-"Enforce password protection" => "Imponi la protezione con password",
-"Allow public uploads" => "Consenti caricamenti pubblici",
-"Set default expiration date" => "Imposta data di scadenza predefinita",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Enforce expiration date" => "Forza la data di scadenza",
-"Allow resharing" => "Consenti la ri-condivisione",
-"Restrict users to only share with users in their groups" => "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
-"Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
-"Exclude groups from sharing" => "Escludi gruppi dalla condivisione",
-"These groups will still be able to receive shares, but not to initiate them." => "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
-"Security" => "Protezione",
-"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.",
-"Send mode" => "Modalità di invio",
-"From address" => "Indirizzo mittente",
-"mail" => "posta",
-"Authentication method" => "Metodo di autenticazione",
-"Authentication required" => "Autenticazione richiesta",
-"Server address" => "Indirizzo del server",
-"Port" => "Porta",
-"Credentials" => "Credenziali",
-"SMTP Username" => "Nome utente SMTP",
-"SMTP Password" => "Password SMTP",
-"Store credentials" => "Memorizza le credenziali",
-"Test email settings" => "Prova impostazioni email",
-"Send email" => "Invia email",
-"Log" => "Log",
-"Log level" => "Livello di log",
-"More" => "Altro",
-"Less" => "Meno",
-"Version" => "Versione",
-"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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Altre applicazioni",
-"Add your app" => "Aggiungi la tua applicazione",
-"by" => "di",
-"licensed" => "sotto licenza",
-"Documentation:" => "Documentazione:",
-"User Documentation" => "Documentazione utente",
-"Admin Documentation" => "Documentazione di amministrazione",
-"Update to %s" => "Aggiornato a %s",
-"Enable only for specific groups" => "Abilita solo per gruppi specifici",
-"Uninstall App" => "Disinstalla applicazione",
-"Administrator Documentation" => "Documentazione amministratore",
-"Online Documentation" => "Documentazione in linea",
-"Forum" => "Forum",
-"Bugtracker" => "Sistema di tracciamento bug",
-"Commercial Support" => "Supporto commerciale",
-"Get the apps to sync your files" => "Scarica le applicazioni per sincronizzare i tuoi file",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
-"Show First Run Wizard again" => "Mostra nuovamente la procedura di primo avvio",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
-"Password" => "Password",
-"Your password was changed" => "La tua password è cambiata",
-"Unable to change your password" => "Modifica password non riuscita",
-"Current password" => "Password attuale",
-"New password" => "Nuova password",
-"Change password" => "Modifica password",
-"Full Name" => "Nome completo",
-"Email" => "Posta elettronica",
-"Your email address" => "Il tuo indirizzo email",
-"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.",
-"Cancel" => "Annulla",
-"Choose as profile image" => "Scegli come immagine del profilo",
-"Language" => "Lingua",
-"Help translate" => "Migliora la traduzione",
-"Common Name" => "Nome comune",
-"Valid until" => "Valido fino al",
-"Issued By" => "Emesso da",
-"Valid until %s" => "Valido fino al %s",
-"Import Root Certificate" => "Importa certificato radice",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
-"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
-"Delete Encryption Keys" => "Elimina chiavi di cifratura",
-"Show storage location" => "Mostra posizione di archiviazione",
-"Show last log in" => "Mostra ultimo accesso",
-"Login Name" => "Nome utente",
-"Create" => "Crea",
-"Admin Recovery Password" => "Password di ripristino amministrativa",
-"Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-"Search Users and Groups" => "Cerca utenti e gruppi",
-"Add Group" => "Aggiungi gruppo",
-"Group" => "Gruppo",
-"Everyone" => "Chiunque",
-"Admins" => "Amministratori",
-"Default Quota" => "Quota predefinita",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
-"Unlimited" => "Illimitata",
-"Other" => "Altro",
-"Username" => "Nome utente",
-"Group Admin for" => "Gruppo di amministrazione per",
-"Quota" => "Quote",
-"Storage Location" => "Posizione di archiviazione",
-"Last Login" => "Ultimo accesso",
-"change full name" => "modica nome completo",
-"set new password" => "imposta una nuova password",
-"Default" => "Predefinito"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
new file mode 100644
index 00000000000..169f0521444
--- /dev/null
+++ b/settings/l10n/ja.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "有効",
+    "Authentication error" : "認証エラー",
+    "Your full name has been changed." : "名前を変更しました。",
+    "Unable to change full name" : "名前を変更できません",
+    "Group already exists" : "グループはすでに存在します",
+    "Unable to add group" : "グループを追加できません",
+    "Files decrypted successfully" : "ファイルの復号化に成功しました",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
+    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "Couldn't remove app." : "アプリが削除できませんでした。",
+    "Email saved" : "メールアドレスを保存しました",
+    "Invalid email" : "無効なメールアドレス",
+    "Unable to delete group" : "グループを削除できません",
+    "Unable to delete user" : "ユーザーを削除できません",
+    "Backups restored successfully" : "バックアップの復元に成功しました",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "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" : "パスワードを変更できません",
+    "Saved" : "保存されました",
+    "test email settings" : "メール設定をテスト",
+    "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "Email sent" : "メールを送信しました",
+    "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
+    "Add trusted domain" : "信頼するドメイン名に追加",
+    "Sending..." : "送信中…",
+    "All" : "すべて",
+    "Please wait...." : "しばらくお待ちください。",
+    "Error while disabling app" : "アプリ無効化中にエラーが発生",
+    "Disable" : "無効",
+    "Enable" : "有効にする",
+    "Error while enabling app" : "アプリを有効にする際にエラーが発生",
+    "Updating...." : "更新中....",
+    "Error while updating app" : "アプリの更新中にエラーが発生",
+    "Updated" : "アップデート済み",
+    "Uninstalling ...." : "アンインストール中 ....",
+    "Error while uninstalling app" : "アプリをアンインストール中にエラーが発生",
+    "Uninstall" : "アンインストール",
+    "Select a profile picture" : "プロファイル画像を選択",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Valid until {date}" : "{date} まで有効",
+    "Delete" : "削除",
+    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
+    "Restore encryption keys." : "暗号化キーを復元する。",
+    "Groups" : "グループ",
+    "Unable to delete {objName}" : "{objName} を削除できません",
+    "Error creating group" : "グループの作成エラー",
+    "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
+    "deleted {groupName}" : "{groupName} を削除しました",
+    "undo" : "元に戻す",
+    "never" : "なし",
+    "deleted {userName}" : "{userName} を削除しました",
+    "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 (日本語)",
+    "SSL root certificates" : "SSLルート証明書",
+    "Encryption" : "暗号化",
+    "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ファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
+    "Setup Warning" : "セットアップ警告",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
+    "Database Performance Info" : "データベースパフォーマンス情報",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+    "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以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+    "PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-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。",
+    "URL generation in notification emails" : "通知メールにURLを生成",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity checks" : "接続を確認",
+    "No problems found" : "問題は見つかりませんでした",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
+    "Sharing" : "共有",
+    "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
+    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Enforce password protection" : "常にパスワード保護を有効にする",
+    "Allow public uploads" : "パブリックなアップロードを許可する",
+    "Set default expiration date" : "有効期限のデフォルト値を設定",
+    "Expire after " : "無効になるまで",
+    "days" : "日",
+    "Enforce expiration date" : "有効期限を反映させる",
+    "Allow resharing" : "再共有を許可する",
+    "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
+    "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
+    "Exclude groups from sharing" : "共有可能なグループから除外",
+    "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "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." : "これは通知の送信に使われます。",
+    "Send mode" : "送信モード",
+    "From address" : "送信元アドレス",
+    "mail" : "メール",
+    "Authentication method" : "認証方法",
+    "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> ライセンスの下で提供されています。",
+    "More apps" : "他のアプリ",
+    "by" : "により",
+    "Documentation:" : "ドキュメント:",
+    "User Documentation" : "ユーザードキュメント",
+    "Admin Documentation" : "管理者ドキュメント",
+    "Enable only for specific groups" : "特定のグループのみ有効に",
+    "Uninstall App" : "アプリをアンインストール",
+    "Administrator Documentation" : "管理者ドキュメント",
+    "Online Documentation" : "オンラインドキュメント",
+    "Forum" : "フォーラム",
+    "Bugtracker" : "バグトラッカー",
+    "Commercial Support" : "商用サポート",
+    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "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" : "現在のパスワード",
+    "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" : "翻訳に協力する",
+    "Common Name" : "コモンネーム",
+    "Valid until" : "有効期限",
+    "Issued By" : "発行元",
+    "Valid until %s" : "%s まで有効",
+    "Import Root Certificate" : "ルート証明書をインポート",
+    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+    "Log-in password" : "ログインパスワード",
+    "Decrypt all Files" : "すべてのファイルを複合する",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+    "Restore Encryption Keys" : "暗号化キーを復元する",
+    "Delete Encryption Keys" : "暗号化キーを削除する",
+    "Show storage location" : "データの保存場所を表示",
+    "Show last log in" : "最終ログインを表示",
+    "Login Name" : "ログイン名",
+    "Create" : "作成",
+    "Admin Recovery Password" : "管理者リカバリパスワード",
+    "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+    "Search Users and Groups" : "ユーザーとグループを検索",
+    "Add Group" : "グループを追加",
+    "Group" : "グループ",
+    "Everyone" : "すべてのユーザー",
+    "Admins" : "管理者",
+    "Default Quota" : "デフォルトのクォータサイズ",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
+    "Unlimited" : "無制限",
+    "Other" : "その他",
+    "Username" : "ユーザーID",
+    "Quota" : "クオータ",
+    "Storage Location" : "データの保存場所",
+    "Last Login" : "最終ログイン",
+    "change full name" : "名前を変更",
+    "set new password" : "新しいパスワードを設定",
+    "Default" : "デフォルト"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
new file mode 100644
index 00000000000..67f62aa68a9
--- /dev/null
+++ b/settings/l10n/ja.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "有効",
+    "Authentication error" : "認証エラー",
+    "Your full name has been changed." : "名前を変更しました。",
+    "Unable to change full name" : "名前を変更できません",
+    "Group already exists" : "グループはすでに存在します",
+    "Unable to add group" : "グループを追加できません",
+    "Files decrypted successfully" : "ファイルの復号化に成功しました",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
+    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "Couldn't remove app." : "アプリが削除できませんでした。",
+    "Email saved" : "メールアドレスを保存しました",
+    "Invalid email" : "無効なメールアドレス",
+    "Unable to delete group" : "グループを削除できません",
+    "Unable to delete user" : "ユーザーを削除できません",
+    "Backups restored successfully" : "バックアップの復元に成功しました",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "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" : "パスワードを変更できません",
+    "Saved" : "保存されました",
+    "test email settings" : "メール設定をテスト",
+    "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "Email sent" : "メールを送信しました",
+    "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
+    "Add trusted domain" : "信頼するドメイン名に追加",
+    "Sending..." : "送信中…",
+    "All" : "すべて",
+    "Please wait...." : "しばらくお待ちください。",
+    "Error while disabling app" : "アプリ無効化中にエラーが発生",
+    "Disable" : "無効",
+    "Enable" : "有効にする",
+    "Error while enabling app" : "アプリを有効にする際にエラーが発生",
+    "Updating...." : "更新中....",
+    "Error while updating app" : "アプリの更新中にエラーが発生",
+    "Updated" : "アップデート済み",
+    "Uninstalling ...." : "アンインストール中 ....",
+    "Error while uninstalling app" : "アプリをアンインストール中にエラーが発生",
+    "Uninstall" : "アンインストール",
+    "Select a profile picture" : "プロファイル画像を選択",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Valid until {date}" : "{date} まで有効",
+    "Delete" : "削除",
+    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
+    "Restore encryption keys." : "暗号化キーを復元する。",
+    "Groups" : "グループ",
+    "Unable to delete {objName}" : "{objName} を削除できません",
+    "Error creating group" : "グループの作成エラー",
+    "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
+    "deleted {groupName}" : "{groupName} を削除しました",
+    "undo" : "元に戻す",
+    "never" : "なし",
+    "deleted {userName}" : "{userName} を削除しました",
+    "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 (日本語)",
+    "SSL root certificates" : "SSLルート証明書",
+    "Encryption" : "暗号化",
+    "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ファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
+    "Setup Warning" : "セットアップ警告",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
+    "Database Performance Info" : "データベースパフォーマンス情報",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+    "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以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+    "PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-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。",
+    "URL generation in notification emails" : "通知メールにURLを生成",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity checks" : "接続を確認",
+    "No problems found" : "問題は見つかりませんでした",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
+    "Sharing" : "共有",
+    "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
+    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Enforce password protection" : "常にパスワード保護を有効にする",
+    "Allow public uploads" : "パブリックなアップロードを許可する",
+    "Set default expiration date" : "有効期限のデフォルト値を設定",
+    "Expire after " : "無効になるまで",
+    "days" : "日",
+    "Enforce expiration date" : "有効期限を反映させる",
+    "Allow resharing" : "再共有を許可する",
+    "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
+    "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
+    "Exclude groups from sharing" : "共有可能なグループから除外",
+    "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "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." : "これは通知の送信に使われます。",
+    "Send mode" : "送信モード",
+    "From address" : "送信元アドレス",
+    "mail" : "メール",
+    "Authentication method" : "認証方法",
+    "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> ライセンスの下で提供されています。",
+    "More apps" : "他のアプリ",
+    "by" : "により",
+    "Documentation:" : "ドキュメント:",
+    "User Documentation" : "ユーザードキュメント",
+    "Admin Documentation" : "管理者ドキュメント",
+    "Enable only for specific groups" : "特定のグループのみ有効に",
+    "Uninstall App" : "アプリをアンインストール",
+    "Administrator Documentation" : "管理者ドキュメント",
+    "Online Documentation" : "オンラインドキュメント",
+    "Forum" : "フォーラム",
+    "Bugtracker" : "バグトラッカー",
+    "Commercial Support" : "商用サポート",
+    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "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" : "現在のパスワード",
+    "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" : "翻訳に協力する",
+    "Common Name" : "コモンネーム",
+    "Valid until" : "有効期限",
+    "Issued By" : "発行元",
+    "Valid until %s" : "%s まで有効",
+    "Import Root Certificate" : "ルート証明書をインポート",
+    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+    "Log-in password" : "ログインパスワード",
+    "Decrypt all Files" : "すべてのファイルを複合する",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+    "Restore Encryption Keys" : "暗号化キーを復元する",
+    "Delete Encryption Keys" : "暗号化キーを削除する",
+    "Show storage location" : "データの保存場所を表示",
+    "Show last log in" : "最終ログインを表示",
+    "Login Name" : "ログイン名",
+    "Create" : "作成",
+    "Admin Recovery Password" : "管理者リカバリパスワード",
+    "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+    "Search Users and Groups" : "ユーザーとグループを検索",
+    "Add Group" : "グループを追加",
+    "Group" : "グループ",
+    "Everyone" : "すべてのユーザー",
+    "Admins" : "管理者",
+    "Default Quota" : "デフォルトのクォータサイズ",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
+    "Unlimited" : "無制限",
+    "Other" : "その他",
+    "Username" : "ユーザーID",
+    "Quota" : "クオータ",
+    "Storage Location" : "データの保存場所",
+    "Last Login" : "最終ログイン",
+    "change full name" : "名前を変更",
+    "set new password" : "新しいパスワードを設定",
+    "Default" : "デフォルト"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
deleted file mode 100644
index 8d0770a1745..00000000000
--- a/settings/l10n/ja.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "有効",
-"Recommended" => "推奨",
-"Authentication error" => "認証エラー",
-"Your full name has been changed." => "名前を変更しました。",
-"Unable to change full name" => "名前を変更できません",
-"Group already exists" => "グループはすでに存在します",
-"Unable to add group" => "グループを追加できません",
-"Files decrypted successfully" => "ファイルの復号化に成功しました",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
-"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
-"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
-"Couldn't remove app." => "アプリが削除できませんでした。",
-"Email saved" => "メールアドレスを保存しました",
-"Invalid email" => "無効なメールアドレス",
-"Unable to delete group" => "グループを削除できません",
-"Unable to delete user" => "ユーザーを削除できません",
-"Backups restored successfully" => "バックアップの復元に成功しました",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
-"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" => "パスワードを変更できません",
-"Saved" => "保存されました",
-"test email settings" => "メール設定のテスト",
-"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
-"Email sent" => "メールを送信しました",
-"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
-"Add trusted domain" => "信頼するドメイン名に追加",
-"Sending..." => "送信中…",
-"All" => "すべて",
-"Please wait...." => "しばらくお待ちください。",
-"Error while disabling app" => "アプリ無効化中にエラーが発生",
-"Disable" => "無効",
-"Enable" => "有効にする",
-"Error while enabling app" => "アプリを有効にする際にエラーが発生",
-"Updating...." => "更新中....",
-"Error while updating app" => "アプリの更新中にエラーが発生",
-"Updated" => "アップデート済み",
-"Uninstalling ...." => "アンインストール中 ....",
-"Error while uninstalling app" => "アプリをアンインストール中にエラーが発生",
-"Uninstall" => "アンインストール",
-"Select a profile picture" => "プロファイル画像を選択",
-"Very weak password" => "非常に弱いパスワード",
-"Weak password" => "弱いパスワード",
-"So-so password" => "まずまずのパスワード",
-"Good password" => "良好なパスワード",
-"Strong password" => "強いパスワード",
-"Valid until {date}" => "{date} まで有効",
-"Delete" => "削除",
-"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-"Delete encryption keys permanently." => "暗号化キーを永久に削除する。",
-"Restore encryption keys." => "暗号化キーを復元する。",
-"Groups" => "グループ",
-"Unable to delete {objName}" => "{objName} を削除できません",
-"Error creating group" => "グループの作成エラー",
-"A valid group name must be provided" => "有効なグループ名を指定する必要があります",
-"deleted {groupName}" => "{groupName} を削除しました",
-"undo" => "元に戻す",
-"never" => "なし",
-"deleted {userName}" => "{userName} を削除しました",
-"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 (日本語)",
-"SSL root certificates" => "SSLルート証明書",
-"Encryption" => "暗号化",
-"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ファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
-"Setup Warning" => "セットアップ警告",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
-"Database Performance Info" => "データベースパフォーマンス情報",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
-"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以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
-"PHP charset is not set to UTF-8" => "PHP の文字コードは UTF-8 に設定されていません",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-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。",
-"URL generation in notification emails" => "通知メールにURLを生成",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
-"Connectivity checks" => "接続を確認",
-"No problems found" => "問題は見つかりませんでした",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "直近では%sにcronが実行されました。",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
-"Cron was not executed yet!" => "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 system's cron service to call the cron.php file every 15 minutes." => "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
-"Sharing" => "共有",
-"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
-"Allow users to share via link" => "URLリンクで共有を許可する",
-"Enforce password protection" => "常にパスワード保護を有効にする",
-"Allow public uploads" => "パブリックなアップロードを許可する",
-"Set default expiration date" => "有効期限のデフォルト値を設定",
-"Expire after " => "無効になるまで",
-"days" => "日",
-"Enforce expiration date" => "有効期限を反映させる",
-"Allow resharing" => "再共有を許可する",
-"Restrict users to only share with users in their groups" => "グループ内のユーザーでのみ共有するように制限する",
-"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
-"Exclude groups from sharing" => "共有可能なグループから除外",
-"These groups will still be able to receive shares, but not to initiate them." => "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-"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." => "通知を送信する際に使用します。",
-"Send mode" => "送信モード",
-"From address" => "送信元アドレス",
-"mail" => "メール",
-"Authentication method" => "認証方法",
-"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> ライセンスの下で提供されています。",
-"More apps" => "他のアプリ",
-"by" => "により",
-"Documentation:" => "ドキュメント:",
-"User Documentation" => "ユーザードキュメント",
-"Admin Documentation" => "管理者ドキュメント",
-"Enable only for specific groups" => "特定のグループのみ有効に",
-"Uninstall App" => "アプリをアンインストール",
-"Administrator Documentation" => "管理者ドキュメント",
-"Online Documentation" => "オンラインドキュメント",
-"Forum" => "フォーラム",
-"Bugtracker" => "バグトラッカー",
-"Commercial Support" => "商用サポート",
-"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
-"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" => "現在のパスワード",
-"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" => "翻訳に協力する",
-"Common Name" => "コモンネーム",
-"Valid until" => "有効期限",
-"Issued By" => "発行元",
-"Valid until %s" => "%s まで有効",
-"Import Root Certificate" => "ルート証明書をインポート",
-"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
-"Log-in password" => "ログインパスワード",
-"Decrypt all Files" => "すべてのファイルを複合する",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
-"Restore Encryption Keys" => "暗号化キーを復元する",
-"Delete Encryption Keys" => "暗号化キーを削除する",
-"Show storage location" => "データの保存場所を表示",
-"Show last log in" => "最終ログインを表示",
-"Login Name" => "ログイン名",
-"Create" => "作成",
-"Admin Recovery Password" => "管理者リカバリパスワード",
-"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-"Search Users and Groups" => "ユーザーとグループを検索",
-"Add Group" => "グループを追加",
-"Group" => "グループ",
-"Everyone" => "すべてのユーザー",
-"Admins" => "管理者",
-"Default Quota" => "デフォルトのクォータサイズ",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
-"Unlimited" => "無制限",
-"Other" => "その他",
-"Username" => "ユーザーID",
-"Quota" => "クオータ",
-"Storage Location" => "データの保存場所",
-"Last Login" => "最終ログイン",
-"change full name" => "名前を変更",
-"set new password" => "新しいパスワードを設定",
-"Default" => "デフォルト"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/jv.js b/settings/l10n/jv.js
new file mode 100644
index 00000000000..ac03f3c3a7e
--- /dev/null
+++ b/settings/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Panjalukan salah"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/jv.json b/settings/l10n/jv.json
new file mode 100644
index 00000000000..ff13946849b
--- /dev/null
+++ b/settings/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Invalid request" : "Panjalukan salah"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/jv.php b/settings/l10n/jv.php
deleted file mode 100644
index 60f6d245940..00000000000
--- a/settings/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "Panjalukan salah"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
new file mode 100644
index 00000000000..dd9652686b5
--- /dev/null
+++ b/settings/l10n/ka_GE.js
@@ -0,0 +1,92 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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." : "ვერ მოხერხდა აპლიკაციის განახლება.",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "All" : "ყველა",
+    "Please wait...." : "დაიცადეთ....",
+    "Disable" : "გამორთვა",
+    "Enable" : "ჩართვა",
+    "Updating...." : "მიმდინარეობს განახლება....",
+    "Error while updating app" : "შეცდომა აპლიკაციის განახლების დროს",
+    "Updated" : "განახლებულია",
+    "Delete" : "წაშლა",
+    "Groups" : "ჯგუფები",
+    "undo" : "დაბრუნება",
+    "never" : "არასდროს",
+    "add group" : "ჯგუფის დამატება",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "Error creating user" : "შეცდომა მომხმარებლის შექმნისას",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root სერთიფიკატები",
+    "Encryption" : "ენკრიპცია",
+    "None" : "არა",
+    "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." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
+    "Locale not working" : "ლოკალიზაცია არ მუშაობს",
+    "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
+    "Cron" : "Cron–ი",
+    "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Sharing" : "გაზიარება",
+    "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
+    "Allow resharing" : "გადაზიარების დაშვება",
+    "Security" : "უსაფრთხოება",
+    "Enforce HTTPS" : "HTTPS–ის ჩართვა",
+    "Server address" : "სერვერის მისამართი",
+    "Port" : "პორტი",
+    "Credentials" : "იუზერ/პაროლი",
+    "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 community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
+    "by" : "მიერ",
+    "User Documentation" : "მომხმარებლის დოკუმენტაცია",
+    "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" : "მიმდინარე პაროლი",
+    "New password" : "ახალი პაროლი",
+    "Change password" : "პაროლის შეცვლა",
+    "Email" : "იმეილი",
+    "Your email address" : "თქვენი იმეილ მისამართი",
+    "Cancel" : "უარყოფა",
+    "Language" : "ენა",
+    "Help translate" : "თარგმნის დახმარება",
+    "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
+    "Login Name" : "მომხმარებლის სახელი",
+    "Create" : "შექმნა",
+    "Default Quota" : "საწყისი ქვოტა",
+    "Unlimited" : "ულიმიტო",
+    "Other" : "სხვა",
+    "Username" : "მომხმარებლის სახელი",
+    "Quota" : "ქვოტა",
+    "set new password" : "დააყენეთ ახალი პაროლი",
+    "Default" : "საწყისი პარამეტრები"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
new file mode 100644
index 00000000000..c2933f83849
--- /dev/null
+++ b/settings/l10n/ka_GE.json
@@ -0,0 +1,90 @@
+{ "translations": {
+    "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." : "ვერ მოხერხდა აპლიკაციის განახლება.",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "All" : "ყველა",
+    "Please wait...." : "დაიცადეთ....",
+    "Disable" : "გამორთვა",
+    "Enable" : "ჩართვა",
+    "Updating...." : "მიმდინარეობს განახლება....",
+    "Error while updating app" : "შეცდომა აპლიკაციის განახლების დროს",
+    "Updated" : "განახლებულია",
+    "Delete" : "წაშლა",
+    "Groups" : "ჯგუფები",
+    "undo" : "დაბრუნება",
+    "never" : "არასდროს",
+    "add group" : "ჯგუფის დამატება",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "Error creating user" : "შეცდომა მომხმარებლის შექმნისას",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root სერთიფიკატები",
+    "Encryption" : "ენკრიპცია",
+    "None" : "არა",
+    "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." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
+    "Locale not working" : "ლოკალიზაცია არ მუშაობს",
+    "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
+    "Cron" : "Cron–ი",
+    "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Sharing" : "გაზიარება",
+    "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
+    "Allow resharing" : "გადაზიარების დაშვება",
+    "Security" : "უსაფრთხოება",
+    "Enforce HTTPS" : "HTTPS–ის ჩართვა",
+    "Server address" : "სერვერის მისამართი",
+    "Port" : "პორტი",
+    "Credentials" : "იუზერ/პაროლი",
+    "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 community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
+    "by" : "მიერ",
+    "User Documentation" : "მომხმარებლის დოკუმენტაცია",
+    "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" : "მიმდინარე პაროლი",
+    "New password" : "ახალი პაროლი",
+    "Change password" : "პაროლის შეცვლა",
+    "Email" : "იმეილი",
+    "Your email address" : "თქვენი იმეილ მისამართი",
+    "Cancel" : "უარყოფა",
+    "Language" : "ენა",
+    "Help translate" : "თარგმნის დახმარება",
+    "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
+    "Login Name" : "მომხმარებლის სახელი",
+    "Create" : "შექმნა",
+    "Default Quota" : "საწყისი ქვოტა",
+    "Unlimited" : "ულიმიტო",
+    "Other" : "სხვა",
+    "Username" : "მომხმარებლის სახელი",
+    "Quota" : "ქვოტა",
+    "set new password" : "დააყენეთ ახალი პაროლი",
+    "Default" : "საწყისი პარამეტრები"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
deleted file mode 100644
index 3e2a50a6fdf..00000000000
--- a/settings/l10n/ka_GE.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "ვერ მოხერხდა აპლიკაციის განახლება.",
-"Email sent" => "იმეილი გაიგზავნა",
-"All" => "ყველა",
-"Please wait...." => "დაიცადეთ....",
-"Disable" => "გამორთვა",
-"Enable" => "ჩართვა",
-"Updating...." => "მიმდინარეობს განახლება....",
-"Error while updating app" => "შეცდომა აპლიკაციის განახლების დროს",
-"Updated" => "განახლებულია",
-"Delete" => "წაშლა",
-"Groups" => "ჯგუფები",
-"undo" => "დაბრუნება",
-"never" => "არასდროს",
-"add group" => "ჯგუფის დამატება",
-"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
-"Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
-"A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL root სერთიფიკატები",
-"Encryption" => "ენკრიპცია",
-"None" => "არა",
-"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." => "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
-"Locale not working" => "ლოკალიზაცია არ მუშაობს",
-"Please double check the <a href='%s'>installation guides</a>." => "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
-"Cron" => "Cron–ი",
-"Execute one task with each page loaded" => "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
-"Sharing" => "გაზიარება",
-"Allow apps to use the Share API" => "დაუშვი აპლიკაციების უფლება  Share API –ზე",
-"Allow resharing" => "გადაზიარების დაშვება",
-"Security" => "უსაფრთხოება",
-"Enforce HTTPS" => "HTTPS–ის ჩართვა",
-"Server address" => "სერვერის მისამართი",
-"Port" => "პორტი",
-"Credentials" => "იუზერ/პაროლი",
-"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 community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
-"by" => "მიერ",
-"User Documentation" => "მომხმარებლის დოკუმენტაცია",
-"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" => "მიმდინარე პაროლი",
-"New password" => "ახალი პაროლი",
-"Change password" => "პაროლის შეცვლა",
-"Email" => "იმეილი",
-"Your email address" => "თქვენი იმეილ მისამართი",
-"Cancel" => "უარყოფა",
-"Language" => "ენა",
-"Help translate" => "თარგმნის დახმარება",
-"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება",
-"Login Name" => "მომხმარებლის სახელი",
-"Create" => "შექმნა",
-"Default Quota" => "საწყისი ქვოტა",
-"Unlimited" => "ულიმიტო",
-"Other" => "სხვა",
-"Username" => "მომხმარებლის სახელი",
-"Quota" => "ქვოტა",
-"set new password" => "დააყენეთ ახალი პაროლი",
-"Default" => "საწყისი პარამეტრები"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
new file mode 100644
index 00000000000..a7eeed4bd69
--- /dev/null
+++ b/settings/l10n/km.js
@@ -0,0 +1,113 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "បាន​បើក",
+    "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." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+    "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Saved" : "បាន​រក្សាទុក",
+    "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+    "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "You need to set your user email before being able to send test emails." : "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
+    "Sending..." : "កំពុង​ផ្ញើ...",
+    "Please wait...." : "សូម​រង់​ចាំ....",
+    "Error while disabling app" : "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
+    "Disable" : "បិទ",
+    "Enable" : "បើក",
+    "Updating...." : "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+    "Error while updating app" : "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+    "Updated" : "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+    "Select a profile picture" : "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Delete" : "លុប",
+    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
+    "Groups" : "ក្រុ",
+    "undo" : "មិន​ធ្វើ​វិញ",
+    "never" : "មិនដែរ",
+    "add group" : "បន្ថែម​ក្រុម",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "កូដនីយកម្ម",
+    "None" : "គ្មាន",
+    "Login" : "ចូល",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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 មិន​ដំណើរការ",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+    "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
+    "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Security" : "សុវត្ថិភាព",
+    "Enforce HTTPS" : "បង្ខំ HTTPS",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "From address" : "ពី​អាសយដ្ឋាន",
+    "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+    "Port" : "ច្រក",
+    "Send email" : "ផ្ញើ​អ៊ីមែល",
+    "Log" : "Log",
+    "Log level" : "កម្រិត Log",
+    "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\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
+    "by" : "ដោយ",
+    "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+    "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
+    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+    "Online Documentation" : "ឯកសារ Online",
+    "Forum" : "វេទិកាពិភាក្សា",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
+    "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
+    "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
+    "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" : "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Change password" : "ប្តូរ​ពាក្យសម្ងាត់",
+    "Email" : "អ៊ីមែល",
+    "Your email address" : "អ៊ីម៉ែល​របស់​អ្នក",
+    "Profile picture" : "រូបភាព​ប្រវត្តិរូប",
+    "Upload new" : "ផ្ទុកឡើង​ថ្មី",
+    "Select new from Files" : "ជ្រើស​ថ្មី​ពី​ឯកសារ",
+    "Remove image" : "ដក​រូបភាព​ចេញ",
+    "Cancel" : "លើកលែង",
+    "Language" : "ភាសា",
+    "Help translate" : "ជួយ​បក​ប្រែ",
+    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
+    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
+    "Login Name" : "ចូល",
+    "Create" : "បង្កើត",
+    "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
+    "Unlimited" : "មិន​កំណត់",
+    "Other" : "ផ្សេងៗ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
+    "Default" : "លំនាំ​ដើម"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
new file mode 100644
index 00000000000..3dbfa6dc037
--- /dev/null
+++ b/settings/l10n/km.json
@@ -0,0 +1,111 @@
+{ "translations": {
+    "Enabled" : "បាន​បើក",
+    "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." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+    "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Saved" : "បាន​រក្សាទុក",
+    "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+    "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "You need to set your user email before being able to send test emails." : "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
+    "Sending..." : "កំពុង​ផ្ញើ...",
+    "Please wait...." : "សូម​រង់​ចាំ....",
+    "Error while disabling app" : "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
+    "Disable" : "បិទ",
+    "Enable" : "បើក",
+    "Updating...." : "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+    "Error while updating app" : "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+    "Updated" : "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+    "Select a profile picture" : "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Delete" : "លុប",
+    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
+    "Groups" : "ក្រុ",
+    "undo" : "មិន​ធ្វើ​វិញ",
+    "never" : "មិនដែរ",
+    "add group" : "បន្ថែម​ក្រុម",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "កូដនីយកម្ម",
+    "None" : "គ្មាន",
+    "Login" : "ចូល",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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 មិន​ដំណើរការ",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+    "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
+    "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Security" : "សុវត្ថិភាព",
+    "Enforce HTTPS" : "បង្ខំ HTTPS",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "From address" : "ពី​អាសយដ្ឋាន",
+    "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+    "Port" : "ច្រក",
+    "Send email" : "ផ្ញើ​អ៊ីមែល",
+    "Log" : "Log",
+    "Log level" : "កម្រិត Log",
+    "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\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
+    "by" : "ដោយ",
+    "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+    "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
+    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+    "Online Documentation" : "ឯកសារ Online",
+    "Forum" : "វេទិកាពិភាក្សា",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
+    "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
+    "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
+    "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" : "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Change password" : "ប្តូរ​ពាក្យសម្ងាត់",
+    "Email" : "អ៊ីមែល",
+    "Your email address" : "អ៊ីម៉ែល​របស់​អ្នក",
+    "Profile picture" : "រូបភាព​ប្រវត្តិរូប",
+    "Upload new" : "ផ្ទុកឡើង​ថ្មី",
+    "Select new from Files" : "ជ្រើស​ថ្មី​ពី​ឯកសារ",
+    "Remove image" : "ដក​រូបភាព​ចេញ",
+    "Cancel" : "លើកលែង",
+    "Language" : "ភាសា",
+    "Help translate" : "ជួយ​បក​ប្រែ",
+    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
+    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
+    "Login Name" : "ចូល",
+    "Create" : "បង្កើត",
+    "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
+    "Unlimited" : "មិន​កំណត់",
+    "Other" : "ផ្សេងៗ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
+    "Default" : "លំនាំ​ដើម"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
deleted file mode 100644
index 3e7522dcf9e..00000000000
--- a/settings/l10n/km.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "បាន​បើក",
-"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." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
-"Wrong password" => "ខុស​ពាក្យ​សម្ងាត់",
-"Saved" => "បាន​រក្សាទុក",
-"test email settings" => "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
-"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
-"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
-"You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
-"Sending..." => "កំពុង​ផ្ញើ...",
-"Please wait...." => "សូម​រង់​ចាំ....",
-"Error while disabling app" => "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
-"Disable" => "បិទ",
-"Enable" => "បើក",
-"Updating...." => "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
-"Error while updating app" => "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
-"Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
-"Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
-"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
-"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
-"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
-"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
-"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
-"Delete" => "លុប",
-"Decrypting files... Please wait, this can take some time." => "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
-"Groups" => "ក្រុ",
-"undo" => "មិន​ធ្វើ​វិញ",
-"never" => "មិនដែរ",
-"add group" => "បន្ថែម​ក្រុម",
-"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
-"Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
-"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
-"__language_name__" => "__language_name__",
-"Encryption" => "កូដនីយកម្ម",
-"None" => "គ្មាន",
-"Login" => "ចូល",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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 មិន​ដំណើរការ",
-"Cron" => "Cron",
-"Sharing" => "ការ​ចែក​រំលែក",
-"Allow apps to use the Share API" => "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
-"Allow public uploads" => "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
-"Allow resharing" => "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
-"Security" => "សុវត្ថិភាព",
-"Enforce HTTPS" => "បង្ខំ HTTPS",
-"Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
-"From address" => "ពី​អាសយដ្ឋាន",
-"Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
-"Port" => "ច្រក",
-"Send email" => "ផ្ញើ​អ៊ីមែល",
-"Log" => "Log",
-"Log level" => "កម្រិត Log",
-"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\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
-"by" => "ដោយ",
-"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
-"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
-"Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
-"Online Documentation" => "ឯកសារ Online",
-"Forum" => "វេទិកាពិភាក្សា",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
-"Get the apps to sync your files" => "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
-"Show First Run Wizard again" => "បង្ហាញ First Run Wizard ម្តង​ទៀត",
-"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" => "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
-"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
-"Change password" => "ប្តូរ​ពាក្យសម្ងាត់",
-"Email" => "អ៊ីមែល",
-"Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
-"Profile picture" => "រូបភាព​ប្រវត្តិរូប",
-"Upload new" => "ផ្ទុកឡើង​ថ្មី",
-"Select new from Files" => "ជ្រើស​ថ្មី​ពី​ឯកសារ",
-"Remove image" => "ដក​រូបភាព​ចេញ",
-"Cancel" => "លើកលែង",
-"Language" => "ភាសា",
-"Help translate" => "ជួយ​បក​ប្រែ",
-"Log-in password" => "ពាក្យ​សម្ងាត់​ចូល​គណនី",
-"Decrypt all Files" => "Decrypt ឯកសារ​ទាំង​អស់",
-"Login Name" => "ចូល",
-"Create" => "បង្កើត",
-"Admin Recovery Password" => "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
-"Unlimited" => "មិន​កំណត់",
-"Other" => "ផ្សេងៗ",
-"Username" => "ឈ្មោះ​អ្នកប្រើ",
-"set new password" => "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
-"Default" => "លំនាំ​ដើម"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
new file mode 100644
index 00000000000..9b0ad8a96ea
--- /dev/null
+++ b/settings/l10n/ko.js
@@ -0,0 +1,175 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "활성화",
+    "Authentication error" : "인증 오류",
+    "Your full name has been changed." : "전체 이름이 변경되었습니다.",
+    "Unable to change full name" : "전체 이름을 변경할 수 없음",
+    "Group already exists" : "그룹이 이미 존재함",
+    "Unable to add group" : "그룹을 추가할 수 없음",
+    "Couldn't remove app." : "앱을 제거할수 없습니다.",
+    "Email saved" : "이메일 저장됨",
+    "Invalid email" : "잘못된 이메일 주소",
+    "Unable to delete group" : "그룹을 삭제할 수 없음",
+    "Unable to delete user" : "사용자를 삭제할 수 없음.",
+    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
+    "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" : "암호를 변경할 수 없음",
+    "Saved" : "저장됨",
+    "Email sent" : "이메일 발송됨",
+    "Sending..." : "보내는 중...",
+    "All" : "모두",
+    "Please wait...." : "기다려 주십시오....",
+    "Error while disabling app" : "앱을 비활성화하는 중 오류 발생",
+    "Disable" : "사용 안함",
+    "Enable" : "사용함",
+    "Error while enabling app" : "앱을 활성화하는 중 오류 발생",
+    "Updating...." : "업데이트 중....",
+    "Error while updating app" : "앱을 업데이트하는 중 오류 발생",
+    "Updated" : "업데이트됨",
+    "Uninstalling ...." : "제거 하는 중 ....",
+    "Error while uninstalling app" : "앱을 제거하는 중 오류 발생",
+    "Uninstall" : "제거",
+    "Select a profile picture" : "프로필 사진 선택",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Delete" : "삭제",
+    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Groups" : "그룹",
+    "Error creating group" : "그룹을 생성하던 중 오류가 발생하였습니다",
+    "deleted {groupName}" : "{groupName} 삭제됨",
+    "undo" : "실행 취소",
+    "never" : "없음",
+    "deleted {userName}" : "{userName} 삭제됨",
+    "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__" : "한국어",
+    "SSL root certificates" : "SSL 루트 인증서",
+    "Encryption" : "암호화",
+    "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" : "로그인",
+    "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 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
+    "Setup Warning" : "설정 경고",
+    "Database Performance Info" : "데이터베이스 성능 정보",
+    "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 이상을 사용하는 것을 추천합니다.",
+    "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",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Sharing" : "공유",
+    "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
+    "Allow public uploads" : "공개 업로드 허용",
+    "Allow resharing" : "재공유 허용",
+    "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 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+    "Email Server" : "전자우편 서버",
+    "From address" : "보낸 이 주소",
+    "Authentication method" : "인증 방법",
+    "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>에 따라 사용이 허가됩니다.",
+    "by" : "작성:",
+    "Documentation:" : "문서",
+    "User Documentation" : "사용자 문서",
+    "Admin Documentation" : "운영자 문서",
+    "Enable only for specific groups" : "특정 그룹에만 허용",
+    "Uninstall App" : "앱 제거",
+    "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" : "현재 암호",
+    "New password" : "새 암호",
+    "Change password" : "암호 변경",
+    "Full Name" : "전체 이름",
+    "Email" : "이메일",
+    "Your email address" : "이메일 주소",
+    "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" : "번역 돕기",
+    "Import Root Certificate" : "루트 인증서 가져오기",
+    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
+    "Log-in password" : "로그인 암호",
+    "Decrypt all Files" : "모든 파일 복호화",
+    "Restore Encryption Keys" : "암호화 키 복원",
+    "Delete Encryption Keys" : "암호화 키 삭제",
+    "Login Name" : "로그인 이름",
+    "Create" : "만들기",
+    "Admin Recovery Password" : "관리자 복구 암호",
+    "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
+    "Search Users and Groups" : "사용자와 그룹 검색",
+    "Add Group" : "그룹 추가",
+    "Group" : "그룹",
+    "Admins" : "관리자",
+    "Default Quota" : "기본 할당량",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
+    "Unlimited" : "무제한",
+    "Other" : "기타",
+    "Username" : "사용자 이름",
+    "Quota" : "할당량",
+    "Last Login" : "마지막 로그인",
+    "change full name" : "전체 이름 변경",
+    "set new password" : "새 암호 설정",
+    "Default" : "기본값"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
new file mode 100644
index 00000000000..860946e7b91
--- /dev/null
+++ b/settings/l10n/ko.json
@@ -0,0 +1,173 @@
+{ "translations": {
+    "Enabled" : "활성화",
+    "Authentication error" : "인증 오류",
+    "Your full name has been changed." : "전체 이름이 변경되었습니다.",
+    "Unable to change full name" : "전체 이름을 변경할 수 없음",
+    "Group already exists" : "그룹이 이미 존재함",
+    "Unable to add group" : "그룹을 추가할 수 없음",
+    "Couldn't remove app." : "앱을 제거할수 없습니다.",
+    "Email saved" : "이메일 저장됨",
+    "Invalid email" : "잘못된 이메일 주소",
+    "Unable to delete group" : "그룹을 삭제할 수 없음",
+    "Unable to delete user" : "사용자를 삭제할 수 없음.",
+    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
+    "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" : "암호를 변경할 수 없음",
+    "Saved" : "저장됨",
+    "Email sent" : "이메일 발송됨",
+    "Sending..." : "보내는 중...",
+    "All" : "모두",
+    "Please wait...." : "기다려 주십시오....",
+    "Error while disabling app" : "앱을 비활성화하는 중 오류 발생",
+    "Disable" : "사용 안함",
+    "Enable" : "사용함",
+    "Error while enabling app" : "앱을 활성화하는 중 오류 발생",
+    "Updating...." : "업데이트 중....",
+    "Error while updating app" : "앱을 업데이트하는 중 오류 발생",
+    "Updated" : "업데이트됨",
+    "Uninstalling ...." : "제거 하는 중 ....",
+    "Error while uninstalling app" : "앱을 제거하는 중 오류 발생",
+    "Uninstall" : "제거",
+    "Select a profile picture" : "프로필 사진 선택",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Delete" : "삭제",
+    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Groups" : "그룹",
+    "Error creating group" : "그룹을 생성하던 중 오류가 발생하였습니다",
+    "deleted {groupName}" : "{groupName} 삭제됨",
+    "undo" : "실행 취소",
+    "never" : "없음",
+    "deleted {userName}" : "{userName} 삭제됨",
+    "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__" : "한국어",
+    "SSL root certificates" : "SSL 루트 인증서",
+    "Encryption" : "암호화",
+    "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" : "로그인",
+    "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 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
+    "Setup Warning" : "설정 경고",
+    "Database Performance Info" : "데이터베이스 성능 정보",
+    "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 이상을 사용하는 것을 추천합니다.",
+    "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",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Sharing" : "공유",
+    "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
+    "Allow public uploads" : "공개 업로드 허용",
+    "Allow resharing" : "재공유 허용",
+    "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 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+    "Email Server" : "전자우편 서버",
+    "From address" : "보낸 이 주소",
+    "Authentication method" : "인증 방법",
+    "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>에 따라 사용이 허가됩니다.",
+    "by" : "작성:",
+    "Documentation:" : "문서",
+    "User Documentation" : "사용자 문서",
+    "Admin Documentation" : "운영자 문서",
+    "Enable only for specific groups" : "특정 그룹에만 허용",
+    "Uninstall App" : "앱 제거",
+    "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" : "현재 암호",
+    "New password" : "새 암호",
+    "Change password" : "암호 변경",
+    "Full Name" : "전체 이름",
+    "Email" : "이메일",
+    "Your email address" : "이메일 주소",
+    "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" : "번역 돕기",
+    "Import Root Certificate" : "루트 인증서 가져오기",
+    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
+    "Log-in password" : "로그인 암호",
+    "Decrypt all Files" : "모든 파일 복호화",
+    "Restore Encryption Keys" : "암호화 키 복원",
+    "Delete Encryption Keys" : "암호화 키 삭제",
+    "Login Name" : "로그인 이름",
+    "Create" : "만들기",
+    "Admin Recovery Password" : "관리자 복구 암호",
+    "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
+    "Search Users and Groups" : "사용자와 그룹 검색",
+    "Add Group" : "그룹 추가",
+    "Group" : "그룹",
+    "Admins" : "관리자",
+    "Default Quota" : "기본 할당량",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
+    "Unlimited" : "무제한",
+    "Other" : "기타",
+    "Username" : "사용자 이름",
+    "Quota" : "할당량",
+    "Last Login" : "마지막 로그인",
+    "change full name" : "전체 이름 변경",
+    "set new password" : "새 암호 설정",
+    "Default" : "기본값"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
deleted file mode 100644
index 247460cf82c..00000000000
--- a/settings/l10n/ko.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "활성화",
-"Authentication error" => "인증 오류",
-"Your full name has been changed." => "전체 이름이 변경되었습니다.",
-"Unable to change full name" => "전체 이름을 변경할 수 없음",
-"Group already exists" => "그룹이 이미 존재함",
-"Unable to add group" => "그룹을 추가할 수 없음",
-"Couldn't remove app." => "앱을 제거할수 없습니다.",
-"Email saved" => "이메일 저장됨",
-"Invalid email" => "잘못된 이메일 주소",
-"Unable to delete group" => "그룹을 삭제할 수 없음",
-"Unable to delete user" => "사용자를 삭제할 수 없음.",
-"Backups restored successfully" => "성공적으로 백업을 복원했습니다",
-"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" => "암호를 변경할 수 없음",
-"Saved" => "저장됨",
-"Email sent" => "이메일 발송됨",
-"Sending..." => "보내는 중...",
-"All" => "모두",
-"Please wait...." => "기다려 주십시오....",
-"Error while disabling app" => "앱을 비활성화하는 중 오류 발생",
-"Disable" => "사용 안함",
-"Enable" => "사용함",
-"Error while enabling app" => "앱을 활성화하는 중 오류 발생",
-"Updating...." => "업데이트 중....",
-"Error while updating app" => "앱을 업데이트하는 중 오류 발생",
-"Updated" => "업데이트됨",
-"Uninstalling ...." => "제거 하는 중 ....",
-"Error while uninstalling app" => "앱을 제거하는 중 오류 발생",
-"Uninstall" => "제거",
-"Select a profile picture" => "프로필 사진 선택",
-"Very weak password" => "매우 약한 암호",
-"Weak password" => "약한 암호",
-"So-so password" => "그저 그런 암호",
-"Good password" => "좋은 암호",
-"Strong password" => "강력한 암호",
-"Delete" => "삭제",
-"Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Groups" => "그룹",
-"Error creating group" => "그룹을 생성하던 중 오류가 발생하였습니다",
-"deleted {groupName}" => "{groupName} 삭제됨",
-"undo" => "실행 취소",
-"never" => "없음",
-"deleted {userName}" => "{userName} 삭제됨",
-"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__" => "한국어",
-"SSL root certificates" => "SSL 루트 인증서",
-"Encryption" => "암호화",
-"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" => "로그인",
-"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 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
-"Setup Warning" => "설정 경고",
-"Database Performance Info" => "데이터베이스 성능 정보",
-"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 이상을 사용하는 것을 추천합니다.",
-"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",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
-"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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-"Sharing" => "공유",
-"Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
-"Allow public uploads" => "공개 업로드 허용",
-"Allow resharing" => "재공유 허용",
-"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 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
-"Email Server" => "전자우편 서버",
-"From address" => "보낸 이 주소",
-"Authentication method" => "인증 방법",
-"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>에 따라 사용이 허가됩니다.",
-"by" => "작성:",
-"Documentation:" => "문서",
-"User Documentation" => "사용자 문서",
-"Admin Documentation" => "운영자 문서",
-"Enable only for specific groups" => "특정 그룹에만 허용",
-"Uninstall App" => "앱 제거",
-"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" => "현재 암호",
-"New password" => "새 암호",
-"Change password" => "암호 변경",
-"Full Name" => "전체 이름",
-"Email" => "이메일",
-"Your email address" => "이메일 주소",
-"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" => "번역 돕기",
-"Import Root Certificate" => "루트 인증서 가져오기",
-"The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
-"Log-in password" => "로그인 암호",
-"Decrypt all Files" => "모든 파일 복호화",
-"Restore Encryption Keys" => "암호화 키 복원",
-"Delete Encryption Keys" => "암호화 키 삭제",
-"Login Name" => "로그인 이름",
-"Create" => "만들기",
-"Admin Recovery Password" => "관리자 복구 암호",
-"Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-"Search Users and Groups" => "사용자와 그룹 검색",
-"Add Group" => "그룹 추가",
-"Group" => "그룹",
-"Admins" => "관리자",
-"Default Quota" => "기본 할당량",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
-"Unlimited" => "무제한",
-"Other" => "기타",
-"Username" => "사용자 이름",
-"Quota" => "할당량",
-"Last Login" => "마지막 로그인",
-"change full name" => "전체 이름 변경",
-"set new password" => "새 암호 설정",
-"Default" => "기본값"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ku_IQ.js b/settings/l10n/ku_IQ.js
new file mode 100644
index 00000000000..15cd8c68225
--- /dev/null
+++ b/settings/l10n/ku_IQ.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "داواکارى نادروستە",
+    "Enable" : "چالاککردن",
+    "Encryption" : "نهێنیکردن",
+    "None" : "هیچ",
+    "Login" : "چوونەژوورەوە",
+    "Server address" : "ناونیشانی ڕاژه",
+    "by" : "له‌لایه‌ن",
+    "Password" : "وشەی تێپەربو",
+    "New password" : "وشەی نهێنی نوێ",
+    "Email" : "ئیمه‌یل",
+    "Cancel" : "لابردن",
+    "Login Name" : "چوونەژوورەوە",
+    "Username" : "ناوی به‌کارهێنه‌ر"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ku_IQ.json b/settings/l10n/ku_IQ.json
new file mode 100644
index 00000000000..1e6fe7a51e9
--- /dev/null
+++ b/settings/l10n/ku_IQ.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Invalid request" : "داواکارى نادروستە",
+    "Enable" : "چالاککردن",
+    "Encryption" : "نهێنیکردن",
+    "None" : "هیچ",
+    "Login" : "چوونەژوورەوە",
+    "Server address" : "ناونیشانی ڕاژه",
+    "by" : "له‌لایه‌ن",
+    "Password" : "وشەی تێپەربو",
+    "New password" : "وشەی نهێنی نوێ",
+    "Email" : "ئیمه‌یل",
+    "Cancel" : "لابردن",
+    "Login Name" : "چوونەژوورەوە",
+    "Username" : "ناوی به‌کارهێنه‌ر"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
deleted file mode 100644
index 2a0ca54def8..00000000000
--- a/settings/l10n/ku_IQ.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "داواکارى نادروستە",
-"Enable" => "چالاککردن",
-"Encryption" => "نهێنیکردن",
-"None" => "هیچ",
-"Login" => "چوونەژوورەوە",
-"Server address" => "ناونیشانی ڕاژه",
-"by" => "له‌لایه‌ن",
-"Password" => "وشەی تێپەربو",
-"New password" => "وشەی نهێنی نوێ",
-"Email" => "ئیمه‌یل",
-"Cancel" => "لابردن",
-"Login Name" => "چوونەژوورەوە",
-"Username" => "ناوی به‌کارهێنه‌ر"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js
new file mode 100644
index 00000000000..d376876593e
--- /dev/null
+++ b/settings/l10n/lb.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Authentifikatioun's Fehler",
+    "Group already exists" : "Group existeiert schon.",
+    "Unable to add group" : "Onmeiglech Grupp beizefügen.",
+    "Email saved" : "E-mail gespäichert",
+    "Invalid email" : "Ongülteg e-mail",
+    "Unable to delete group" : "Onmeiglech d'Grup ze läschen.",
+    "Unable to delete user" : "Onmeiglech User zu läschen.",
+    "Language changed" : "Sprooch huet geännert",
+    "Invalid request" : "Ongülteg Requête",
+    "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
+    "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Email sent" : "Email geschéckt",
+    "All" : "All",
+    "Disable" : "Ofschalten",
+    "Enable" : "Aschalten",
+    "Delete" : "Läschen",
+    "Groups" : "Gruppen",
+    "undo" : "réckgängeg man",
+    "never" : "ni",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Sécherheets Warnung",
+    "Cron" : "Cron",
+    "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow resharing" : "Resharing erlaben",
+    "Server address" : "Server Adress",
+    "Log" : "Log",
+    "More" : "Méi",
+    "Less" : "Manner",
+    "by" : "vun",
+    "Password" : "Passwuert",
+    "Unable to change your password" : "Konnt däin Passwuert net änneren",
+    "Current password" : "Momentan 't Passwuert",
+    "New password" : "Neit Passwuert",
+    "Change password" : "Passwuert änneren",
+    "Email" : "Email",
+    "Your email address" : "Deng Email Adress",
+    "Cancel" : "Ofbriechen",
+    "Language" : "Sprooch",
+    "Help translate" : "Hëllef iwwersetzen",
+    "Login Name" : "Login",
+    "Create" : "Erstellen",
+    "Group" : "Grupp",
+    "Default Quota" : "Standard Quota",
+    "Other" : "Aner",
+    "Username" : "Benotzernumm",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json
new file mode 100644
index 00000000000..c3124daf851
--- /dev/null
+++ b/settings/l10n/lb.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Authentication error" : "Authentifikatioun's Fehler",
+    "Group already exists" : "Group existeiert schon.",
+    "Unable to add group" : "Onmeiglech Grupp beizefügen.",
+    "Email saved" : "E-mail gespäichert",
+    "Invalid email" : "Ongülteg e-mail",
+    "Unable to delete group" : "Onmeiglech d'Grup ze läschen.",
+    "Unable to delete user" : "Onmeiglech User zu läschen.",
+    "Language changed" : "Sprooch huet geännert",
+    "Invalid request" : "Ongülteg Requête",
+    "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
+    "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Email sent" : "Email geschéckt",
+    "All" : "All",
+    "Disable" : "Ofschalten",
+    "Enable" : "Aschalten",
+    "Delete" : "Läschen",
+    "Groups" : "Gruppen",
+    "undo" : "réckgängeg man",
+    "never" : "ni",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Sécherheets Warnung",
+    "Cron" : "Cron",
+    "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow resharing" : "Resharing erlaben",
+    "Server address" : "Server Adress",
+    "Log" : "Log",
+    "More" : "Méi",
+    "Less" : "Manner",
+    "by" : "vun",
+    "Password" : "Passwuert",
+    "Unable to change your password" : "Konnt däin Passwuert net änneren",
+    "Current password" : "Momentan 't Passwuert",
+    "New password" : "Neit Passwuert",
+    "Change password" : "Passwuert änneren",
+    "Email" : "Email",
+    "Your email address" : "Deng Email Adress",
+    "Cancel" : "Ofbriechen",
+    "Language" : "Sprooch",
+    "Help translate" : "Hëllef iwwersetzen",
+    "Login Name" : "Login",
+    "Create" : "Erstellen",
+    "Group" : "Grupp",
+    "Default Quota" : "Standard Quota",
+    "Other" : "Aner",
+    "Username" : "Benotzernumm",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
deleted file mode 100644
index 25cd41b29f5..00000000000
--- a/settings/l10n/lb.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Authentifikatioun's Fehler",
-"Group already exists" => "Group existeiert schon.",
-"Unable to add group" => "Onmeiglech Grupp beizefügen.",
-"Email saved" => "E-mail gespäichert",
-"Invalid email" => "Ongülteg e-mail",
-"Unable to delete group" => "Onmeiglech d'Grup ze läschen.",
-"Unable to delete user" => "Onmeiglech User zu läschen.",
-"Language changed" => "Sprooch huet geännert",
-"Invalid request" => "Ongülteg Requête",
-"Admins can't remove themself from the admin group" => "Admins kennen sech selwer net aus enger Admin Group läschen.",
-"Unable to add user to group %s" => "Onmeiglech User an Grupp ze sätzen %s",
-"Email sent" => "Email geschéckt",
-"All" => "All",
-"Disable" => "Ofschalten",
-"Enable" => "Aschalten",
-"Delete" => "Läschen",
-"Groups" => "Gruppen",
-"undo" => "réckgängeg man",
-"never" => "ni",
-"__language_name__" => "__language_name__",
-"Login" => "Login",
-"Security Warning" => "Sécherheets Warnung",
-"Cron" => "Cron",
-"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
-"Allow resharing" => "Resharing erlaben",
-"Server address" => "Server Adress",
-"Log" => "Log",
-"More" => "Méi",
-"Less" => "Manner",
-"by" => "vun",
-"Password" => "Passwuert",
-"Unable to change your password" => "Konnt däin Passwuert net änneren",
-"Current password" => "Momentan 't Passwuert",
-"New password" => "Neit Passwuert",
-"Change password" => "Passwuert änneren",
-"Email" => "Email",
-"Your email address" => "Deng Email Adress",
-"Cancel" => "Ofbriechen",
-"Language" => "Sprooch",
-"Help translate" => "Hëllef iwwersetzen",
-"Login Name" => "Login",
-"Create" => "Erstellen",
-"Group" => "Grupp",
-"Default Quota" => "Standard Quota",
-"Other" => "Aner",
-"Username" => "Benotzernumm",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
new file mode 100644
index 00000000000..977499f0c3f
--- /dev/null
+++ b/settings/l10n/lt_LT.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Įjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Group already exists" : "Grupė jau egzistuoja",
+    "Unable to add group" : "Nepavyko pridėti grupės",
+    "Email saved" : "El. paštas išsaugotas",
+    "Invalid email" : "Netinkamas el. paštas",
+    "Unable to delete group" : "Nepavyko ištrinti grupės",
+    "Unable to delete user" : "Nepavyko ištrinti vartotojo",
+    "Language changed" : "Kalba pakeista",
+    "Invalid request" : "Klaidinga užklausa",
+    "Admins can't remove themself from the admin group" : "Administratoriai negali pašalinti savęs iš administratorių grupės",
+    "Unable to add user to group %s" : "Nepavyko pridėti vartotojo prie grupės %s",
+    "Unable to remove user from group %s" : "Nepavyko ištrinti vartotojo iš grupės %s",
+    "Couldn't update app." : "Nepavyko atnaujinti programos.",
+    "Wrong password" : "Neteisingas slaptažodis",
+    "No user supplied" : "Nepateiktas naudotojas",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
+    "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",
+    "Email sent" : "Laiškas išsiųstas",
+    "All" : "Viskas",
+    "Please wait...." : "Prašome palaukti...",
+    "Error while disabling app" : "Klaida išjungiant programą",
+    "Disable" : "Išjungti",
+    "Enable" : "Įjungti",
+    "Error while enabling app" : "Klaida įjungiant programą",
+    "Updating...." : "Atnaujinama...",
+    "Error while updating app" : "Įvyko klaida atnaujinant programą",
+    "Updated" : "Atnaujinta",
+    "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Delete" : "Ištrinti",
+    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
+    "Groups" : "Grupės",
+    "undo" : "anuliuoti",
+    "never" : "niekada",
+    "add group" : "pridėti grupę",
+    "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
+    "Error creating user" : "Klaida kuriant vartotoją",
+    "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__" : "Lietuvių",
+    "SSL root certificates" : "SSL sertifikatas",
+    "Encryption" : "Šifravimas",
+    "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ą",
+    "Module 'fileinfo' missing" : "Trūksta 'fileinfo' modulio",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+    "Locale not working" : "Lokalė neveikia",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
+    "Sharing" : "Dalijimasis",
+    "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
+    "Allow public uploads" : "Leisti viešus įkėlimus",
+    "Allow resharing" : "Leisti dalintis",
+    "Security" : "Saugumas",
+    "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",
+    "Less" : "Mažiau",
+    "Version" : "Versija",
+    "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>." : "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Daugiau programų",
+    "by" : " ",
+    "User Documentation" : "Naudotojo dokumentacija",
+    "Administrator Documentation" : "Administratoriaus dokumentacija",
+    "Online Documentation" : "Dokumentacija tinkle",
+    "Forum" : "Forumas",
+    "Bugtracker" : "Klaidų sekimas",
+    "Commercial Support" : "Komercinis palaikymas",
+    "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+    "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
+    "Password" : "Slaptažodis",
+    "Your password was changed" : "Jūsų slaptažodis buvo pakeistas",
+    "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio",
+    "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",
+    "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.",
+    "Cancel" : "Atšaukti",
+    "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
+    "Language" : "Kalba",
+    "Help translate" : "Padėkite išversti",
+    "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
+    "Log-in password" : "Prisijungimo slaptažodis",
+    "Decrypt all Files" : "Iššifruoti visus failus",
+    "Login Name" : "Vartotojo vardas",
+    "Create" : "Sukurti",
+    "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
+    "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+    "Group" : "Grupė",
+    "Default Quota" : "Numatytoji kvota",
+    "Unlimited" : "Neribota",
+    "Other" : "Kita",
+    "Username" : "Prisijungimo vardas",
+    "Quota" : "Limitas",
+    "change full name" : "keisti pilną vardą",
+    "set new password" : "nustatyti naują slaptažodį",
+    "Default" : "Numatytasis"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
new file mode 100644
index 00000000000..8c8c3856843
--- /dev/null
+++ b/settings/l10n/lt_LT.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Enabled" : "Įjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Group already exists" : "Grupė jau egzistuoja",
+    "Unable to add group" : "Nepavyko pridėti grupės",
+    "Email saved" : "El. paštas išsaugotas",
+    "Invalid email" : "Netinkamas el. paštas",
+    "Unable to delete group" : "Nepavyko ištrinti grupės",
+    "Unable to delete user" : "Nepavyko ištrinti vartotojo",
+    "Language changed" : "Kalba pakeista",
+    "Invalid request" : "Klaidinga užklausa",
+    "Admins can't remove themself from the admin group" : "Administratoriai negali pašalinti savęs iš administratorių grupės",
+    "Unable to add user to group %s" : "Nepavyko pridėti vartotojo prie grupės %s",
+    "Unable to remove user from group %s" : "Nepavyko ištrinti vartotojo iš grupės %s",
+    "Couldn't update app." : "Nepavyko atnaujinti programos.",
+    "Wrong password" : "Neteisingas slaptažodis",
+    "No user supplied" : "Nepateiktas naudotojas",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
+    "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",
+    "Email sent" : "Laiškas išsiųstas",
+    "All" : "Viskas",
+    "Please wait...." : "Prašome palaukti...",
+    "Error while disabling app" : "Klaida išjungiant programą",
+    "Disable" : "Išjungti",
+    "Enable" : "Įjungti",
+    "Error while enabling app" : "Klaida įjungiant programą",
+    "Updating...." : "Atnaujinama...",
+    "Error while updating app" : "Įvyko klaida atnaujinant programą",
+    "Updated" : "Atnaujinta",
+    "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Delete" : "Ištrinti",
+    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
+    "Groups" : "Grupės",
+    "undo" : "anuliuoti",
+    "never" : "niekada",
+    "add group" : "pridėti grupę",
+    "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
+    "Error creating user" : "Klaida kuriant vartotoją",
+    "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__" : "Lietuvių",
+    "SSL root certificates" : "SSL sertifikatas",
+    "Encryption" : "Šifravimas",
+    "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ą",
+    "Module 'fileinfo' missing" : "Trūksta 'fileinfo' modulio",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+    "Locale not working" : "Lokalė neveikia",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
+    "Sharing" : "Dalijimasis",
+    "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
+    "Allow public uploads" : "Leisti viešus įkėlimus",
+    "Allow resharing" : "Leisti dalintis",
+    "Security" : "Saugumas",
+    "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",
+    "Less" : "Mažiau",
+    "Version" : "Versija",
+    "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>." : "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Daugiau programų",
+    "by" : " ",
+    "User Documentation" : "Naudotojo dokumentacija",
+    "Administrator Documentation" : "Administratoriaus dokumentacija",
+    "Online Documentation" : "Dokumentacija tinkle",
+    "Forum" : "Forumas",
+    "Bugtracker" : "Klaidų sekimas",
+    "Commercial Support" : "Komercinis palaikymas",
+    "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+    "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
+    "Password" : "Slaptažodis",
+    "Your password was changed" : "Jūsų slaptažodis buvo pakeistas",
+    "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio",
+    "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",
+    "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.",
+    "Cancel" : "Atšaukti",
+    "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
+    "Language" : "Kalba",
+    "Help translate" : "Padėkite išversti",
+    "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
+    "Log-in password" : "Prisijungimo slaptažodis",
+    "Decrypt all Files" : "Iššifruoti visus failus",
+    "Login Name" : "Vartotojo vardas",
+    "Create" : "Sukurti",
+    "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
+    "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+    "Group" : "Grupė",
+    "Default Quota" : "Numatytoji kvota",
+    "Unlimited" : "Neribota",
+    "Other" : "Kita",
+    "Username" : "Prisijungimo vardas",
+    "Quota" : "Limitas",
+    "change full name" : "keisti pilną vardą",
+    "set new password" : "nustatyti naują slaptažodį",
+    "Default" : "Numatytasis"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
deleted file mode 100644
index 9a08ccb55a4..00000000000
--- a/settings/l10n/lt_LT.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Įjungta",
-"Authentication error" => "Autentikacijos klaida",
-"Group already exists" => "Grupė jau egzistuoja",
-"Unable to add group" => "Nepavyko pridėti grupės",
-"Email saved" => "El. paštas išsaugotas",
-"Invalid email" => "Netinkamas el. paštas",
-"Unable to delete group" => "Nepavyko ištrinti grupės",
-"Unable to delete user" => "Nepavyko ištrinti vartotojo",
-"Language changed" => "Kalba pakeista",
-"Invalid request" => "Klaidinga užklausa",
-"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės",
-"Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
-"Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
-"Couldn't update app." => "Nepavyko atnaujinti programos.",
-"Wrong password" => "Neteisingas slaptažodis",
-"No user supplied" => "Nepateiktas naudotojas",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
-"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",
-"Email sent" => "Laiškas išsiųstas",
-"All" => "Viskas",
-"Please wait...." => "Prašome palaukti...",
-"Error while disabling app" => "Klaida išjungiant programą",
-"Disable" => "Išjungti",
-"Enable" => "Įjungti",
-"Error while enabling app" => "Klaida įjungiant programą",
-"Updating...." => "Atnaujinama...",
-"Error while updating app" => "Įvyko klaida atnaujinant programą",
-"Updated" => "Atnaujinta",
-"Select a profile picture" => "Pažymėkite profilio paveikslėlį",
-"Delete" => "Ištrinti",
-"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
-"Groups" => "Grupės",
-"undo" => "anuliuoti",
-"never" => "niekada",
-"add group" => "pridėti grupę",
-"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
-"Error creating user" => "Klaida kuriant vartotoją",
-"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__" => "Lietuvių",
-"SSL root certificates" => "SSL sertifikatas",
-"Encryption" => "Šifravimas",
-"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ą",
-"Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
-"Locale not working" => "Lokalė neveikia",
-"Please double check the <a href='%s'>installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
-"Sharing" => "Dalijimasis",
-"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
-"Allow public uploads" => "Leisti viešus įkėlimus",
-"Allow resharing" => "Leisti dalintis",
-"Security" => "Saugumas",
-"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",
-"Less" => "Mažiau",
-"Version" => "Versija",
-"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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Daugiau programų",
-"by" => " ",
-"User Documentation" => "Naudotojo dokumentacija",
-"Administrator Documentation" => "Administratoriaus dokumentacija",
-"Online Documentation" => "Dokumentacija tinkle",
-"Forum" => "Forumas",
-"Bugtracker" => "Klaidų sekimas",
-"Commercial Support" => "Komercinis palaikymas",
-"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
-"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
-"Password" => "Slaptažodis",
-"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
-"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
-"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",
-"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.",
-"Cancel" => "Atšaukti",
-"Choose as profile image" => "Pasirinkite profilio paveiksliuką",
-"Language" => "Kalba",
-"Help translate" => "Padėkite išversti",
-"Import Root Certificate" => "Įkelti pagrindinį sertifikatą",
-"Log-in password" => "Prisijungimo slaptažodis",
-"Decrypt all Files" => "Iššifruoti visus failus",
-"Login Name" => "Vartotojo vardas",
-"Create" => "Sukurti",
-"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
-"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
-"Group" => "Grupė",
-"Default Quota" => "Numatytoji kvota",
-"Unlimited" => "Neribota",
-"Other" => "Kita",
-"Username" => "Prisijungimo vardas",
-"Quota" => "Limitas",
-"change full name" => "keisti pilną vardą",
-"set new password" => "nustatyti naują slaptažodį",
-"Default" => "Numatytasis"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
new file mode 100644
index 00000000000..2b385446757
--- /dev/null
+++ b/settings/l10n/lv.js
@@ -0,0 +1,103 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Group already exists" : "Grupa jau eksistē",
+    "Unable to add group" : "Nevar pievienot grupu",
+    "Email saved" : "E-pasts tika saglabāts",
+    "Invalid email" : "Nederīgs epasts",
+    "Unable to delete group" : "Nevar izdzēst grupu",
+    "Unable to delete user" : "Nevar izdzēst lietotāju",
+    "Language changed" : "Valoda tika nomainīta",
+    "Invalid request" : "Nederīgs vaicājums",
+    "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
+    "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.",
+    "Email sent" : "Vēstule nosūtīta",
+    "All" : "Visi",
+    "Please wait...." : "Lūdzu, uzgaidiet....",
+    "Disable" : "Deaktivēt",
+    "Enable" : "Aktivēt",
+    "Updating...." : "Atjaunina....",
+    "Error while updating app" : "Kļūda, atjauninot lietotni",
+    "Updated" : "Atjaunināta",
+    "Delete" : "Dzēst",
+    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
+    "Groups" : "Grupas",
+    "undo" : "atsaukt",
+    "never" : "nekad",
+    "add group" : "pievienot grupu",
+    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
+    "Error creating user" : "Kļūda, veidojot lietotāju",
+    "A valid password must be provided" : "Jānorāda derīga parole",
+    "__language_name__" : "__valodas_nosaukums__",
+    "SSL root certificates" : "SSL saknes sertifikāti",
+    "Encryption" : "Šifrēšana",
+    "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",
+    "Module 'fileinfo' missing" : "Trūkst modulis “fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
+    "Locale not working" : "Lokāle nestrādā",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Sharing" : "Dalīšanās",
+    "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
+    "Allow public uploads" : "Atļaut publisko augšupielādi",
+    "Allow resharing" : "Atļaut atkārtotu koplietošanu",
+    "Security" : "Drošība",
+    "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",
+    "Less" : "Mazāk",
+    "Version" : "Versija",
+    "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>." : "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Vairāk programmu",
+    "by" : "līdz",
+    "User Documentation" : "Lietotāja dokumentācija",
+    "Administrator Documentation" : "Administratora dokumentācija",
+    "Online Documentation" : "Tiešsaistes dokumentācija",
+    "Forum" : "Forums",
+    "Bugtracker" : "Kļūdu sekotājs",
+    "Commercial Support" : "Komerciālais atbalsts",
+    "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
+    "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+    "Password" : "Parole",
+    "Your password was changed" : "Jūru parole tika nomainīta",
+    "Unable to change your password" : "Nevar nomainīt jūsu paroli",
+    "Current password" : "Pašreizējā parole",
+    "New password" : "Jauna parole",
+    "Change password" : "Mainīt paroli",
+    "Email" : "E-pasts",
+    "Your email address" : "Jūsu e-pasta adrese",
+    "Cancel" : "Atcelt",
+    "Language" : "Valoda",
+    "Help translate" : "Palīdzi tulkot",
+    "Import Root Certificate" : "Importēt saknes sertifikātus",
+    "Log-in password" : "Pieslēgšanās parole",
+    "Decrypt all Files" : "Atšifrēt visus failus",
+    "Login Name" : "Ierakstīšanās vārds",
+    "Create" : "Izveidot",
+    "Admin Recovery Password" : "Administratora atgūšanas parole",
+    "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
+    "Group" : "Grupa",
+    "Default Quota" : "Apjoms pēc noklusējuma",
+    "Unlimited" : "Neierobežota",
+    "Other" : "Cits",
+    "Username" : "Lietotājvārds",
+    "Quota" : "Apjoms",
+    "set new password" : "iestatīt jaunu paroli",
+    "Default" : "Noklusējuma"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
new file mode 100644
index 00000000000..ae176475a4f
--- /dev/null
+++ b/settings/l10n/lv.json
@@ -0,0 +1,101 @@
+{ "translations": {
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Group already exists" : "Grupa jau eksistē",
+    "Unable to add group" : "Nevar pievienot grupu",
+    "Email saved" : "E-pasts tika saglabāts",
+    "Invalid email" : "Nederīgs epasts",
+    "Unable to delete group" : "Nevar izdzēst grupu",
+    "Unable to delete user" : "Nevar izdzēst lietotāju",
+    "Language changed" : "Valoda tika nomainīta",
+    "Invalid request" : "Nederīgs vaicājums",
+    "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
+    "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.",
+    "Email sent" : "Vēstule nosūtīta",
+    "All" : "Visi",
+    "Please wait...." : "Lūdzu, uzgaidiet....",
+    "Disable" : "Deaktivēt",
+    "Enable" : "Aktivēt",
+    "Updating...." : "Atjaunina....",
+    "Error while updating app" : "Kļūda, atjauninot lietotni",
+    "Updated" : "Atjaunināta",
+    "Delete" : "Dzēst",
+    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
+    "Groups" : "Grupas",
+    "undo" : "atsaukt",
+    "never" : "nekad",
+    "add group" : "pievienot grupu",
+    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
+    "Error creating user" : "Kļūda, veidojot lietotāju",
+    "A valid password must be provided" : "Jānorāda derīga parole",
+    "__language_name__" : "__valodas_nosaukums__",
+    "SSL root certificates" : "SSL saknes sertifikāti",
+    "Encryption" : "Šifrēšana",
+    "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",
+    "Module 'fileinfo' missing" : "Trūkst modulis “fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
+    "Locale not working" : "Lokāle nestrādā",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Sharing" : "Dalīšanās",
+    "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
+    "Allow public uploads" : "Atļaut publisko augšupielādi",
+    "Allow resharing" : "Atļaut atkārtotu koplietošanu",
+    "Security" : "Drošība",
+    "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",
+    "Less" : "Mazāk",
+    "Version" : "Versija",
+    "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>." : "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Vairāk programmu",
+    "by" : "līdz",
+    "User Documentation" : "Lietotāja dokumentācija",
+    "Administrator Documentation" : "Administratora dokumentācija",
+    "Online Documentation" : "Tiešsaistes dokumentācija",
+    "Forum" : "Forums",
+    "Bugtracker" : "Kļūdu sekotājs",
+    "Commercial Support" : "Komerciālais atbalsts",
+    "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
+    "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+    "Password" : "Parole",
+    "Your password was changed" : "Jūru parole tika nomainīta",
+    "Unable to change your password" : "Nevar nomainīt jūsu paroli",
+    "Current password" : "Pašreizējā parole",
+    "New password" : "Jauna parole",
+    "Change password" : "Mainīt paroli",
+    "Email" : "E-pasts",
+    "Your email address" : "Jūsu e-pasta adrese",
+    "Cancel" : "Atcelt",
+    "Language" : "Valoda",
+    "Help translate" : "Palīdzi tulkot",
+    "Import Root Certificate" : "Importēt saknes sertifikātus",
+    "Log-in password" : "Pieslēgšanās parole",
+    "Decrypt all Files" : "Atšifrēt visus failus",
+    "Login Name" : "Ierakstīšanās vārds",
+    "Create" : "Izveidot",
+    "Admin Recovery Password" : "Administratora atgūšanas parole",
+    "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
+    "Group" : "Grupa",
+    "Default Quota" : "Apjoms pēc noklusējuma",
+    "Unlimited" : "Neierobežota",
+    "Other" : "Cits",
+    "Username" : "Lietotājvārds",
+    "Quota" : "Apjoms",
+    "set new password" : "iestatīt jaunu paroli",
+    "Default" : "Noklusējuma"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
deleted file mode 100644
index f1c38f60e19..00000000000
--- a/settings/l10n/lv.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentifikācijas kļūda",
-"Group already exists" => "Grupa jau eksistē",
-"Unable to add group" => "Nevar pievienot grupu",
-"Email saved" => "E-pasts tika saglabāts",
-"Invalid email" => "Nederīgs epasts",
-"Unable to delete group" => "Nevar izdzēst grupu",
-"Unable to delete user" => "Nevar izdzēst lietotāju",
-"Language changed" => "Valoda tika nomainīta",
-"Invalid request" => "Nederīgs vaicājums",
-"Admins can't remove themself from the admin group" => "Administratori nevar izņemt paši sevi no administratoru grupas",
-"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.",
-"Email sent" => "Vēstule nosūtīta",
-"All" => "Visi",
-"Please wait...." => "Lūdzu, uzgaidiet....",
-"Disable" => "Deaktivēt",
-"Enable" => "Aktivēt",
-"Updating...." => "Atjaunina....",
-"Error while updating app" => "Kļūda, atjauninot lietotni",
-"Updated" => "Atjaunināta",
-"Delete" => "Dzēst",
-"Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-"Groups" => "Grupas",
-"undo" => "atsaukt",
-"never" => "nekad",
-"add group" => "pievienot grupu",
-"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
-"Error creating user" => "Kļūda, veidojot lietotāju",
-"A valid password must be provided" => "Jānorāda derīga parole",
-"__language_name__" => "__valodas_nosaukums__",
-"SSL root certificates" => "SSL saknes sertifikāti",
-"Encryption" => "Šifrēšana",
-"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",
-"Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
-"Locale not working" => "Lokāle nestrādā",
-"Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
-"Sharing" => "Dalīšanās",
-"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
-"Allow public uploads" => "Atļaut publisko augšupielādi",
-"Allow resharing" => "Atļaut atkārtotu koplietošanu",
-"Security" => "Drošība",
-"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",
-"Less" => "Mazāk",
-"Version" => "Versija",
-"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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Vairāk programmu",
-"by" => "līdz",
-"User Documentation" => "Lietotāja dokumentācija",
-"Administrator Documentation" => "Administratora dokumentācija",
-"Online Documentation" => "Tiešsaistes dokumentācija",
-"Forum" => "Forums",
-"Bugtracker" => "Kļūdu sekotājs",
-"Commercial Support" => "Komerciālais atbalsts",
-"Get the apps to sync your files" => "Saņem lietotnes, lai sinhronizētu savas datnes",
-"Show First Run Wizard again" => "Vēlreiz rādīt pirmās palaišanas vedni",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
-"Password" => "Parole",
-"Your password was changed" => "Jūru parole tika nomainīta",
-"Unable to change your password" => "Nevar nomainīt jūsu paroli",
-"Current password" => "Pašreizējā parole",
-"New password" => "Jauna parole",
-"Change password" => "Mainīt paroli",
-"Email" => "E-pasts",
-"Your email address" => "Jūsu e-pasta adrese",
-"Cancel" => "Atcelt",
-"Language" => "Valoda",
-"Help translate" => "Palīdzi tulkot",
-"Import Root Certificate" => "Importēt saknes sertifikātus",
-"Log-in password" => "Pieslēgšanās parole",
-"Decrypt all Files" => "Atšifrēt visus failus",
-"Login Name" => "Ierakstīšanās vārds",
-"Create" => "Izveidot",
-"Admin Recovery Password" => "Administratora atgūšanas parole",
-"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
-"Group" => "Grupa",
-"Default Quota" => "Apjoms pēc noklusējuma",
-"Unlimited" => "Neierobežota",
-"Other" => "Cits",
-"Username" => "Lietotājvārds",
-"Quota" => "Apjoms",
-"set new password" => "iestatīt jaunu paroli",
-"Default" => "Noklusējuma"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
new file mode 100644
index 00000000000..f8417ce6714
--- /dev/null
+++ b/settings/l10n/mk.js
@@ -0,0 +1,168 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Овозможен",
+    "Authentication error" : "Грешка во автентикација",
+    "Your full name has been changed." : "Вашето целосно име е променето.",
+    "Unable to change full name" : "Не можам да го променам целото име",
+    "Group already exists" : "Групата веќе постои",
+    "Unable to add group" : "Неможе да додадам група",
+    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
+    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
+    "Email saved" : "Електронската пошта е снимена",
+    "Invalid email" : "Неисправна електронска пошта",
+    "Unable to delete group" : "Неможе да избришам група",
+    "Unable to delete user" : "Неможам да избришам корисник",
+    "Backups restored successfully" : "Бекапите се успешно реставрирани",
+    "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" : "Нема корисничко име",
+    "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Saved" : "Снимено",
+    "test email settings" : "провери ги нагодувањата за електронска пошта",
+    "Email sent" : "Е-порака пратена",
+    "Sending..." : "Испраќам...",
+    "All" : "Сите",
+    "Please wait...." : "Ве молам почекајте ...",
+    "Error while disabling app" : "Грешка при исклучувањето на апликацијата",
+    "Disable" : "Оневозможи",
+    "Enable" : "Овозможи",
+    "Error while enabling app" : "Грешка при вклучувањето на апликацијата",
+    "Updating...." : "Надградувам ...",
+    "Error while updating app" : "Грешка додека ја надградувам апликацијата",
+    "Updated" : "Надграден",
+    "Select a profile picture" : "Одбери фотографија за профилот",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Delete" : "Избриши",
+    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
+    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
+    "Groups" : "Групи",
+    "Error creating group" : "Грешка при креирање на група",
+    "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
+    "undo" : "врати",
+    "never" : "никогаш",
+    "add group" : "додади група",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "Error creating user" : "Грешка при креирање на корисникот",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Енкрипција",
+    "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" : "Безбедносно предупредување",
+    "Setup Warning" : "Предупредување при подесување",
+    "Database Performance Info" : "Информација за перформансите на базата на податоци",
+    "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
+    "Locale not working" : "Локалето не функционира",
+    "Cron" : "Крон",
+    "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
+    "Sharing" : "Споделување",
+    "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
+    "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
+    "Enforce password protection" : "Наметни заштита на лозинка",
+    "Allow public uploads" : "Дозволи јавен аплоуд",
+    "Set default expiration date" : "Постави основен датум на истекување",
+    "Expire after " : "Истекува по",
+    "days" : "денови",
+    "Enforce expiration date" : "Наметни датум на траење",
+    "Allow resharing" : "Овозможи повторно споделување",
+    "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи",
+    "Exclude groups from sharing" : "Исклучи групи од споделување",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Email Server" : "Сервер за електронска пошта",
+    "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
+    "Send mode" : "Мод на испраќање",
+    "From address" : "Од адреса",
+    "mail" : "Електронска пошта",
+    "Authentication method" : "Метод на автентификација",
+    "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>.",
+    "by" : "од",
+    "Documentation:" : "Документација:",
+    "User Documentation" : "Корисничка документација",
+    "Admin Documentation" : "Админстраторска документација",
+    "Enable only for specific groups" : "Овозможи само на специфицирани групи",
+    "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" : "Моментална лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Смени лозинка",
+    "Full Name" : "Цело име",
+    "Email" : "Е-пошта",
+    "Your email address" : "Вашата адреса за е-пошта",
+    "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" : "Помогни во преводот",
+    "Import Root Certificate" : "Увези",
+    "Log-in password" : "Лозинка за најавување",
+    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
+    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
+    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
+    "Login Name" : "Име за најава",
+    "Create" : "Создај",
+    "Admin Recovery Password" : "Обновување на Admin лозинката",
+    "Search Users and Groups" : "Барај корисници и групи",
+    "Add Group" : "Додади група",
+    "Group" : "Група",
+    "Everyone" : "Секој",
+    "Admins" : "Администратори",
+    "Default Quota" : "Предефинирана квота",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Останато",
+    "Username" : "Корисничко име",
+    "Quota" : "Квота",
+    "Storage Location" : "Локација на сториџот",
+    "Last Login" : "Последна најава",
+    "change full name" : "промена на целото име",
+    "set new password" : "постави нова лозинка",
+    "Default" : "Предефиниран"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
new file mode 100644
index 00000000000..625f584305d
--- /dev/null
+++ b/settings/l10n/mk.json
@@ -0,0 +1,166 @@
+{ "translations": {
+    "Enabled" : "Овозможен",
+    "Authentication error" : "Грешка во автентикација",
+    "Your full name has been changed." : "Вашето целосно име е променето.",
+    "Unable to change full name" : "Не можам да го променам целото име",
+    "Group already exists" : "Групата веќе постои",
+    "Unable to add group" : "Неможе да додадам група",
+    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
+    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
+    "Email saved" : "Електронската пошта е снимена",
+    "Invalid email" : "Неисправна електронска пошта",
+    "Unable to delete group" : "Неможе да избришам група",
+    "Unable to delete user" : "Неможам да избришам корисник",
+    "Backups restored successfully" : "Бекапите се успешно реставрирани",
+    "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" : "Нема корисничко име",
+    "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Saved" : "Снимено",
+    "test email settings" : "провери ги нагодувањата за електронска пошта",
+    "Email sent" : "Е-порака пратена",
+    "Sending..." : "Испраќам...",
+    "All" : "Сите",
+    "Please wait...." : "Ве молам почекајте ...",
+    "Error while disabling app" : "Грешка при исклучувањето на апликацијата",
+    "Disable" : "Оневозможи",
+    "Enable" : "Овозможи",
+    "Error while enabling app" : "Грешка при вклучувањето на апликацијата",
+    "Updating...." : "Надградувам ...",
+    "Error while updating app" : "Грешка додека ја надградувам апликацијата",
+    "Updated" : "Надграден",
+    "Select a profile picture" : "Одбери фотографија за профилот",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Delete" : "Избриши",
+    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
+    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
+    "Groups" : "Групи",
+    "Error creating group" : "Грешка при креирање на група",
+    "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
+    "undo" : "врати",
+    "never" : "никогаш",
+    "add group" : "додади група",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "Error creating user" : "Грешка при креирање на корисникот",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Енкрипција",
+    "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" : "Безбедносно предупредување",
+    "Setup Warning" : "Предупредување при подесување",
+    "Database Performance Info" : "Информација за перформансите на базата на податоци",
+    "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
+    "Locale not working" : "Локалето не функционира",
+    "Cron" : "Крон",
+    "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
+    "Sharing" : "Споделување",
+    "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
+    "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
+    "Enforce password protection" : "Наметни заштита на лозинка",
+    "Allow public uploads" : "Дозволи јавен аплоуд",
+    "Set default expiration date" : "Постави основен датум на истекување",
+    "Expire after " : "Истекува по",
+    "days" : "денови",
+    "Enforce expiration date" : "Наметни датум на траење",
+    "Allow resharing" : "Овозможи повторно споделување",
+    "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи",
+    "Exclude groups from sharing" : "Исклучи групи од споделување",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Email Server" : "Сервер за електронска пошта",
+    "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
+    "Send mode" : "Мод на испраќање",
+    "From address" : "Од адреса",
+    "mail" : "Електронска пошта",
+    "Authentication method" : "Метод на автентификација",
+    "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>.",
+    "by" : "од",
+    "Documentation:" : "Документација:",
+    "User Documentation" : "Корисничка документација",
+    "Admin Documentation" : "Админстраторска документација",
+    "Enable only for specific groups" : "Овозможи само на специфицирани групи",
+    "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" : "Моментална лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Смени лозинка",
+    "Full Name" : "Цело име",
+    "Email" : "Е-пошта",
+    "Your email address" : "Вашата адреса за е-пошта",
+    "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" : "Помогни во преводот",
+    "Import Root Certificate" : "Увези",
+    "Log-in password" : "Лозинка за најавување",
+    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
+    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
+    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
+    "Login Name" : "Име за најава",
+    "Create" : "Создај",
+    "Admin Recovery Password" : "Обновување на Admin лозинката",
+    "Search Users and Groups" : "Барај корисници и групи",
+    "Add Group" : "Додади група",
+    "Group" : "Група",
+    "Everyone" : "Секој",
+    "Admins" : "Администратори",
+    "Default Quota" : "Предефинирана квота",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Останато",
+    "Username" : "Корисничко име",
+    "Quota" : "Квота",
+    "Storage Location" : "Локација на сториџот",
+    "Last Login" : "Последна најава",
+    "change full name" : "промена на целото име",
+    "set new password" : "постави нова лозинка",
+    "Default" : "Предефиниран"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
deleted file mode 100644
index f24fbd6e06d..00000000000
--- a/settings/l10n/mk.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Овозможен",
-"Authentication error" => "Грешка во автентикација",
-"Your full name has been changed." => "Вашето целосно име е променето.",
-"Unable to change full name" => "Не можам да го променам целото име",
-"Group already exists" => "Групата веќе постои",
-"Unable to add group" => "Неможе да додадам група",
-"Files decrypted successfully" => "Датотектие се успешно декриптирани",
-"Encryption keys deleted permanently" => "Енкрипциските клучеви се трајно избришани",
-"Email saved" => "Електронската пошта е снимена",
-"Invalid email" => "Неисправна електронска пошта",
-"Unable to delete group" => "Неможе да избришам група",
-"Unable to delete user" => "Неможам да избришам корисник",
-"Backups restored successfully" => "Бекапите се успешно реставрирани",
-"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" => "Нема корисничко име",
-"Unable to change password" => "Вашата лозинка неможе да се смени",
-"Saved" => "Снимено",
-"test email settings" => "провери ги нагодувањата за електронска пошта",
-"Email sent" => "Е-порака пратена",
-"Sending..." => "Испраќам...",
-"All" => "Сите",
-"Please wait...." => "Ве молам почекајте ...",
-"Error while disabling app" => "Грешка при исклучувањето на апликацијата",
-"Disable" => "Оневозможи",
-"Enable" => "Овозможи",
-"Error while enabling app" => "Грешка при вклучувањето на апликацијата",
-"Updating...." => "Надградувам ...",
-"Error while updating app" => "Грешка додека ја надградувам апликацијата",
-"Updated" => "Надграден",
-"Select a profile picture" => "Одбери фотографија за профилот",
-"Very weak password" => "Многу слаба лозинка",
-"Weak password" => "Слаба лозинка",
-"So-so password" => "Така така лозинка",
-"Good password" => "Добра лозинка",
-"Strong password" => "Јака лозинка",
-"Delete" => "Избриши",
-"Delete encryption keys permanently." => "Трајно бришење на енкрипциските клучеви.",
-"Restore encryption keys." => "Поврати ги енкрипцисиките клучеви.",
-"Groups" => "Групи",
-"Error creating group" => "Грешка при креирање на група",
-"A valid group name must be provided" => "Мора да се обезбеди валидно име на група",
-"undo" => "врати",
-"never" => "никогаш",
-"add group" => "додади група",
-"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
-"Error creating user" => "Грешка при креирање на корисникот",
-"A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL root сертификати",
-"Encryption" => "Енкрипција",
-"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" => "Безбедносно предупредување",
-"Setup Warning" => "Предупредување при подесување",
-"Database Performance Info" => "Информација за перформансите на базата на податоци",
-"Your PHP version is outdated" => "Вашаа верзија на PHP е застарена",
-"Locale not working" => "Локалето не функционира",
-"Cron" => "Крон",
-"Execute one task with each page loaded" => "Изврши по една задача со секоја вчитана страница",
-"Sharing" => "Споделување",
-"Allow apps to use the Share API" => "Дозволете апликациите да го користат API-то за споделување",
-"Allow users to share via link" => "Допушти корисниците да споделуваат со линкови",
-"Enforce password protection" => "Наметни заштита на лозинка",
-"Allow public uploads" => "Дозволи јавен аплоуд",
-"Set default expiration date" => "Постави основен датум на истекување",
-"Expire after " => "Истекува по",
-"days" => "денови",
-"Enforce expiration date" => "Наметни датум на траење",
-"Allow resharing" => "Овозможи повторно споделување",
-"Restrict users to only share with users in their groups" => "Ограничи корисниците да споделуваат со корисници во своите групи",
-"Exclude groups from sharing" => "Исклучи групи од споделување",
-"Security" => "Безбедност",
-"Enforce HTTPS" => "Наметни HTTPS",
-"Email Server" => "Сервер за електронска пошта",
-"This is used for sending out notifications." => "Ова се користи за испраќање на известувања.",
-"Send mode" => "Мод на испраќање",
-"From address" => "Од адреса",
-"mail" => "Електронска пошта",
-"Authentication method" => "Метод на автентификација",
-"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>.",
-"by" => "од",
-"Documentation:" => "Документација:",
-"User Documentation" => "Корисничка документација",
-"Admin Documentation" => "Админстраторска документација",
-"Enable only for specific groups" => "Овозможи само на специфицирани групи",
-"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" => "Моментална лозинка",
-"New password" => "Нова лозинка",
-"Change password" => "Смени лозинка",
-"Full Name" => "Цело име",
-"Email" => "Е-пошта",
-"Your email address" => "Вашата адреса за е-пошта",
-"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" => "Помогни во преводот",
-"Import Root Certificate" => "Увези",
-"Log-in password" => "Лозинка за најавување",
-"Decrypt all Files" => "Дешифрирај ги сите датотеки",
-"Restore Encryption Keys" => "Обнови ги енкрипциските клучеви",
-"Delete Encryption Keys" => "Избриши ги енкрипцисиките клучеви",
-"Login Name" => "Име за најава",
-"Create" => "Создај",
-"Admin Recovery Password" => "Обновување на Admin лозинката",
-"Search Users and Groups" => "Барај корисници и групи",
-"Add Group" => "Додади група",
-"Group" => "Група",
-"Everyone" => "Секој",
-"Admins" => "Администратори",
-"Default Quota" => "Предефинирана квота",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограничено",
-"Other" => "Останато",
-"Username" => "Корисничко име",
-"Quota" => "Квота",
-"Storage Location" => "Локација на сториџот",
-"Last Login" => "Последна најава",
-"change full name" => "промена на целото име",
-"set new password" => "постави нова лозинка",
-"Default" => "Предефиниран"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/settings/l10n/ms_MY.js b/settings/l10n/ms_MY.js
new file mode 100644
index 00000000000..e36bc5336e6
--- /dev/null
+++ b/settings/l10n/ms_MY.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Ralat pengesahan",
+    "Email saved" : "Emel disimpan",
+    "Invalid email" : "Emel tidak sah",
+    "Language changed" : "Bahasa diubah",
+    "Invalid request" : "Permintaan tidak sah",
+    "Disable" : "Nyahaktif",
+    "Enable" : "Aktif",
+    "Delete" : "Padam",
+    "Groups" : "Kumpulan",
+    "never" : "jangan",
+    "__language_name__" : "_nama_bahasa_",
+    "Login" : "Log masuk",
+    "Security Warning" : "Amaran keselamatan",
+    "Server address" : "Alamat pelayan",
+    "Log" : "Log",
+    "Log level" : "Tahap Log",
+    "More" : "Lanjutan",
+    "by" : "oleh",
+    "Password" : "Kata laluan",
+    "Unable to change your password" : "Gagal mengubah kata laluan anda ",
+    "Current password" : "Kata laluan semasa",
+    "New password" : "Kata laluan baru",
+    "Change password" : "Ubah kata laluan",
+    "Email" : "Email",
+    "Your email address" : "Alamat emel anda",
+    "Profile picture" : "Gambar profil",
+    "Cancel" : "Batal",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu terjemah",
+    "Login Name" : "Log masuk",
+    "Create" : "Buat",
+    "Default Quota" : "Kuota Lalai",
+    "Other" : "Lain",
+    "Username" : "Nama pengguna",
+    "Quota" : "Kuota"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ms_MY.json b/settings/l10n/ms_MY.json
new file mode 100644
index 00000000000..142db2bc620
--- /dev/null
+++ b/settings/l10n/ms_MY.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Authentication error" : "Ralat pengesahan",
+    "Email saved" : "Emel disimpan",
+    "Invalid email" : "Emel tidak sah",
+    "Language changed" : "Bahasa diubah",
+    "Invalid request" : "Permintaan tidak sah",
+    "Disable" : "Nyahaktif",
+    "Enable" : "Aktif",
+    "Delete" : "Padam",
+    "Groups" : "Kumpulan",
+    "never" : "jangan",
+    "__language_name__" : "_nama_bahasa_",
+    "Login" : "Log masuk",
+    "Security Warning" : "Amaran keselamatan",
+    "Server address" : "Alamat pelayan",
+    "Log" : "Log",
+    "Log level" : "Tahap Log",
+    "More" : "Lanjutan",
+    "by" : "oleh",
+    "Password" : "Kata laluan",
+    "Unable to change your password" : "Gagal mengubah kata laluan anda ",
+    "Current password" : "Kata laluan semasa",
+    "New password" : "Kata laluan baru",
+    "Change password" : "Ubah kata laluan",
+    "Email" : "Email",
+    "Your email address" : "Alamat emel anda",
+    "Profile picture" : "Gambar profil",
+    "Cancel" : "Batal",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu terjemah",
+    "Login Name" : "Log masuk",
+    "Create" : "Buat",
+    "Default Quota" : "Kuota Lalai",
+    "Other" : "Lain",
+    "Username" : "Nama pengguna",
+    "Quota" : "Kuota"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
deleted file mode 100644
index c20dcae9ea0..00000000000
--- a/settings/l10n/ms_MY.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Ralat pengesahan",
-"Email saved" => "Emel disimpan",
-"Invalid email" => "Emel tidak sah",
-"Language changed" => "Bahasa diubah",
-"Invalid request" => "Permintaan tidak sah",
-"Disable" => "Nyahaktif",
-"Enable" => "Aktif",
-"Delete" => "Padam",
-"Groups" => "Kumpulan",
-"never" => "jangan",
-"__language_name__" => "_nama_bahasa_",
-"Login" => "Log masuk",
-"Security Warning" => "Amaran keselamatan",
-"Server address" => "Alamat pelayan",
-"Log" => "Log",
-"Log level" => "Tahap Log",
-"More" => "Lanjutan",
-"by" => "oleh",
-"Password" => "Kata laluan",
-"Unable to change your password" => "Gagal mengubah kata laluan anda ",
-"Current password" => "Kata laluan semasa",
-"New password" => "Kata laluan baru",
-"Change password" => "Ubah kata laluan",
-"Email" => "Email",
-"Your email address" => "Alamat emel anda",
-"Profile picture" => "Gambar profil",
-"Cancel" => "Batal",
-"Language" => "Bahasa",
-"Help translate" => "Bantu terjemah",
-"Login Name" => "Log masuk",
-"Create" => "Buat",
-"Default Quota" => "Kuota Lalai",
-"Other" => "Lain",
-"Username" => "Nama pengguna",
-"Quota" => "Kuota"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/my_MM.js b/settings/l10n/my_MM.js
new file mode 100644
index 00000000000..f0a5641383f
--- /dev/null
+++ b/settings/l10n/my_MM.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Invalid request" : "တောင်းဆိုချက်မမှန်ကန်ပါ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Password" : "စကားဝှက်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Username" : "သုံးစွဲသူအမည်"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/my_MM.json b/settings/l10n/my_MM.json
new file mode 100644
index 00000000000..49ea1e9baf0
--- /dev/null
+++ b/settings/l10n/my_MM.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Invalid request" : "တောင်းဆိုချက်မမှန်ကန်ပါ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Password" : "စကားဝှက်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Username" : "သုံးစွဲသူအမည်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
deleted file mode 100644
index 070e4dd73bc..00000000000
--- a/settings/l10n/my_MM.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
-"Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
-"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
-"Password" => "စကားဝှက်",
-"New password" => "စကားဝှက်အသစ်",
-"Cancel" => "ပယ်ဖျက်မည်",
-"Username" => "သုံးစွဲသူအမည်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
new file mode 100644
index 00000000000..1fc843d3445
--- /dev/null
+++ b/settings/l10n/nb_NO.js
@@ -0,0 +1,229 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiv",
+    "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",
+    "Files decrypted successfully" : "Dekryptering av filer vellykket",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
+    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't remove app." : "Klarte ikke å fjerne app.",
+    "Email saved" : "Epost lagret",
+    "Invalid email" : "Ugyldig epost",
+    "Unable to delete group" : "Kan ikke slette gruppe",
+    "Unable to delete user" : "Kan ikke slette bruker",
+    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
+    "Language changed" : "Språk endret",
+    "Invalid request" : "Ugyldig forespørsel",
+    "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
+    "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",
+    "Saved" : "Lagret",
+    "test email settings" : "Test av innstillinger for e-post",
+    "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
+    "Email sent" : "E-post sendt",
+    "You need to set your user email before being able to send test emails." : "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
+    "Add trusted domain" : "Legg til et tiltrodd domene",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vennligst vent...",
+    "Error while disabling app" : "Deaktivering av app feilet",
+    "Disable" : "Deaktiver ",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Aktivering av app feilet",
+    "Updating...." : "Oppdaterer...",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Uninstalling ...." : "Avinstallerer ....",
+    "Error while uninstalling app" : "Feil ved avinstallering av app",
+    "Uninstall" : "Avinstaller",
+    "Select a profile picture" : "Velg et profilbilde",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Valid until {date}" : "Gyldig til {date}",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
+    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
+    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kan ikke slette {objName}",
+    "Error creating group" : "Feil ved oppretting av gruppe",
+    "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis",
+    "deleted {groupName}" : "slettet {groupName}",
+    "undo" : "angre",
+    "never" : "aldri",
+    "deleted {userName}" : "slettet {userName}",
+    "add group" : "legg til gruppe",
+    "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__",
+    "SSL root certificates" : "SSL rotsertifikater",
+    "Encryption" : "Kryptering",
+    "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",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
+    "Database Performance Info" : "Info om database-ytelse",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
+    "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.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Nasjonale innstillinger 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.",
+    "URL generation in notification emails" : "URL-generering i varsel-eposter",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
+    "Connectivity checks" : "Sjekk av tilkobling",
+    "No problems found" : "Ingen problemer funnet",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Siste cron ble utført %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "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 system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
+    "Allow users to share via link" : "Tillat brukere å dele via lenke",
+    "Enforce password protection" : "Tving passordbeskyttelse",
+    "Allow public uploads" : "Tillat offentlig opplasting",
+    "Set default expiration date" : "Sett standard utløpsdato",
+    "Expire after " : "Utløper etter",
+    "days" : "dager",
+    "Enforce expiration date" : "Tving utløpsdato",
+    "Allow resharing" : "TIllat videre deling",
+    "Restrict users to only share with users in their groups" : "Begrens brukere til kun å dele med brukere i deres grupper",
+    "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
+    "Exclude groups from sharing" : "Utelukk grupper fra deling",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
+    "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.",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Log" : "Logg",
+    "Log level" : "Loggnivå",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Versjon",
+    "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>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "Documentation:" : "Dokumentasjon:",
+    "User Documentation" : "Brukerdokumentasjon",
+    "Admin Documentation" : "Admin-dokumentasjon",
+    "Enable only for specific groups" : "Aktiver kun for visse grupper",
+    "Uninstall App" : "Avinstaller app",
+    "Administrator Documentation" : "Dokumentasjon for administratorer",
+    "Online Documentation" : "Online dokumentasjon",
+    "Forum" : "Forum",
+    "Bugtracker" : "Innmelding og sporing av feil",
+    "Commercial Support" : "Forretningsstøtte",
+    "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
+    "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passord har blitt endret",
+    "Unable to change your password" : "Kunne ikke endre passordet ditt",
+    "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 and receive notifications" : "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
+    "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",
+    "Common Name" : "Vanlig navn",
+    "Valid until" : "Gyldig til",
+    "Issued By" : "Utstedt av",
+    "Valid until %s" : "Gyldig til %s",
+    "Import Root Certificate" : "Importer rotsertifikat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
+    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
+    "Delete Encryption Keys" : "Slett krypteringsnøkler",
+    "Show storage location" : "Vis lagringssted",
+    "Show last log in" : "Vis site innlogging",
+    "Login Name" : "Brukernavn",
+    "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",
+    "Search Users and Groups" : "Søk i brukere og grupper",
+    "Add Group" : "Legg til gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratorer",
+    "Default Quota" : "Standard kvote",
+    "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",
+    "Quota" : "Kvote",
+    "Storage Location" : "Lagringsplassering",
+    "Last Login" : "Siste innlogging",
+    "change full name" : "endre fullt navn",
+    "set new password" : "sett nytt passord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
new file mode 100644
index 00000000000..c86056e7462
--- /dev/null
+++ b/settings/l10n/nb_NO.json
@@ -0,0 +1,227 @@
+{ "translations": {
+    "Enabled" : "Aktiv",
+    "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",
+    "Files decrypted successfully" : "Dekryptering av filer vellykket",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
+    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't remove app." : "Klarte ikke å fjerne app.",
+    "Email saved" : "Epost lagret",
+    "Invalid email" : "Ugyldig epost",
+    "Unable to delete group" : "Kan ikke slette gruppe",
+    "Unable to delete user" : "Kan ikke slette bruker",
+    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
+    "Language changed" : "Språk endret",
+    "Invalid request" : "Ugyldig forespørsel",
+    "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
+    "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",
+    "Saved" : "Lagret",
+    "test email settings" : "Test av innstillinger for e-post",
+    "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
+    "Email sent" : "E-post sendt",
+    "You need to set your user email before being able to send test emails." : "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
+    "Add trusted domain" : "Legg til et tiltrodd domene",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vennligst vent...",
+    "Error while disabling app" : "Deaktivering av app feilet",
+    "Disable" : "Deaktiver ",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Aktivering av app feilet",
+    "Updating...." : "Oppdaterer...",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Uninstalling ...." : "Avinstallerer ....",
+    "Error while uninstalling app" : "Feil ved avinstallering av app",
+    "Uninstall" : "Avinstaller",
+    "Select a profile picture" : "Velg et profilbilde",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Valid until {date}" : "Gyldig til {date}",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
+    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
+    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kan ikke slette {objName}",
+    "Error creating group" : "Feil ved oppretting av gruppe",
+    "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis",
+    "deleted {groupName}" : "slettet {groupName}",
+    "undo" : "angre",
+    "never" : "aldri",
+    "deleted {userName}" : "slettet {userName}",
+    "add group" : "legg til gruppe",
+    "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__",
+    "SSL root certificates" : "SSL rotsertifikater",
+    "Encryption" : "Kryptering",
+    "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",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
+    "Database Performance Info" : "Info om database-ytelse",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
+    "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.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Nasjonale innstillinger 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.",
+    "URL generation in notification emails" : "URL-generering i varsel-eposter",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
+    "Connectivity checks" : "Sjekk av tilkobling",
+    "No problems found" : "Ingen problemer funnet",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Siste cron ble utført %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "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 system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
+    "Allow users to share via link" : "Tillat brukere å dele via lenke",
+    "Enforce password protection" : "Tving passordbeskyttelse",
+    "Allow public uploads" : "Tillat offentlig opplasting",
+    "Set default expiration date" : "Sett standard utløpsdato",
+    "Expire after " : "Utløper etter",
+    "days" : "dager",
+    "Enforce expiration date" : "Tving utløpsdato",
+    "Allow resharing" : "TIllat videre deling",
+    "Restrict users to only share with users in their groups" : "Begrens brukere til kun å dele med brukere i deres grupper",
+    "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
+    "Exclude groups from sharing" : "Utelukk grupper fra deling",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
+    "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.",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Log" : "Logg",
+    "Log level" : "Loggnivå",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Versjon",
+    "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>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "Documentation:" : "Dokumentasjon:",
+    "User Documentation" : "Brukerdokumentasjon",
+    "Admin Documentation" : "Admin-dokumentasjon",
+    "Enable only for specific groups" : "Aktiver kun for visse grupper",
+    "Uninstall App" : "Avinstaller app",
+    "Administrator Documentation" : "Dokumentasjon for administratorer",
+    "Online Documentation" : "Online dokumentasjon",
+    "Forum" : "Forum",
+    "Bugtracker" : "Innmelding og sporing av feil",
+    "Commercial Support" : "Forretningsstøtte",
+    "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
+    "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passord har blitt endret",
+    "Unable to change your password" : "Kunne ikke endre passordet ditt",
+    "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 and receive notifications" : "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
+    "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",
+    "Common Name" : "Vanlig navn",
+    "Valid until" : "Gyldig til",
+    "Issued By" : "Utstedt av",
+    "Valid until %s" : "Gyldig til %s",
+    "Import Root Certificate" : "Importer rotsertifikat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
+    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
+    "Delete Encryption Keys" : "Slett krypteringsnøkler",
+    "Show storage location" : "Vis lagringssted",
+    "Show last log in" : "Vis site innlogging",
+    "Login Name" : "Brukernavn",
+    "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",
+    "Search Users and Groups" : "Søk i brukere og grupper",
+    "Add Group" : "Legg til gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratorer",
+    "Default Quota" : "Standard kvote",
+    "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",
+    "Quota" : "Kvote",
+    "Storage Location" : "Lagringsplassering",
+    "Last Login" : "Siste innlogging",
+    "change full name" : "endre fullt navn",
+    "set new password" : "sett nytt passord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
deleted file mode 100644
index 08e1a3dbc60..00000000000
--- a/settings/l10n/nb_NO.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiv",
-"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",
-"Files decrypted successfully" => "Dekryptering av filer vellykket",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
-"Couldn't decrypt your files, check your password and try again" => "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
-"Encryption keys deleted permanently" => "Krypteringsnøkler permanent slettet",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
-"Couldn't remove app." => "Klarte ikke å fjerne app.",
-"Email saved" => "Epost lagret",
-"Invalid email" => "Ugyldig epost",
-"Unable to delete group" => "Kan ikke slette gruppe",
-"Unable to delete user" => "Kan ikke slette bruker",
-"Backups restored successfully" => "Vellykket gjenoppretting fra sikkerhetskopier",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
-"Language changed" => "Språk endret",
-"Invalid request" => "Ugyldig forespørsel",
-"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
-"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",
-"Saved" => "Lagret",
-"test email settings" => "Test av innstillinger for e-post",
-"If you received this email, the settings seem to be correct." => "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
-"Email sent" => "E-post sendt",
-"You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
-"Add trusted domain" => "Legg til et tiltrodd domene",
-"Sending..." => "Sender...",
-"All" => "Alle",
-"Please wait...." => "Vennligst vent...",
-"Error while disabling app" => "Deaktivering av app feilet",
-"Disable" => "Deaktiver ",
-"Enable" => "Aktiver",
-"Error while enabling app" => "Aktivering av app feilet",
-"Updating...." => "Oppdaterer...",
-"Error while updating app" => "Feil ved oppdatering av app",
-"Updated" => "Oppdatert",
-"Uninstalling ...." => "Avinstallerer ....",
-"Error while uninstalling app" => "Feil ved avinstallering av app",
-"Uninstall" => "Avinstaller",
-"Select a profile picture" => "Velg et profilbilde",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"So-so password" => "So-so-passord",
-"Good password" => "Bra passord",
-"Strong password" => "Sterkt passord",
-"Valid until {date}" => "Gyldig til {date}",
-"Delete" => "Slett",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
-"Delete encryption keys permanently." => "Slett krypteringsnøkler permanent.",
-"Restore encryption keys." => "Gjenopprett krypteringsnøkler.",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kan ikke slette {objName}",
-"Error creating group" => "Feil ved oppretting av gruppe",
-"A valid group name must be provided" => "Et gyldig gruppenavn må oppgis",
-"deleted {groupName}" => "slettet {groupName}",
-"undo" => "angre",
-"never" => "aldri",
-"deleted {userName}" => "slettet {userName}",
-"add group" => "legg til gruppe",
-"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__",
-"SSL root certificates" => "SSL rotsertifikater",
-"Encryption" => "Kryptering",
-"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",
-"Plain" => "Enkel",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
-"Database Performance Info" => "Info om database-ytelse",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
-"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.",
-"PHP charset is not set to UTF-8" => "PHP-tegnsett er ikke satt til UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
-"Locale not working" => "Nasjonale innstillinger 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.",
-"URL generation in notification emails" => "URL-generering i varsel-eposter",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Hvis installasjonen din ikke er installert i roten av domenet og bruker system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
-"Connectivity checks" => "Sjekk av tilkobling",
-"No problems found" => "Ingen problemer funnet",
-"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Siste cron ble utført %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
-"Cron was not executed yet!" => "Cron er ikke utført ennå!",
-"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 system's cron service to call the cron.php file every 15 minutes." => "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-"Sharing" => "Deling",
-"Allow apps to use the Share API" => "Tillat apper å bruke API for Deling",
-"Allow users to share via link" => "Tillat brukere å dele via lenke",
-"Enforce password protection" => "Tving passordbeskyttelse",
-"Allow public uploads" => "Tillat offentlig opplasting",
-"Set default expiration date" => "Sett standard utløpsdato",
-"Expire after " => "Utløper etter",
-"days" => "dager",
-"Enforce expiration date" => "Tving utløpsdato",
-"Allow resharing" => "TIllat videre deling",
-"Restrict users to only share with users in their groups" => "Begrens brukere til kun å dele med brukere i deres grupper",
-"Allow users to send mail notification for shared files" => "Tlllat at brukere sender e-postvarsler for delte filer",
-"Exclude groups from sharing" => "Utelukk grupper fra deling",
-"These groups will still be able to receive shares, but not to initiate them." => "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
-"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.",
-"Email Server" => "E-postserver",
-"This is used for sending out notifications." => "Dette brukes for utsending av varsler.",
-"Send mode" => "Sendemåte",
-"From address" => "Fra adresse",
-"mail" => "e-post",
-"Authentication method" => "Autentiseringsmetode",
-"Authentication required" => "Autentisering kreves",
-"Server address" => "Server-adresse",
-"Port" => "Port",
-"Credentials" => "Påloggingsdetaljer",
-"SMTP Username" => "SMTP-brukernavn",
-"SMTP Password" => "SMTP-passord",
-"Test email settings" => "Test innstillinger for e-post",
-"Send email" => "Send e-post",
-"Log" => "Logg",
-"Log level" => "Loggnivå",
-"More" => "Mer",
-"Less" => "Mindre",
-"Version" => "Versjon",
-"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>." => "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "av",
-"Documentation:" => "Dokumentasjon:",
-"User Documentation" => "Brukerdokumentasjon",
-"Admin Documentation" => "Admin-dokumentasjon",
-"Enable only for specific groups" => "Aktiver kun for visse grupper",
-"Uninstall App" => "Avinstaller app",
-"Administrator Documentation" => "Dokumentasjon for administratorer",
-"Online Documentation" => "Online dokumentasjon",
-"Forum" => "Forum",
-"Bugtracker" => "Innmelding og sporing av feil",
-"Commercial Support" => "Forretningsstøtte",
-"Get the apps to sync your files" => "Hent apper som synkroniserer filene dine",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
-"Show First Run Wizard again" => "Vis \"Førstegangs veiviser\" på nytt",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
-"Password" => "Passord",
-"Your password was changed" => "Passord har blitt endret",
-"Unable to change your password" => "Kunne ikke endre passordet ditt",
-"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 and receive notifications" => "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
-"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",
-"Common Name" => "Vanlig navn",
-"Valid until" => "Gyldig til",
-"Issued By" => "Utstedt av",
-"Valid until %s" => "Gyldig til %s",
-"Import Root Certificate" => "Importer rotsertifikat",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
-"Restore Encryption Keys" => "Gjenopprett krypteringsnøkler",
-"Delete Encryption Keys" => "Slett krypteringsnøkler",
-"Show storage location" => "Vis lagringssted",
-"Show last log in" => "Vis site innlogging",
-"Login Name" => "Brukernavn",
-"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",
-"Search Users and Groups" => "Søk i brukere og grupper",
-"Add Group" => "Legg til gruppe",
-"Group" => "Gruppe",
-"Everyone" => "Alle",
-"Admins" => "Administratorer",
-"Default Quota" => "Standard kvote",
-"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",
-"Quota" => "Kvote",
-"Storage Location" => "Lagringsplassering",
-"Last Login" => "Siste innlogging",
-"change full name" => "endre fullt navn",
-"set new password" => "sett nytt passord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
new file mode 100644
index 00000000000..1b160c2bbe9
--- /dev/null
+++ b/settings/l10n/nl.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
+    "Authentication error" : "Authenticatie fout",
+    "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
+    "Unable to change full name" : "Kan de volledige naam niet wijzigen",
+    "Group already exists" : "Groep bestaat al",
+    "Unable to add group" : "Niet in staat om groep toe te voegen",
+    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
+    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+    "Couldn't remove app." : "Kon app niet verwijderen.",
+    "Email saved" : "E-mail bewaard",
+    "Invalid email" : "Ongeldige e-mail",
+    "Unable to delete group" : "Niet in staat om groep te verwijderen",
+    "Unable to delete user" : "Niet in staat om gebruiker te verwijderen",
+    "Backups restored successfully" : "Backup succesvol terggezet",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
+    "Language changed" : "Taal aangepast",
+    "Invalid request" : "Ongeldige aanvraag",
+    "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
+    "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
+    "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
+    "Couldn't update app." : "Kon de app niet bijwerken.",
+    "Wrong password" : "Onjuist wachtwoord",
+    "No user supplied" : "Geen gebruiker opgegeven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
+    "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",
+    "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 email. Please revise 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 invoeren voordat u testberichten kunt versturen.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Add trusted domain" : "Vertrouwd domein toevoegen",
+    "Sending..." : "Versturen...",
+    "All" : "Alle",
+    "Please wait...." : "Even geduld aub....",
+    "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
+    "Disable" : "Uitschakelen",
+    "Enable" : "Activeer",
+    "Error while enabling app" : "Fout tijdens het aanzetten van het programma",
+    "Updating...." : "Bijwerken....",
+    "Error while updating app" : "Fout bij bijwerken app",
+    "Updated" : "Bijgewerkt",
+    "Uninstalling ...." : "De-installeren ...",
+    "Error while uninstalling app" : "Fout bij de-installeren app",
+    "Uninstall" : "De-installeren",
+    "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",
+    "Valid until {date}" : "Geldig tot {date}",
+    "Delete" : "Verwijder",
+    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
+    "Restore encryption keys." : "Herstel de encryptiesleutels",
+    "Groups" : "Groepen",
+    "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
+    "Error creating group" : "Fout bij aanmaken groep",
+    "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven",
+    "deleted {groupName}" : "verwijderd {groupName}",
+    "undo" : "ongedaan maken",
+    "no group" : "geen groep",
+    "never" : "geen",
+    "deleted {userName}" : "verwijderd {userName}",
+    "add group" : "toevoegen groep",
+    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
+    "Error creating user" : "Fout bij aanmaken gebruiker",
+    "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
+    "Warning: Home directory for user \"{user}\" already exists" : "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
+    "__language_name__" : "Nederlands",
+    "Personal Info" : "Persoonlijke info",
+    "SSL root certificates" : "SSL root certificaten",
+    "Encryption" : "Versleuteling",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
+    "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 alleen 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.",
+    "Setup Warning" : "Instellingswaarschuwing",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
+    "Your PHP version is outdated" : "Uw PHP versie is verouderd",
+    "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." : "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
+    "PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
+    "Locale not working" : "Taalbestand werkt niet",
+    "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
+    "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
+    "URL generation in notification emails" : "URL genereren in notificatie e-mails",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity checks" : "Verbindingscontroles",
+    "No problems found" : "Geen problemen gevonden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
+    "Sharing" : "Delen",
+    "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
+    "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
+    "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
+    "Allow public uploads" : "Sta publieke uploads toe",
+    "Set default expiration date" : "Stel standaard vervaldatum in",
+    "Expire after " : "Vervalt na",
+    "days" : "dagen",
+    "Enforce expiration date" : "Verplicht de vervaldatum",
+    "Allow resharing" : "Toestaan opnieuw delen",
+    "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
+    "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
+    "Exclude groups from sharing" : "Sluit groepen uit van delen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
+    "Security" : "Beveiliging",
+    "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.",
+    "Send mode" : "Verstuurmodus",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "Version" : "Versie",
+    "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>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Meer applicaties",
+    "Add your app" : "Voeg uw app toe",
+    "by" : "door",
+    "licensed" : "gelicenseerd",
+    "Documentation:" : "Documentatie:",
+    "User Documentation" : "Gebruikersdocumentatie",
+    "Admin Documentation" : "Beheerdocumentatie",
+    "Update to %s" : "Bijgewerkt naar %s",
+    "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
+    "Uninstall App" : "De-installeren app",
+    "Administrator Documentation" : "Beheerdersdocumentatie",
+    "Online Documentation" : "Online documentatie",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commerciële ondersteuning",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
+    "Password" : "Wachtwoord",
+    "Your password was changed" : "Je wachtwoord is veranderd",
+    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
+    "Current password" : "Huidig wachtwoord",
+    "New password" : "Nieuw",
+    "Change password" : "Wijzig wachtwoord",
+    "Full Name" : "Volledige naam",
+    "Email" : "E-mailadres",
+    "Your email address" : "Uw e-mailadres",
+    "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres 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 de afbeelding bijsnijden.",
+    "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
+    "Cancel" : "Annuleer",
+    "Choose as profile image" : "Kies als profielafbeelding",
+    "Language" : "Taal",
+    "Help translate" : "Help met vertalen",
+    "Common Name" : "Common Name",
+    "Valid until" : "Geldig tot",
+    "Issued By" : "Uitgegeven door",
+    "Valid until %s" : "Geldig tot %s",
+    "Import Root Certificate" : "Importeer root certificaat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+    "Restore Encryption Keys" : "Herstel cryptosleutels",
+    "Delete Encryption Keys" : "Verwijder cryptosleutels",
+    "Show storage location" : "Toon opslaglocatie",
+    "Show last log in" : "Toon laatste inlog",
+    "Login Name" : "Inlognaam",
+    "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",
+    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
+    "Add Group" : "Toevoegen groep",
+    "Group" : "Groep",
+    "Everyone" : "Iedereen",
+    "Admins" : "Beheerders",
+    "Default Quota" : "Standaard limiet",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
+    "Unlimited" : "Ongelimiteerd",
+    "Other" : "Anders",
+    "Username" : "Gebruikersnaam",
+    "Group Admin for" : "Groepsbeheerder voor",
+    "Quota" : "Limieten",
+    "Storage Location" : "Opslaglocatie",
+    "Last Login" : "Laatste inlog",
+    "change full name" : "wijzigen volledige naam",
+    "set new password" : "Instellen nieuw wachtwoord",
+    "Default" : "Standaard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
new file mode 100644
index 00000000000..9a94c74f420
--- /dev/null
+++ b/settings/l10n/nl.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
+    "Authentication error" : "Authenticatie fout",
+    "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
+    "Unable to change full name" : "Kan de volledige naam niet wijzigen",
+    "Group already exists" : "Groep bestaat al",
+    "Unable to add group" : "Niet in staat om groep toe te voegen",
+    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
+    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+    "Couldn't remove app." : "Kon app niet verwijderen.",
+    "Email saved" : "E-mail bewaard",
+    "Invalid email" : "Ongeldige e-mail",
+    "Unable to delete group" : "Niet in staat om groep te verwijderen",
+    "Unable to delete user" : "Niet in staat om gebruiker te verwijderen",
+    "Backups restored successfully" : "Backup succesvol terggezet",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
+    "Language changed" : "Taal aangepast",
+    "Invalid request" : "Ongeldige aanvraag",
+    "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
+    "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
+    "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
+    "Couldn't update app." : "Kon de app niet bijwerken.",
+    "Wrong password" : "Onjuist wachtwoord",
+    "No user supplied" : "Geen gebruiker opgegeven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
+    "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",
+    "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 email. Please revise 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 invoeren voordat u testberichten kunt versturen.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Add trusted domain" : "Vertrouwd domein toevoegen",
+    "Sending..." : "Versturen...",
+    "All" : "Alle",
+    "Please wait...." : "Even geduld aub....",
+    "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
+    "Disable" : "Uitschakelen",
+    "Enable" : "Activeer",
+    "Error while enabling app" : "Fout tijdens het aanzetten van het programma",
+    "Updating...." : "Bijwerken....",
+    "Error while updating app" : "Fout bij bijwerken app",
+    "Updated" : "Bijgewerkt",
+    "Uninstalling ...." : "De-installeren ...",
+    "Error while uninstalling app" : "Fout bij de-installeren app",
+    "Uninstall" : "De-installeren",
+    "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",
+    "Valid until {date}" : "Geldig tot {date}",
+    "Delete" : "Verwijder",
+    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
+    "Restore encryption keys." : "Herstel de encryptiesleutels",
+    "Groups" : "Groepen",
+    "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
+    "Error creating group" : "Fout bij aanmaken groep",
+    "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven",
+    "deleted {groupName}" : "verwijderd {groupName}",
+    "undo" : "ongedaan maken",
+    "no group" : "geen groep",
+    "never" : "geen",
+    "deleted {userName}" : "verwijderd {userName}",
+    "add group" : "toevoegen groep",
+    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
+    "Error creating user" : "Fout bij aanmaken gebruiker",
+    "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
+    "Warning: Home directory for user \"{user}\" already exists" : "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
+    "__language_name__" : "Nederlands",
+    "Personal Info" : "Persoonlijke info",
+    "SSL root certificates" : "SSL root certificaten",
+    "Encryption" : "Versleuteling",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
+    "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 alleen 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.",
+    "Setup Warning" : "Instellingswaarschuwing",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
+    "Your PHP version is outdated" : "Uw PHP versie is verouderd",
+    "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." : "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
+    "PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
+    "Locale not working" : "Taalbestand werkt niet",
+    "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
+    "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
+    "URL generation in notification emails" : "URL genereren in notificatie e-mails",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity checks" : "Verbindingscontroles",
+    "No problems found" : "Geen problemen gevonden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
+    "Sharing" : "Delen",
+    "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
+    "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
+    "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
+    "Allow public uploads" : "Sta publieke uploads toe",
+    "Set default expiration date" : "Stel standaard vervaldatum in",
+    "Expire after " : "Vervalt na",
+    "days" : "dagen",
+    "Enforce expiration date" : "Verplicht de vervaldatum",
+    "Allow resharing" : "Toestaan opnieuw delen",
+    "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
+    "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
+    "Exclude groups from sharing" : "Sluit groepen uit van delen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
+    "Security" : "Beveiliging",
+    "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.",
+    "Send mode" : "Verstuurmodus",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "Version" : "Versie",
+    "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>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Meer applicaties",
+    "Add your app" : "Voeg uw app toe",
+    "by" : "door",
+    "licensed" : "gelicenseerd",
+    "Documentation:" : "Documentatie:",
+    "User Documentation" : "Gebruikersdocumentatie",
+    "Admin Documentation" : "Beheerdocumentatie",
+    "Update to %s" : "Bijgewerkt naar %s",
+    "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
+    "Uninstall App" : "De-installeren app",
+    "Administrator Documentation" : "Beheerdersdocumentatie",
+    "Online Documentation" : "Online documentatie",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commerciële ondersteuning",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
+    "Password" : "Wachtwoord",
+    "Your password was changed" : "Je wachtwoord is veranderd",
+    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
+    "Current password" : "Huidig wachtwoord",
+    "New password" : "Nieuw",
+    "Change password" : "Wijzig wachtwoord",
+    "Full Name" : "Volledige naam",
+    "Email" : "E-mailadres",
+    "Your email address" : "Uw e-mailadres",
+    "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres 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 de afbeelding bijsnijden.",
+    "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
+    "Cancel" : "Annuleer",
+    "Choose as profile image" : "Kies als profielafbeelding",
+    "Language" : "Taal",
+    "Help translate" : "Help met vertalen",
+    "Common Name" : "Common Name",
+    "Valid until" : "Geldig tot",
+    "Issued By" : "Uitgegeven door",
+    "Valid until %s" : "Geldig tot %s",
+    "Import Root Certificate" : "Importeer root certificaat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+    "Restore Encryption Keys" : "Herstel cryptosleutels",
+    "Delete Encryption Keys" : "Verwijder cryptosleutels",
+    "Show storage location" : "Toon opslaglocatie",
+    "Show last log in" : "Toon laatste inlog",
+    "Login Name" : "Inlognaam",
+    "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",
+    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
+    "Add Group" : "Toevoegen groep",
+    "Group" : "Groep",
+    "Everyone" : "Iedereen",
+    "Admins" : "Beheerders",
+    "Default Quota" : "Standaard limiet",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
+    "Unlimited" : "Ongelimiteerd",
+    "Other" : "Anders",
+    "Username" : "Gebruikersnaam",
+    "Group Admin for" : "Groepsbeheerder voor",
+    "Quota" : "Limieten",
+    "Storage Location" : "Opslaglocatie",
+    "Last Login" : "Laatste inlog",
+    "change full name" : "wijzigen volledige naam",
+    "set new password" : "Instellen nieuw wachtwoord",
+    "Default" : "Standaard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
deleted file mode 100644
index 081dc50c80e..00000000000
--- a/settings/l10n/nl.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Geactiveerd",
-"Not enabled" => "Niet ingeschakeld",
-"Recommended" => "Aanbevolen",
-"Authentication error" => "Authenticatie fout",
-"Your full name has been changed." => "Uw volledige naam is gewijzigd.",
-"Unable to change full name" => "Kan de volledige naam niet wijzigen",
-"Group already exists" => "Groep bestaat al",
-"Unable to add group" => "Niet in staat om groep toe te voegen",
-"Files decrypted successfully" => "Bestanden succesvol ontsleuteld",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
-"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
-"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
-"Couldn't remove app." => "Kon app niet verwijderen.",
-"Email saved" => "E-mail bewaard",
-"Invalid email" => "Ongeldige e-mail",
-"Unable to delete group" => "Niet in staat om groep te verwijderen",
-"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
-"Backups restored successfully" => "Backup succesvol terggezet",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
-"Language changed" => "Taal aangepast",
-"Invalid request" => "Ongeldige aanvraag",
-"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
-"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
-"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
-"Couldn't update app." => "Kon de app niet bijwerken.",
-"Wrong password" => "Onjuist wachtwoord",
-"No user supplied" => "Geen gebruiker opgegeven",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
-"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",
-"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 email. Please revise 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 invoeren voordat u testberichten kunt versturen.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
-"Add trusted domain" => "Vertrouwd domein toevoegen",
-"Sending..." => "Versturen...",
-"All" => "Alle",
-"Please wait...." => "Even geduld aub....",
-"Error while disabling app" => "Fout tijdens het uitzetten van het programma",
-"Disable" => "Uitschakelen",
-"Enable" => "Activeer",
-"Error while enabling app" => "Fout tijdens het aanzetten van het programma",
-"Updating...." => "Bijwerken....",
-"Error while updating app" => "Fout bij bijwerken app",
-"Updated" => "Bijgewerkt",
-"Uninstalling ...." => "De-installeren ...",
-"Error while uninstalling app" => "Fout bij de-installeren app",
-"Uninstall" => "De-installeren",
-"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",
-"Valid until {date}" => "Geldig tot {date}",
-"Delete" => "Verwijder",
-"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-"Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent",
-"Restore encryption keys." => "Herstel de encryptiesleutels",
-"Groups" => "Groepen",
-"Unable to delete {objName}" => "Kan {objName} niet verwijderen",
-"Error creating group" => "Fout bij aanmaken groep",
-"A valid group name must be provided" => "Er moet een geldige groepsnaam worden opgegeven",
-"deleted {groupName}" => "verwijderd {groupName}",
-"undo" => "ongedaan maken",
-"no group" => "geen groep",
-"never" => "geen",
-"deleted {userName}" => "verwijderd {userName}",
-"add group" => "toevoegen groep",
-"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
-"Error creating user" => "Fout bij aanmaken gebruiker",
-"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
-"Warning: Home directory for user \"{user}\" already exists" => "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
-"__language_name__" => "Nederlands",
-"Personal Info" => "Persoonlijke info",
-"SSL root certificates" => "SSL root certificaten",
-"Encryption" => "Versleuteling",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, waarschuwingen, fouten en fatale problemen",
-"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 alleen 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.",
-"Setup Warning" => "Instellingswaarschuwing",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
-"Database Performance Info" => "Database Performance Info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
-"Your PHP version is outdated" => "Uw PHP versie is verouderd",
-"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." => "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
-"PHP charset is not set to UTF-8" => "PHP characterset is niet ingesteld op UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
-"Locale not working" => "Taalbestand werkt niet",
-"System locale can not be set to a one which supports UTF-8." => "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
-"This means that there might be problems with certain characters in file names." => "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
-"URL generation in notification emails" => "URL genereren in notificatie e-mails",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
-"Connectivity checks" => "Verbindingscontroles",
-"No problems found" => "Geen problemen gevonden",
-"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Laatst uitgevoerde cron op %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
-"Cron was not executed yet!" => "Cron is nog niet uitgevoerd!",
-"Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-"Sharing" => "Delen",
-"Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
-"Allow users to share via link" => "Sta gebruikers toe om te delen via een link",
-"Enforce password protection" => "Dwing wachtwoordbeveiliging af",
-"Allow public uploads" => "Sta publieke uploads toe",
-"Set default expiration date" => "Stel standaard vervaldatum in",
-"Expire after " => "Vervalt na",
-"days" => "dagen",
-"Enforce expiration date" => "Verplicht de vervaldatum",
-"Allow resharing" => "Toestaan opnieuw delen",
-"Restrict users to only share with users in their groups" => "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
-"Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
-"Exclude groups from sharing" => "Sluit groepen uit van delen",
-"These groups will still be able to receive shares, but not to initiate them." => "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
-"Security" => "Beveiliging",
-"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.",
-"Send mode" => "Verstuurmodus",
-"From address" => "Afzenderadres",
-"mail" => "e-mail",
-"Authentication method" => "Authenticatiemethode",
-"Authentication required" => "Authenticatie vereist",
-"Server address" => "Server adres",
-"Port" => "Poort",
-"Credentials" => "Inloggegevens",
-"SMTP Username" => "SMTP gebruikersnaam",
-"SMTP Password" => "SMTP wachtwoord",
-"Store credentials" => "Opslaan inloggegevens",
-"Test email settings" => "Test e-mailinstellingen",
-"Send email" => "Versturen e-mail",
-"Log" => "Log",
-"Log level" => "Log niveau",
-"More" => "Meer",
-"Less" => "Minder",
-"Version" => "Versie",
-"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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Meer applicaties",
-"Add your app" => "Voeg uw app toe",
-"by" => "door",
-"licensed" => "gelicenseerd",
-"Documentation:" => "Documentatie:",
-"User Documentation" => "Gebruikersdocumentatie",
-"Admin Documentation" => "Beheerdocumentatie",
-"Update to %s" => "Bijgewerkt naar %s",
-"Enable only for specific groups" => "Alleen voor bepaalde groepen activeren",
-"Uninstall App" => "De-installeren app",
-"Administrator Documentation" => "Beheerdersdocumentatie",
-"Online Documentation" => "Online documentatie",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Commerciële ondersteuning",
-"Get the apps to sync your files" => "Download de apps om bestanden te synchroniseren",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
-"Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
-"Password" => "Wachtwoord",
-"Your password was changed" => "Je wachtwoord is veranderd",
-"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
-"Current password" => "Huidig wachtwoord",
-"New password" => "Nieuw",
-"Change password" => "Wijzig wachtwoord",
-"Full Name" => "Volledige naam",
-"Email" => "E-mailadres",
-"Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailadres 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 de afbeelding bijsnijden.",
-"Your avatar is provided by your original account." => "Uw avatar is verstrekt door uw originele account.",
-"Cancel" => "Annuleer",
-"Choose as profile image" => "Kies als profielafbeelding",
-"Language" => "Taal",
-"Help translate" => "Help met vertalen",
-"Common Name" => "Common Name",
-"Valid until" => "Geldig tot",
-"Issued By" => "Uitgegeven door",
-"Valid until %s" => "Geldig tot %s",
-"Import Root Certificate" => "Importeer root certificaat",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
-"Restore Encryption Keys" => "Herstel cryptosleutels",
-"Delete Encryption Keys" => "Verwijder cryptosleutels",
-"Show storage location" => "Toon opslaglocatie",
-"Show last log in" => "Toon laatste inlog",
-"Login Name" => "Inlognaam",
-"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",
-"Search Users and Groups" => "Zoeken naar gebruikers en groepen",
-"Add Group" => "Toevoegen groep",
-"Group" => "Groep",
-"Everyone" => "Iedereen",
-"Admins" => "Beheerders",
-"Default Quota" => "Standaard limiet",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
-"Unlimited" => "Ongelimiteerd",
-"Other" => "Anders",
-"Username" => "Gebruikersnaam",
-"Group Admin for" => "Groepsbeheerder voor",
-"Quota" => "Limieten",
-"Storage Location" => "Opslaglocatie",
-"Last Login" => "Laatste inlog",
-"change full name" => "wijzigen volledige naam",
-"set new password" => "Instellen nieuw wachtwoord",
-"Default" => "Standaard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
new file mode 100644
index 00000000000..477b81d6b48
--- /dev/null
+++ b/settings/l10n/nn_NO.js
@@ -0,0 +1,113 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Autentiseringsfeil",
+    "Group already exists" : "Gruppa finst allereie",
+    "Unable to add group" : "Klarte ikkje leggja til gruppa",
+    "Email saved" : "E-postadresse lagra",
+    "Invalid email" : "Ugyldig e-postadresse",
+    "Unable to delete group" : "Klarte ikkje å sletta gruppa",
+    "Unable to delete user" : "Klarte ikkje sletta brukaren",
+    "Language changed" : "Språk endra",
+    "Invalid request" : "Ugyldig førespurnad",
+    "Admins can't remove themself from the admin group" : "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
+    "Unable to add user to group %s" : "Klarte ikkje leggja til brukaren til gruppa %s",
+    "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
+    "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen brukar gitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "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",
+    "Email sent" : "E-post sendt",
+    "All" : "Alle",
+    "Please wait...." : "Ver venleg og vent …",
+    "Error while disabling app" : "Klarte ikkje å skru av programmet",
+    "Disable" : "Slå av",
+    "Enable" : "Slå på",
+    "Error while enabling app" : "Klarte ikkje å skru på programmet",
+    "Updating...." : "Oppdaterer …",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Select a profile picture" : "Vel eit profilbilete",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
+    "Groups" : "Grupper",
+    "undo" : "angra",
+    "never" : "aldri",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
+    "Error creating user" : "Feil ved oppretting av brukar",
+    "A valid password must be provided" : "Du må oppgje eit gyldig passord",
+    "__language_name__" : "Nynorsk",
+    "Encryption" : "Kryptering",
+    "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",
+    "Module 'fileinfo' missing" : "Modulen «fileinfo» manglar",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
+    "Locale not working" : "Regionaldata fungerer ikkje",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
+    "Allow public uploads" : "Tillat offentlege opplastingar",
+    "Allow resharing" : "Tillat vidaredeling",
+    "Security" : "Tryggleik",
+    "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",
+    "Less" : "Mindre",
+    "Version" : "Utgåve",
+    "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=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "User Documentation" : "Brukardokumentasjon",
+    "Administrator Documentation" : "Administratordokumentasjon",
+    "Online Documentation" : "Dokumentasjon på nett",
+    "Forum" : "Forum",
+    "Bugtracker" : "Feilsporar",
+    "Commercial Support" : "Betalt brukarstøtte",
+    "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
+    "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passordet ditt er endra",
+    "Unable to change your password" : "Klarte ikkje endra passordet",
+    "Current password" : "Passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endra passord",
+    "Email" : "E-post",
+    "Your email address" : "Di epost-adresse",
+    "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.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Vel som profilbilete",
+    "Language" : "Språk",
+    "Help translate" : "Hjelp oss å omsetja",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filene",
+    "Login Name" : "Innloggingsnamn",
+    "Create" : "Lag",
+    "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
+    "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
+    "Group" : "Gruppe",
+    "Unlimited" : "Ubegrensa",
+    "Other" : "Anna",
+    "Username" : "Brukarnamn",
+    "Quota" : "Kvote",
+    "set new password" : "lag nytt passord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
new file mode 100644
index 00000000000..8971c913a4a
--- /dev/null
+++ b/settings/l10n/nn_NO.json
@@ -0,0 +1,111 @@
+{ "translations": {
+    "Authentication error" : "Autentiseringsfeil",
+    "Group already exists" : "Gruppa finst allereie",
+    "Unable to add group" : "Klarte ikkje leggja til gruppa",
+    "Email saved" : "E-postadresse lagra",
+    "Invalid email" : "Ugyldig e-postadresse",
+    "Unable to delete group" : "Klarte ikkje å sletta gruppa",
+    "Unable to delete user" : "Klarte ikkje sletta brukaren",
+    "Language changed" : "Språk endra",
+    "Invalid request" : "Ugyldig førespurnad",
+    "Admins can't remove themself from the admin group" : "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
+    "Unable to add user to group %s" : "Klarte ikkje leggja til brukaren til gruppa %s",
+    "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
+    "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen brukar gitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "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",
+    "Email sent" : "E-post sendt",
+    "All" : "Alle",
+    "Please wait...." : "Ver venleg og vent …",
+    "Error while disabling app" : "Klarte ikkje å skru av programmet",
+    "Disable" : "Slå av",
+    "Enable" : "Slå på",
+    "Error while enabling app" : "Klarte ikkje å skru på programmet",
+    "Updating...." : "Oppdaterer …",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Select a profile picture" : "Vel eit profilbilete",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
+    "Groups" : "Grupper",
+    "undo" : "angra",
+    "never" : "aldri",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
+    "Error creating user" : "Feil ved oppretting av brukar",
+    "A valid password must be provided" : "Du må oppgje eit gyldig passord",
+    "__language_name__" : "Nynorsk",
+    "Encryption" : "Kryptering",
+    "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",
+    "Module 'fileinfo' missing" : "Modulen «fileinfo» manglar",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
+    "Locale not working" : "Regionaldata fungerer ikkje",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
+    "Allow public uploads" : "Tillat offentlege opplastingar",
+    "Allow resharing" : "Tillat vidaredeling",
+    "Security" : "Tryggleik",
+    "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",
+    "Less" : "Mindre",
+    "Version" : "Utgåve",
+    "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=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "User Documentation" : "Brukardokumentasjon",
+    "Administrator Documentation" : "Administratordokumentasjon",
+    "Online Documentation" : "Dokumentasjon på nett",
+    "Forum" : "Forum",
+    "Bugtracker" : "Feilsporar",
+    "Commercial Support" : "Betalt brukarstøtte",
+    "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
+    "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passordet ditt er endra",
+    "Unable to change your password" : "Klarte ikkje endra passordet",
+    "Current password" : "Passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endra passord",
+    "Email" : "E-post",
+    "Your email address" : "Di epost-adresse",
+    "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.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Vel som profilbilete",
+    "Language" : "Språk",
+    "Help translate" : "Hjelp oss å omsetja",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filene",
+    "Login Name" : "Innloggingsnamn",
+    "Create" : "Lag",
+    "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
+    "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
+    "Group" : "Gruppe",
+    "Unlimited" : "Ubegrensa",
+    "Other" : "Anna",
+    "Username" : "Brukarnamn",
+    "Quota" : "Kvote",
+    "set new password" : "lag nytt passord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
deleted file mode 100644
index 7fd2eb96d8e..00000000000
--- a/settings/l10n/nn_NO.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentiseringsfeil",
-"Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje leggja til gruppa",
-"Email saved" => "E-postadresse lagra",
-"Invalid email" => "Ugyldig e-postadresse",
-"Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje sletta brukaren",
-"Language changed" => "Språk endra",
-"Invalid request" => "Ugyldig førespurnad",
-"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
-"Wrong password" => "Feil passord",
-"No user supplied" => "Ingen brukar gitt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
-"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",
-"Email sent" => "E-post sendt",
-"All" => "Alle",
-"Please wait...." => "Ver venleg og vent …",
-"Error while disabling app" => "Klarte ikkje å skru av programmet",
-"Disable" => "Slå av",
-"Enable" => "Slå på",
-"Error while enabling app" => "Klarte ikkje å skru på programmet",
-"Updating...." => "Oppdaterer …",
-"Error while updating app" => "Feil ved oppdatering av app",
-"Updated" => "Oppdatert",
-"Select a profile picture" => "Vel eit profilbilete",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"Delete" => "Slett",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
-"Groups" => "Grupper",
-"undo" => "angra",
-"never" => "aldri",
-"add group" => "legg til gruppe",
-"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
-"Error creating user" => "Feil ved oppretting av brukar",
-"A valid password must be provided" => "Du må oppgje eit gyldig passord",
-"__language_name__" => "Nynorsk",
-"Encryption" => "Kryptering",
-"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",
-"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
-"Locale not working" => "Regionaldata fungerer ikkje",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
-"Sharing" => "Deling",
-"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
-"Allow public uploads" => "Tillat offentlege opplastingar",
-"Allow resharing" => "Tillat vidaredeling",
-"Security" => "Tryggleik",
-"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",
-"Less" => "Mindre",
-"Version" => "Utgåve",
-"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=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "av",
-"User Documentation" => "Brukardokumentasjon",
-"Administrator Documentation" => "Administratordokumentasjon",
-"Online Documentation" => "Dokumentasjon på nett",
-"Forum" => "Forum",
-"Bugtracker" => "Feilsporar",
-"Commercial Support" => "Betalt brukarstøtte",
-"Get the apps to sync your files" => "Få app-ar som kan synkronisera filene dine",
-"Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
-"Password" => "Passord",
-"Your password was changed" => "Passordet ditt er endra",
-"Unable to change your password" => "Klarte ikkje endra passordet",
-"Current password" => "Passord",
-"New password" => "Nytt passord",
-"Change password" => "Endra passord",
-"Email" => "E-post",
-"Your email address" => "Di epost-adresse",
-"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.",
-"Cancel" => "Avbryt",
-"Choose as profile image" => "Vel som profilbilete",
-"Language" => "Språk",
-"Help translate" => "Hjelp oss å omsetja",
-"Log-in password" => "Innloggingspassord",
-"Decrypt all Files" => "Dekrypter alle filene",
-"Login Name" => "Innloggingsnamn",
-"Create" => "Lag",
-"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
-"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
-"Group" => "Gruppe",
-"Unlimited" => "Ubegrensa",
-"Other" => "Anna",
-"Username" => "Brukarnamn",
-"Quota" => "Kvote",
-"set new password" => "lag nytt passord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
new file mode 100644
index 00000000000..ffc80bd4ec4
--- /dev/null
+++ b/settings/l10n/oc.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Error d'autentificacion",
+    "Group already exists" : "Lo grop existís ja",
+    "Unable to add group" : "Pas capable d'apondre  un grop",
+    "Email saved" : "Corrièl enregistrat",
+    "Invalid email" : "Corrièl incorrècte",
+    "Unable to delete group" : "Pas capable d'escafar un grop",
+    "Unable to delete user" : "Pas capable d'escafar un usancièr",
+    "Language changed" : "Lengas cambiadas",
+    "Invalid request" : "Demanda invalida",
+    "Unable to add user to group %s" : "Pas capable d'apondre un usancièr al grop %s",
+    "Unable to remove user from group %s" : "Pas capable de tira un usancièr del grop %s",
+    "Disable" : "Desactiva",
+    "Enable" : "Activa",
+    "Delete" : "Escafa",
+    "Groups" : "Grops",
+    "undo" : "defar",
+    "never" : "jamai",
+    "__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",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
+    "More" : "Mai d'aquò",
+    "by" : "per",
+    "Password" : "Senhal",
+    "Your password was changed" : "Ton senhal a cambiat",
+    "Unable to change your password" : "Pas possible de cambiar ton senhal",
+    "Current password" : "Senhal en cors",
+    "New password" : "Senhal novèl",
+    "Change password" : "Cambia lo senhal",
+    "Email" : "Corrièl",
+    "Your email address" : "Ton adreiça de corrièl",
+    "Cancel" : "Annula",
+    "Language" : "Lenga",
+    "Help translate" : "Ajuda a la revirada",
+    "Login Name" : "Login",
+    "Create" : "Crea",
+    "Default Quota" : "Quota per defaut",
+    "Other" : "Autres",
+    "Username" : "Non d'usancièr",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
new file mode 100644
index 00000000000..edd8e90404d
--- /dev/null
+++ b/settings/l10n/oc.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "Authentication error" : "Error d'autentificacion",
+    "Group already exists" : "Lo grop existís ja",
+    "Unable to add group" : "Pas capable d'apondre  un grop",
+    "Email saved" : "Corrièl enregistrat",
+    "Invalid email" : "Corrièl incorrècte",
+    "Unable to delete group" : "Pas capable d'escafar un grop",
+    "Unable to delete user" : "Pas capable d'escafar un usancièr",
+    "Language changed" : "Lengas cambiadas",
+    "Invalid request" : "Demanda invalida",
+    "Unable to add user to group %s" : "Pas capable d'apondre un usancièr al grop %s",
+    "Unable to remove user from group %s" : "Pas capable de tira un usancièr del grop %s",
+    "Disable" : "Desactiva",
+    "Enable" : "Activa",
+    "Delete" : "Escafa",
+    "Groups" : "Grops",
+    "undo" : "defar",
+    "never" : "jamai",
+    "__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",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
+    "More" : "Mai d'aquò",
+    "by" : "per",
+    "Password" : "Senhal",
+    "Your password was changed" : "Ton senhal a cambiat",
+    "Unable to change your password" : "Pas possible de cambiar ton senhal",
+    "Current password" : "Senhal en cors",
+    "New password" : "Senhal novèl",
+    "Change password" : "Cambia lo senhal",
+    "Email" : "Corrièl",
+    "Your email address" : "Ton adreiça de corrièl",
+    "Cancel" : "Annula",
+    "Language" : "Lenga",
+    "Help translate" : "Ajuda a la revirada",
+    "Login Name" : "Login",
+    "Create" : "Crea",
+    "Default Quota" : "Quota per defaut",
+    "Other" : "Autres",
+    "Username" : "Non d'usancièr",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
deleted file mode 100644
index 6c41061bbe7..00000000000
--- a/settings/l10n/oc.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Error d'autentificacion",
-"Group already exists" => "Lo grop existís ja",
-"Unable to add group" => "Pas capable d'apondre  un grop",
-"Email saved" => "Corrièl enregistrat",
-"Invalid email" => "Corrièl incorrècte",
-"Unable to delete group" => "Pas capable d'escafar un grop",
-"Unable to delete user" => "Pas capable d'escafar un usancièr",
-"Language changed" => "Lengas cambiadas",
-"Invalid request" => "Demanda invalida",
-"Unable to add user to group %s" => "Pas capable d'apondre un usancièr al grop %s",
-"Unable to remove user from group %s" => "Pas capable de tira un usancièr del grop %s",
-"Disable" => "Desactiva",
-"Enable" => "Activa",
-"Delete" => "Escafa",
-"Groups" => "Grops",
-"undo" => "defar",
-"never" => "jamai",
-"__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",
-"Sharing" => "Al partejar",
-"Log" => "Jornal",
-"More" => "Mai d'aquò",
-"by" => "per",
-"Password" => "Senhal",
-"Your password was changed" => "Ton senhal a cambiat",
-"Unable to change your password" => "Pas possible de cambiar ton senhal",
-"Current password" => "Senhal en cors",
-"New password" => "Senhal novèl",
-"Change password" => "Cambia lo senhal",
-"Email" => "Corrièl",
-"Your email address" => "Ton adreiça de corrièl",
-"Cancel" => "Annula",
-"Language" => "Lenga",
-"Help translate" => "Ajuda a la revirada",
-"Login Name" => "Login",
-"Create" => "Crea",
-"Default Quota" => "Quota per defaut",
-"Other" => "Autres",
-"Username" => "Non d'usancièr",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pa.js b/settings/l10n/pa.js
new file mode 100644
index 00000000000..ef0c5083b06
--- /dev/null
+++ b/settings/l10n/pa.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Language changed" : "ਭਾਸ਼ਾ ਬਦਲੀ",
+    "Please wait...." : "...ਉਡੀਕੋ ਜੀ",
+    "Disable" : "ਬੰਦ",
+    "Enable" : "ਚਾਲੂ",
+    "Updating...." : "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+    "Updated" : "ਅੱਪਡੇਟ ਕੀਤਾ",
+    "Delete" : "ਹਟਾਓ",
+    "Groups" : "ਗਰੁੱਪ",
+    "undo" : "ਵਾਪਸ",
+    "add group" : "ਗਰੁੱਪ ਸ਼ਾਮਲ",
+    "__language_name__" : "__ਭਾਸ਼ਾ_ਨਾਂ__",
+    "Login" : "ਲਾਗਇਨ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Setup Warning" : "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+    "Server address" : "ਸਰਵਰ ਐਡਰੈਸ",
+    "Password" : "ਪਾਸਵਰ",
+    "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Login Name" : "ਲਾਗਇਨ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pa.json b/settings/l10n/pa.json
new file mode 100644
index 00000000000..4f836b1b384
--- /dev/null
+++ b/settings/l10n/pa.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Language changed" : "ਭਾਸ਼ਾ ਬਦਲੀ",
+    "Please wait...." : "...ਉਡੀਕੋ ਜੀ",
+    "Disable" : "ਬੰਦ",
+    "Enable" : "ਚਾਲੂ",
+    "Updating...." : "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+    "Updated" : "ਅੱਪਡੇਟ ਕੀਤਾ",
+    "Delete" : "ਹਟਾਓ",
+    "Groups" : "ਗਰੁੱਪ",
+    "undo" : "ਵਾਪਸ",
+    "add group" : "ਗਰੁੱਪ ਸ਼ਾਮਲ",
+    "__language_name__" : "__ਭਾਸ਼ਾ_ਨਾਂ__",
+    "Login" : "ਲਾਗਇਨ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Setup Warning" : "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+    "Server address" : "ਸਰਵਰ ਐਡਰੈਸ",
+    "Password" : "ਪਾਸਵਰ",
+    "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Login Name" : "ਲਾਗਇਨ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
deleted file mode 100644
index 2bfd1e44999..00000000000
--- a/settings/l10n/pa.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Language changed" => "ਭਾਸ਼ਾ ਬਦਲੀ",
-"Please wait...." => "...ਉਡੀਕੋ ਜੀ",
-"Disable" => "ਬੰਦ",
-"Enable" => "ਚਾਲੂ",
-"Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
-"Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
-"Delete" => "ਹਟਾਓ",
-"Groups" => "ਗਰੁੱਪ",
-"undo" => "ਵਾਪਸ",
-"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.js b/settings/l10n/pl.js
new file mode 100644
index 00000000000..b1b88da2661
--- /dev/null
+++ b/settings/l10n/pl.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Włączone",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
+    "Unable to change full name" : "Nie można zmienić pełnej nazwy",
+    "Group already exists" : "Grupa już istnieje",
+    "Unable to add group" : "Nie można dodać grupy",
+    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+    "Couldn't remove app." : "Nie można usunąć aplikacji.",
+    "Email saved" : "E-mail zapisany",
+    "Invalid email" : "Nieprawidłowy e-mail",
+    "Unable to delete group" : "Nie można usunąć grupy",
+    "Unable to delete user" : "Nie można usunąć użytkownika",
+    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Language changed" : "Zmieniono język",
+    "Invalid request" : "Nieprawidłowe żądanie",
+    "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
+    "Unable to add user to group %s" : "Nie można dodać użytkownika do grupy %s",
+    "Unable to remove user from group %s" : "Nie można usunąć użytkownika z grupy %s",
+    "Couldn't update app." : "Nie można uaktualnić aplikacji.",
+    "Wrong password" : "Złe hasło",
+    "No user supplied" : "Niedostarczony użytkownik",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
+    "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",
+    "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.",
+    "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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
+    "Add trusted domain" : "Dodaj zaufaną domenę",
+    "Sending..." : "Wysyłam...",
+    "All" : "Wszystkie",
+    "Please wait...." : "Proszę czekać...",
+    "Error while disabling app" : "Błąd podczas wyłączania aplikacji",
+    "Disable" : "Wyłącz",
+    "Enable" : "Włącz",
+    "Error while enabling app" : "Błąd podczas włączania aplikacji",
+    "Updating...." : "Aktualizacja w toku...",
+    "Error while updating app" : "Błąd podczas aktualizacji aplikacji",
+    "Updated" : "Zaktualizowano",
+    "Uninstalling ...." : "Odinstalowywanie....",
+    "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji",
+    "Uninstall" : "Odinstaluj",
+    "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",
+    "Valid until {date}" : "Ważny do {date}",
+    "Delete" : "Usuń",
+    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
+    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
+    "Groups" : "Grupy",
+    "Unable to delete {objName}" : "Nie można usunąć {objName}",
+    "Error creating group" : "Błąd podczas tworzenia grupy",
+    "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
+    "deleted {groupName}" : "usunięto {groupName}",
+    "undo" : "cofnij",
+    "never" : "nigdy",
+    "deleted {userName}" : "usunięto {userName}",
+    "add group" : "dodaj grupę",
+    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
+    "Error creating user" : "Błąd podczas tworzenia użytkownika",
+    "A valid password must be provided" : "Należy podać prawidłowe hasło",
+    "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
+    "__language_name__" : "polski",
+    "SSL root certificates" : "Główny certyfikat SSL",
+    "Encryption" : "Szyfrowanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
+    "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
+    "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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
+    "Database Performance Info" : "Informacja o wydajności bazy danych",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+    "Your PHP version is outdated" : "Twoja wersja PHP jest za stara",
+    "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.",
+    "PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
+    "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.",
+    "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
+    "Connectivity checks" : "Sprawdzanie łączności",
+    "No problems found" : "Nie ma żadnych problemów",
+    "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+    "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
+    "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
+    "Sharing" : "Udostępnianie",
+    "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+    "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
+    "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
+    "Allow public uploads" : "Pozwól na  publiczne wczytywanie",
+    "Set default expiration date" : "Ustaw domyślną datę wygaśnięcia",
+    "Expire after " : "Wygaś po",
+    "days" : "dniach",
+    "Enforce expiration date" : "Wymuś datę wygaśnięcia",
+    "Allow resharing" : "Zezwalaj na ponowne udostępnianie",
+    "Restrict users to only share with users in their groups" : "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
+    "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
+    "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
+    "Security" : "Bezpieczeństwo",
+    "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ń",
+    "Send mode" : "Tryb wysyłki",
+    "From address" : "Z adresu",
+    "mail" : "mail",
+    "Authentication method" : "Metoda autentykacji",
+    "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",
+    "Less" : "Mniej",
+    "Version" : "Wersja",
+    "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Więcej aplikacji",
+    "by" : "przez",
+    "Documentation:" : "Dokumentacja:",
+    "User Documentation" : "Dokumentacja użytkownika",
+    "Admin Documentation" : "Dokumentacja Administratora",
+    "Enable only for specific groups" : "Włącz tylko dla określonych grup",
+    "Uninstall App" : "Odinstaluj aplikację",
+    "Administrator Documentation" : "Dokumentacja administratora",
+    "Online Documentation" : "Dokumentacja online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Zgłaszanie błędów",
+    "Commercial Support" : "Wsparcie komercyjne",
+    "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+    "Password" : "Hasło",
+    "Your password was changed" : "Twoje hasło zostało zmienione",
+    "Unable to change your password" : "Nie można zmienić hasła",
+    "Current password" : "Bieżące hasło",
+    "New password" : "Nowe hasło",
+    "Change password" : "Zmień hasło",
+    "Full Name" : "Pełna nazwa",
+    "Email" : "Email",
+    "Your email address" : "Twój adres e-mail",
+    "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ąć.",
+    "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",
+    "Common Name" : "Nazwa CN",
+    "Valid until" : "Ważny do",
+    "Issued By" : "Wydany przez",
+    "Valid until %s" : "Ważny do %s",
+    "Import Root Certificate" : "Importuj główny certyfikat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
+    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
+    "Show storage location" : "Pokaż miejsce przechowywania",
+    "Show last log in" : "Pokaż ostatni login",
+    "Login Name" : "Login",
+    "Create" : "Utwórz",
+    "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
+    "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
+    "Add Group" : "Dodaj grupę",
+    "Group" : "Grupa",
+    "Everyone" : "Wszyscy",
+    "Admins" : "Administratorzy",
+    "Default Quota" : "Domyślny udział",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
+    "Unlimited" : "Bez limitu",
+    "Other" : "Inne",
+    "Username" : "Nazwa użytkownika",
+    "Quota" : "Udział",
+    "Storage Location" : "Lokalizacja magazynu",
+    "Last Login" : "Ostatnio zalogowany",
+    "change full name" : "Zmień pełna nazwę",
+    "set new password" : "ustaw nowe hasło",
+    "Default" : "Domyślny"
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
new file mode 100644
index 00000000000..eb34091a7f9
--- /dev/null
+++ b/settings/l10n/pl.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Włączone",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
+    "Unable to change full name" : "Nie można zmienić pełnej nazwy",
+    "Group already exists" : "Grupa już istnieje",
+    "Unable to add group" : "Nie można dodać grupy",
+    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+    "Couldn't remove app." : "Nie można usunąć aplikacji.",
+    "Email saved" : "E-mail zapisany",
+    "Invalid email" : "Nieprawidłowy e-mail",
+    "Unable to delete group" : "Nie można usunąć grupy",
+    "Unable to delete user" : "Nie można usunąć użytkownika",
+    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Language changed" : "Zmieniono język",
+    "Invalid request" : "Nieprawidłowe żądanie",
+    "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
+    "Unable to add user to group %s" : "Nie można dodać użytkownika do grupy %s",
+    "Unable to remove user from group %s" : "Nie można usunąć użytkownika z grupy %s",
+    "Couldn't update app." : "Nie można uaktualnić aplikacji.",
+    "Wrong password" : "Złe hasło",
+    "No user supplied" : "Niedostarczony użytkownik",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
+    "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",
+    "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.",
+    "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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
+    "Add trusted domain" : "Dodaj zaufaną domenę",
+    "Sending..." : "Wysyłam...",
+    "All" : "Wszystkie",
+    "Please wait...." : "Proszę czekać...",
+    "Error while disabling app" : "Błąd podczas wyłączania aplikacji",
+    "Disable" : "Wyłącz",
+    "Enable" : "Włącz",
+    "Error while enabling app" : "Błąd podczas włączania aplikacji",
+    "Updating...." : "Aktualizacja w toku...",
+    "Error while updating app" : "Błąd podczas aktualizacji aplikacji",
+    "Updated" : "Zaktualizowano",
+    "Uninstalling ...." : "Odinstalowywanie....",
+    "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji",
+    "Uninstall" : "Odinstaluj",
+    "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",
+    "Valid until {date}" : "Ważny do {date}",
+    "Delete" : "Usuń",
+    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
+    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
+    "Groups" : "Grupy",
+    "Unable to delete {objName}" : "Nie można usunąć {objName}",
+    "Error creating group" : "Błąd podczas tworzenia grupy",
+    "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
+    "deleted {groupName}" : "usunięto {groupName}",
+    "undo" : "cofnij",
+    "never" : "nigdy",
+    "deleted {userName}" : "usunięto {userName}",
+    "add group" : "dodaj grupę",
+    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
+    "Error creating user" : "Błąd podczas tworzenia użytkownika",
+    "A valid password must be provided" : "Należy podać prawidłowe hasło",
+    "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
+    "__language_name__" : "polski",
+    "SSL root certificates" : "Główny certyfikat SSL",
+    "Encryption" : "Szyfrowanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
+    "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
+    "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",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
+    "Database Performance Info" : "Informacja o wydajności bazy danych",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+    "Your PHP version is outdated" : "Twoja wersja PHP jest za stara",
+    "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.",
+    "PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
+    "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.",
+    "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
+    "Connectivity checks" : "Sprawdzanie łączności",
+    "No problems found" : "Nie ma żadnych problemów",
+    "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+    "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
+    "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
+    "Sharing" : "Udostępnianie",
+    "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+    "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
+    "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
+    "Allow public uploads" : "Pozwól na  publiczne wczytywanie",
+    "Set default expiration date" : "Ustaw domyślną datę wygaśnięcia",
+    "Expire after " : "Wygaś po",
+    "days" : "dniach",
+    "Enforce expiration date" : "Wymuś datę wygaśnięcia",
+    "Allow resharing" : "Zezwalaj na ponowne udostępnianie",
+    "Restrict users to only share with users in their groups" : "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
+    "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
+    "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
+    "Security" : "Bezpieczeństwo",
+    "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ń",
+    "Send mode" : "Tryb wysyłki",
+    "From address" : "Z adresu",
+    "mail" : "mail",
+    "Authentication method" : "Metoda autentykacji",
+    "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",
+    "Less" : "Mniej",
+    "Version" : "Wersja",
+    "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Więcej aplikacji",
+    "by" : "przez",
+    "Documentation:" : "Dokumentacja:",
+    "User Documentation" : "Dokumentacja użytkownika",
+    "Admin Documentation" : "Dokumentacja Administratora",
+    "Enable only for specific groups" : "Włącz tylko dla określonych grup",
+    "Uninstall App" : "Odinstaluj aplikację",
+    "Administrator Documentation" : "Dokumentacja administratora",
+    "Online Documentation" : "Dokumentacja online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Zgłaszanie błędów",
+    "Commercial Support" : "Wsparcie komercyjne",
+    "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+    "Password" : "Hasło",
+    "Your password was changed" : "Twoje hasło zostało zmienione",
+    "Unable to change your password" : "Nie można zmienić hasła",
+    "Current password" : "Bieżące hasło",
+    "New password" : "Nowe hasło",
+    "Change password" : "Zmień hasło",
+    "Full Name" : "Pełna nazwa",
+    "Email" : "Email",
+    "Your email address" : "Twój adres e-mail",
+    "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ąć.",
+    "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",
+    "Common Name" : "Nazwa CN",
+    "Valid until" : "Ważny do",
+    "Issued By" : "Wydany przez",
+    "Valid until %s" : "Ważny do %s",
+    "Import Root Certificate" : "Importuj główny certyfikat",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
+    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
+    "Show storage location" : "Pokaż miejsce przechowywania",
+    "Show last log in" : "Pokaż ostatni login",
+    "Login Name" : "Login",
+    "Create" : "Utwórz",
+    "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
+    "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
+    "Add Group" : "Dodaj grupę",
+    "Group" : "Grupa",
+    "Everyone" : "Wszyscy",
+    "Admins" : "Administratorzy",
+    "Default Quota" : "Domyślny udział",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
+    "Unlimited" : "Bez limitu",
+    "Other" : "Inne",
+    "Username" : "Nazwa użytkownika",
+    "Quota" : "Udział",
+    "Storage Location" : "Lokalizacja magazynu",
+    "Last Login" : "Ostatnio zalogowany",
+    "change full name" : "Zmień pełna nazwę",
+    "set new password" : "ustaw nowe hasło",
+    "Default" : "Domyślny"
+},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
deleted file mode 100644
index 481fec558b6..00000000000
--- a/settings/l10n/pl.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Włączone",
-"Not enabled" => "Nie włączone",
-"Recommended" => "Polecane",
-"Authentication error" => "Błąd uwierzytelniania",
-"Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
-"Unable to change full name" => "Nie można zmienić pełnej nazwy",
-"Group already exists" => "Grupa już istnieje",
-"Unable to add group" => "Nie można dodać grupy",
-"Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
-"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
-"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
-"Couldn't remove app." => "Nie można usunąć aplikacji.",
-"Email saved" => "E-mail zapisany",
-"Invalid email" => "Nieprawidłowy e-mail",
-"Unable to delete group" => "Nie można usunąć grupy",
-"Unable to delete user" => "Nie można usunąć użytkownika",
-"Backups restored successfully" => "Archiwum zostało prawidłowo przywrócone",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
-"Language changed" => "Zmieniono język",
-"Invalid request" => "Nieprawidłowe żądanie",
-"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
-"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
-"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
-"Couldn't update app." => "Nie można uaktualnić aplikacji.",
-"Wrong password" => "Złe hasło",
-"No user supplied" => "Niedostarczony użytkownik",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
-"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",
-"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 email. Please revise your settings." => "Pojawił się problem podczas wysyłania email. 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
-"Add trusted domain" => "Dodaj zaufaną domenę",
-"Sending..." => "Wysyłam...",
-"All" => "Wszystkie",
-"Please wait...." => "Proszę czekać...",
-"Error while disabling app" => "Błąd podczas wyłączania aplikacji",
-"Disable" => "Wyłącz",
-"Enable" => "Włącz",
-"Error while enabling app" => "Błąd podczas włączania aplikacji",
-"Updating...." => "Aktualizacja w toku...",
-"Error while updating app" => "Błąd podczas aktualizacji aplikacji",
-"Updated" => "Zaktualizowano",
-"Uninstalling ...." => "Odinstalowywanie....",
-"Error while uninstalling app" => "Błąd przy odinstalowywaniu aplikacji",
-"Uninstall" => "Odinstaluj",
-"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",
-"Valid until {date}" => "Ważny do {date}",
-"Delete" => "Usuń",
-"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-"Delete encryption keys permanently." => "Usuń trwale klucze szyfrujące.",
-"Restore encryption keys." => "Przywróć klucze szyfrujące.",
-"Groups" => "Grupy",
-"Unable to delete {objName}" => "Nie można usunąć {objName}",
-"Error creating group" => "Błąd podczas tworzenia grupy",
-"A valid group name must be provided" => "Należy podać prawidłową nazwę grupy",
-"deleted {groupName}" => "usunięto {groupName}",
-"undo" => "cofnij",
-"no group" => "brak grupy",
-"never" => "nigdy",
-"deleted {userName}" => "usunięto {userName}",
-"add group" => "dodaj grupę",
-"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
-"Error creating user" => "Błąd podczas tworzenia użytkownika",
-"A valid password must be provided" => "Należy podać prawidłowe hasło",
-"Warning: Home directory for user \"{user}\" already exists" => "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
-"__language_name__" => "polski",
-"Personal Info" => "Informacje osobiste",
-"SSL root certificates" => "Główny certyfikat SSL",
-"Encryption" => "Szyfrowanie",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
-"Info, warnings, errors and fatal issues" => "Informacje, ostrzeżenia, błędy i poważne problemy",
-"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",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
-"Database Performance Info" => "Informacja o wydajności bazy danych",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
-"Your PHP version is outdated" => "Twoja wersja PHP jest za stara",
-"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.",
-"PHP charset is not set to UTF-8" => "Kodowanie PHP nie jest ustawione na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
-"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.",
-"URL generation in notification emails" => "Generowanie URL w powiadomieniach email",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
-"Connectivity checks" => "Sprawdzanie łączności",
-"No problems found" => "Nie ma żadnych problemów",
-"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Ostatni cron był uruchomiony %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
-"Cron was not executed yet!" => "Cron nie został jeszcze uruchomiony!",
-"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-"Sharing" => "Udostępnianie",
-"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
-"Allow users to share via link" => "Pozwól użytkownikom współdzielić przez link",
-"Enforce password protection" => "Wymuś zabezpieczenie hasłem",
-"Allow public uploads" => "Pozwól na  publiczne wczytywanie",
-"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
-"Expire after " => "Wygaś po",
-"days" => "dniach",
-"Enforce expiration date" => "Wymuś datę wygaśnięcia",
-"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
-"Restrict users to only share with users in their groups" => "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
-"Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
-"Exclude groups from sharing" => "Wyklucz grupy z udostępniania",
-"These groups will still be able to receive shares, but not to initiate them." => "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
-"Security" => "Bezpieczeństwo",
-"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ń",
-"Send mode" => "Tryb wysyłki",
-"From address" => "Z adresu",
-"mail" => "mail",
-"Authentication method" => "Metoda autentykacji",
-"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",
-"Less" => "Mniej",
-"Version" => "Wersja",
-"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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Więcej aplikacji",
-"Add your app" => "Dodaj twoją aplikację",
-"by" => "przez",
-"licensed" => "Licencja",
-"Documentation:" => "Dokumentacja:",
-"User Documentation" => "Dokumentacja użytkownika",
-"Admin Documentation" => "Dokumentacja Administratora",
-"Update to %s" => "Aktualizuj do %s",
-"Enable only for specific groups" => "Włącz tylko dla określonych grup",
-"Uninstall App" => "Odinstaluj aplikację",
-"Administrator Documentation" => "Dokumentacja administratora",
-"Online Documentation" => "Dokumentacja online",
-"Forum" => "Forum",
-"Bugtracker" => "Zgłaszanie błędów",
-"Commercial Support" => "Wsparcie komercyjne",
-"Get the apps to sync your files" => "Pobierz aplikacje żeby synchronizować swoje pliki",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
-"Show First Run Wizard again" => "Uruchom ponownie kreatora pierwszego uruchomienia",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
-"Password" => "Hasło",
-"Your password was changed" => "Twoje hasło zostało zmienione",
-"Unable to change your password" => "Nie można zmienić hasła",
-"Current password" => "Bieżące hasło",
-"New password" => "Nowe hasło",
-"Change password" => "Zmień hasło",
-"Full Name" => "Pełna nazwa",
-"Email" => "Email",
-"Your email address" => "Twój adres e-mail",
-"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ąć.",
-"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",
-"Common Name" => "Nazwa CN",
-"Valid until" => "Ważny do",
-"Issued By" => "Wydany przez",
-"Valid until %s" => "Ważny do %s",
-"Import Root Certificate" => "Importuj główny certyfikat",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
-"Restore Encryption Keys" => "Przywróć klucze szyfrujące",
-"Delete Encryption Keys" => "Usuń klucze szyfrujące",
-"Show storage location" => "Pokaż miejsce przechowywania",
-"Show last log in" => "Pokaż ostatni login",
-"Login Name" => "Login",
-"Create" => "Utwórz",
-"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
-"Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-"Search Users and Groups" => "Przeszukuj użytkowników i grupy",
-"Add Group" => "Dodaj grupę",
-"Group" => "Grupa",
-"Everyone" => "Wszyscy",
-"Admins" => "Administratorzy",
-"Default Quota" => "Domyślny udział",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
-"Unlimited" => "Bez limitu",
-"Other" => "Inne",
-"Username" => "Nazwa użytkownika",
-"Group Admin for" => "Grupa Admin dla",
-"Quota" => "Udział",
-"Storage Location" => "Lokalizacja magazynu",
-"Last Login" => "Ostatnio zalogowany",
-"change full name" => "Zmień pełna nazwę",
-"set new password" => "ustaw nowe hasło",
-"Default" => "Domyślny"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
new file mode 100644
index 00000000000..252a3044ced
--- /dev/null
+++ b/settings/l10n/pt_BR.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro de autenticação",
+    "Your full name has been changed." : "Seu nome completo foi alterado.",
+    "Unable to change full name" : "Não é possível alterar o nome completo",
+    "Group already exists" : "O Grupo já existe",
+    "Unable to add group" : "Não foi possível adicionar grupo",
+    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Não foi possível remover aplicativos.",
+    "Email saved" : "E-mail salvo",
+    "Invalid email" : "E-mail inválido",
+    "Unable to delete group" : "Não foi possível remover grupo",
+    "Unable to delete user" : "Não foi possível remover usuário",
+    "Backups restored successfully" : "Backup restaurado com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
+    "Unable to add user to group %s" : "Não foi possível adicionar usuário ao grupo %s",
+    "Unable to remove user from group %s" : "Não foi possível remover usuário do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
+    "Wrong password" : "Senha errada",
+    "No user supplied" : "Nenhum usuário fornecido",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
+    "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",
+    "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 email. Please revise your settings." : "Ocorreu um problema ao enviar o e-mail. Por favor, revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
+    "Disable" : "Desabilitar",
+    "Enable" : "Habilitar",
+    "Error while enabling app" : "Erro enquanto habilitava o aplicativo",
+    "Updating...." : "Atualizando...",
+    "Error while updating app" : "Erro ao atualizar aplicativo",
+    "Updated" : "Atualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Selecione uma imagem para o perfil",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Valid until {date}" : "Vádido até {date}",
+    "Delete" : "Excluir",
+    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
+    "Restore encryption keys." : "Restaurar chave de criptografia.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Não é possível excluir {objName}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido",
+    "deleted {groupName}" : "eliminado {groupName}",
+    "undo" : "desfazer",
+    "no group" : "nenhum grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "eliminado {userName}",
+    "add group" : "adicionar grupo",
+    "A valid username must be provided" : "Forneça um nome de usuário válido",
+    "Error creating user" : "Erro ao criar usuário",
+    "A valid password must be provided" : "Forneça uma senha válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O diretório home para o usuário \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL raíz",
+    "Encryption" : "Criptografia",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "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.",
+    "Setup Warning" : "Aviso de Configuração",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Informações de Desempenho do Banco de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Your PHP version is outdated" : "Sua versão de PHP está desatualizada",
+    "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." : "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
+    "PHP charset is not set to UTF-8" : "A configuração de caracteres no PHP não está definida para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
+    "Locale not working" : "Localização não funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
+    "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity checks" : "Verificação de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Último cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Sharing" : "Compartilhamento",
+    "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
+    "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
+    "Enforce password protection" : "Reforce a proteção por senha",
+    "Allow public uploads" : "Permitir envio público",
+    "Set default expiration date" : "Configurar a data de expiração",
+    "Expire after " : "Expirar depois de",
+    "days" : "dias",
+    "Enforce expiration date" : "Fazer cumprir a data de expiração",
+    "Allow resharing" : "Permitir recompartilhamento",
+    "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
+    "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
+    "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
+    "Security" : "Segurança",
+    "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.",
+    "Send mode" : "Modo enviar",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticaçã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",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Log" : "Registro",
+    "Log level" : "Nível de registro",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicativos",
+    "Add your app" : "Adicionar seu aplicativo",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Usuário",
+    "Admin Documentation" : "Documentação de Administrador",
+    "Update to %s" : "Atualizado para %s",
+    "Enable only for specific groups" : "Ativar apenas para grupos específicos",
+    "Uninstall App" : "Desinstalar Aplicativo",
+    "Administrator Documentation" : "Documentação de Administrador",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Rastreador de Bugs",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
+    "Password" : "Senha",
+    "Your password was changed" : "Sua senha foi alterada",
+    "Unable to change your password" : "Não é possivel alterar a sua senha",
+    "Current password" : "Senha atual",
+    "New password" : "Nova senha",
+    "Change password" : "Alterar senha",
+    "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 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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha como imagem para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Raíz",
+    "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" : "Descriptografar todos os Arquivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
+    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
+    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
+    "Show storage location" : "Mostrar localização de armazenamento",
+    "Show last log in" : "Mostrar o último acesso",
+    "Login Name" : "Nome de Login",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperação da Senha do Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
+    "Add Group" : "Adicionar Grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Quota Padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de Usuário",
+    "Group Admin for" : "Grupo Admin para",
+    "Quota" : "Cota",
+    "Storage Location" : "Local de Armazenamento",
+    "Last Login" : "Último Login",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova senha",
+    "Default" : "Padrão"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
new file mode 100644
index 00000000000..3e6b426930b
--- /dev/null
+++ b/settings/l10n/pt_BR.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro de autenticação",
+    "Your full name has been changed." : "Seu nome completo foi alterado.",
+    "Unable to change full name" : "Não é possível alterar o nome completo",
+    "Group already exists" : "O Grupo já existe",
+    "Unable to add group" : "Não foi possível adicionar grupo",
+    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Não foi possível remover aplicativos.",
+    "Email saved" : "E-mail salvo",
+    "Invalid email" : "E-mail inválido",
+    "Unable to delete group" : "Não foi possível remover grupo",
+    "Unable to delete user" : "Não foi possível remover usuário",
+    "Backups restored successfully" : "Backup restaurado com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
+    "Unable to add user to group %s" : "Não foi possível adicionar usuário ao grupo %s",
+    "Unable to remove user from group %s" : "Não foi possível remover usuário do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
+    "Wrong password" : "Senha errada",
+    "No user supplied" : "Nenhum usuário fornecido",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
+    "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",
+    "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 email. Please revise your settings." : "Ocorreu um problema ao enviar o e-mail. Por favor, revise 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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
+    "Disable" : "Desabilitar",
+    "Enable" : "Habilitar",
+    "Error while enabling app" : "Erro enquanto habilitava o aplicativo",
+    "Updating...." : "Atualizando...",
+    "Error while updating app" : "Erro ao atualizar aplicativo",
+    "Updated" : "Atualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Selecione uma imagem para o perfil",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Valid until {date}" : "Vádido até {date}",
+    "Delete" : "Excluir",
+    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
+    "Restore encryption keys." : "Restaurar chave de criptografia.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Não é possível excluir {objName}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido",
+    "deleted {groupName}" : "eliminado {groupName}",
+    "undo" : "desfazer",
+    "no group" : "nenhum grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "eliminado {userName}",
+    "add group" : "adicionar grupo",
+    "A valid username must be provided" : "Forneça um nome de usuário válido",
+    "Error creating user" : "Erro ao criar usuário",
+    "A valid password must be provided" : "Forneça uma senha válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O diretório home para o usuário \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL raíz",
+    "Encryption" : "Criptografia",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "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.",
+    "Setup Warning" : "Aviso de Configuração",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
+    "Database Performance Info" : "Informações de Desempenho do Banco de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Your PHP version is outdated" : "Sua versão de PHP está desatualizada",
+    "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." : "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
+    "PHP charset is not set to UTF-8" : "A configuração de caracteres no PHP não está definida para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
+    "Locale not working" : "Localização não funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
+    "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity checks" : "Verificação de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Último cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Sharing" : "Compartilhamento",
+    "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
+    "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
+    "Enforce password protection" : "Reforce a proteção por senha",
+    "Allow public uploads" : "Permitir envio público",
+    "Set default expiration date" : "Configurar a data de expiração",
+    "Expire after " : "Expirar depois de",
+    "days" : "dias",
+    "Enforce expiration date" : "Fazer cumprir a data de expiração",
+    "Allow resharing" : "Permitir recompartilhamento",
+    "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
+    "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
+    "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
+    "Security" : "Segurança",
+    "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.",
+    "Send mode" : "Modo enviar",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticaçã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",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Log" : "Registro",
+    "Log level" : "Nível de registro",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicativos",
+    "Add your app" : "Adicionar seu aplicativo",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Usuário",
+    "Admin Documentation" : "Documentação de Administrador",
+    "Update to %s" : "Atualizado para %s",
+    "Enable only for specific groups" : "Ativar apenas para grupos específicos",
+    "Uninstall App" : "Desinstalar Aplicativo",
+    "Administrator Documentation" : "Documentação de Administrador",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Rastreador de Bugs",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
+    "Password" : "Senha",
+    "Your password was changed" : "Sua senha foi alterada",
+    "Unable to change your password" : "Não é possivel alterar a sua senha",
+    "Current password" : "Senha atual",
+    "New password" : "Nova senha",
+    "Change password" : "Alterar senha",
+    "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 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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha como imagem para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Raíz",
+    "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" : "Descriptografar todos os Arquivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
+    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
+    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
+    "Show storage location" : "Mostrar localização de armazenamento",
+    "Show last log in" : "Mostrar o último acesso",
+    "Login Name" : "Nome de Login",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperação da Senha do Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
+    "Add Group" : "Adicionar Grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Quota Padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de Usuário",
+    "Group Admin for" : "Grupo Admin para",
+    "Quota" : "Cota",
+    "Storage Location" : "Local de Armazenamento",
+    "Last Login" : "Último Login",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova senha",
+    "Default" : "Padrão"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
deleted file mode 100644
index 4b7cfb6ed76..00000000000
--- a/settings/l10n/pt_BR.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"Not enabled" => "Desabilitado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Erro de autenticação",
-"Your full name has been changed." => "Seu nome completo foi alterado.",
-"Unable to change full name" => "Não é possível alterar o nome completo",
-"Group already exists" => "O Grupo já existe",
-"Unable to add group" => "Não foi possível adicionar grupo",
-"Files decrypted successfully" => "Arquivos descriptografados com sucesso",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't decrypt your files, check your password and try again" => "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
-"Encryption keys deleted permanently" => "Chaves de criptografia excluídas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
-"Couldn't remove app." => "Não foi possível remover aplicativos.",
-"Email saved" => "E-mail salvo",
-"Invalid email" => "E-mail inválido",
-"Unable to delete group" => "Não foi possível remover grupo",
-"Unable to delete user" => "Não foi possível remover usuário",
-"Backups restored successfully" => "Backup restaurado com sucesso",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
-"Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Administradores não pode remover a si mesmos do grupo de administração",
-"Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s",
-"Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s",
-"Couldn't update app." => "Não foi possível atualizar a app.",
-"Wrong password" => "Senha errada",
-"No user supplied" => "Nenhum usuário fornecido",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
-"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",
-"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 email. Please revise your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, revise 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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
-"Add trusted domain" => "Adicionar domínio confiável",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Por favor, aguarde...",
-"Error while disabling app" => "Erro enquanto desabilitava o aplicativo",
-"Disable" => "Desabilitar",
-"Enable" => "Habilitar",
-"Error while enabling app" => "Erro enquanto habilitava o aplicativo",
-"Updating...." => "Atualizando...",
-"Error while updating app" => "Erro ao atualizar aplicativo",
-"Updated" => "Atualizado",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Erro enquanto desinstalava aplicativo",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Selecione uma imagem para o perfil",
-"Very weak password" => "Senha muito fraca",
-"Weak password" => "Senha fraca",
-"So-so password" => "Senha mais ou menos",
-"Good password" => "Boa senha",
-"Strong password" => "Senha forte",
-"Valid until {date}" => "Vádido até {date}",
-"Delete" => "Excluir",
-"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-"Delete encryption keys permanently." => "Eliminando a chave de criptografia permanentemente.",
-"Restore encryption keys." => "Restaurar chave de criptografia.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Não é possível excluir {objName}",
-"Error creating group" => "Erro ao criar grupo",
-"A valid group name must be provided" => "Um nome de grupo válido deve ser fornecido",
-"deleted {groupName}" => "eliminado {groupName}",
-"undo" => "desfazer",
-"no group" => "nenhum grupo",
-"never" => "nunca",
-"deleted {userName}" => "eliminado {userName}",
-"add group" => "adicionar grupo",
-"A valid username must be provided" => "Forneça um nome de usuário válido",
-"Error creating user" => "Erro ao criar usuário",
-"A valid password must be provided" => "Forneça uma senha válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Aviso: O diretório home para o usuário \"{user}\" já existe",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Informação Pessoal",
-"SSL root certificates" => "Certificados SSL raíz",
-"Encryption" => "Criptografia",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (questões fatais, erros, avisos, informações, depuração)",
-"Info, warnings, errors and fatal issues" => "Informações, avisos, erros e problemas fatais",
-"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.",
-"Setup Warning" => "Aviso de Configuração",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
-"Database Performance Info" => "Informações de Desempenho do Banco de Dados",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
-"Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
-"Your PHP version is outdated" => "Sua versão de PHP está desatualizada",
-"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." => "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
-"PHP charset is not set to UTF-8" => "A configuração de caracteres no PHP não está definida para UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
-"Locale not working" => "Localização não funcionando",
-"System locale can not be set to a one which supports UTF-8." => "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
-"URL generation in notification emails" => "Geração de URL em e-mails de notificação",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
-"Connectivity checks" => "Verificação de conectividade",
-"No problems found" => "Nenhum problema encontrado",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira o <a href='%s'>guia de instalação</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Último cron foi executado em %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
-"Cron was not executed yet!" => "Cron não foi executado ainda!",
-"Execute one task with each page loaded" => "Execute uma tarefa com cada página carregada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-"Sharing" => "Compartilhamento",
-"Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
-"Allow users to share via link" => "Permitir que os usuários compartilhem por link",
-"Enforce password protection" => "Reforce a proteção por senha",
-"Allow public uploads" => "Permitir envio público",
-"Set default expiration date" => "Configurar a data de expiração",
-"Expire after " => "Expirar depois de",
-"days" => "dias",
-"Enforce expiration date" => "Fazer cumprir a data de expiração",
-"Allow resharing" => "Permitir recompartilhamento",
-"Restrict users to only share with users in their groups" => "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
-"Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
-"Exclude groups from sharing" => "Excluir grupos de compartilhamento",
-"These groups will still be able to receive shares, but not to initiate them." => "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
-"Security" => "Segurança",
-"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.",
-"Send mode" => "Modo enviar",
-"From address" => "Do Endereço",
-"mail" => "email",
-"Authentication method" => "Método de autenticaçã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",
-"Store credentials" => "Armazenar credenciais",
-"Test email settings" => "Configurações de e-mail de teste",
-"Send email" => "Enviar email",
-"Log" => "Registro",
-"Log level" => "Nível de registro",
-"More" => "Mais",
-"Less" => "Menos",
-"Version" => "Versão",
-"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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Mais aplicativos",
-"Add your app" => "Adicionar seu aplicativo",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentação:",
-"User Documentation" => "Documentação de Usuário",
-"Admin Documentation" => "Documentação de Administrador",
-"Update to %s" => "Atualizado para %s",
-"Enable only for specific groups" => "Ativar apenas para grupos específicos",
-"Uninstall App" => "Desinstalar Aplicativo",
-"Administrator Documentation" => "Documentação de Administrador",
-"Online Documentation" => "Documentação Online",
-"Forum" => "Fórum",
-"Bugtracker" => "Rastreador de Bugs",
-"Commercial Support" => "Suporte Comercial",
-"Get the apps to sync your files" => "Faça com que os apps sincronizem seus arquivos",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
-"Show First Run Wizard again" => "Mostrar Assistente de Primeira Execução novamente",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
-"Password" => "Senha",
-"Your password was changed" => "Sua senha foi alterada",
-"Unable to change your password" => "Não é possivel alterar a sua senha",
-"Current password" => "Senha atual",
-"New password" => "Nova senha",
-"Change password" => "Alterar senha",
-"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 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.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolha como imagem para o perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajude a traduzir",
-"Common Name" => "Nome",
-"Valid until" => "Válido até",
-"Issued By" => "Emitido Por",
-"Valid until %s" => "Válido até %s",
-"Import Root Certificate" => "Importar Certificado Raíz",
-"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" => "Descriptografar todos os Arquivos",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
-"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
-"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
-"Show storage location" => "Mostrar localização de armazenamento",
-"Show last log in" => "Mostrar o último acesso",
-"Login Name" => "Nome de Login",
-"Create" => "Criar",
-"Admin Recovery Password" => "Recuperação da Senha do Administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-"Search Users and Groups" => "Pesquisar Usuários e Grupos",
-"Add Group" => "Adicionar Grupo",
-"Group" => "Grupo",
-"Everyone" => "Para todos",
-"Admins" => "Administradores",
-"Default Quota" => "Quota Padrão",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Outro",
-"Username" => "Nome de Usuário",
-"Group Admin for" => "Grupo Admin para",
-"Quota" => "Cota",
-"Storage Location" => "Local de Armazenamento",
-"Last Login" => "Último Login",
-"change full name" => "alterar nome completo",
-"set new password" => "definir nova senha",
-"Default" => "Padrão"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
new file mode 100644
index 00000000000..0c5ea85be5c
--- /dev/null
+++ b/settings/l10n/pt_PT.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro na autenticação",
+    "Your full name has been changed." : "O seu nome completo foi alterado.",
+    "Unable to change full name" : "Não foi possível alterar o seu nome completo",
+    "Group already exists" : "O grupo já existe",
+    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Impossível remover aplicação.",
+    "Email saved" : "Email guardado",
+    "Invalid email" : "Email inválido",
+    "Unable to delete group" : "Impossível apagar grupo",
+    "Unable to delete user" : "Impossível apagar utilizador",
+    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido Inválido",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Wrong password" : "Password errada",
+    "No user supplied" : "Nenhum utilizador especificado.",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
+    "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",
+    "Saved" : "Guardado",
+    "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 correctas",
+    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável ",
+    "Sending..." : "A enviar...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor aguarde...",
+    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Updating...." : "A Actualizar...",
+    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ....",
+    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Valid until {date}" : "Válido até {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
+    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Impossível apagar {objNome}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "deleted {groupName}" : "apagar {Nome do grupo}",
+    "undo" : "desfazer",
+    "no group" : "sem grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "apagar{utilizador}",
+    "add group" : "Adicionar grupo",
+    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
+    "Error creating user" : "Erro a criar utilizador",
+    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL de raiz",
+    "Encryption" : "Encriptação",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de 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." : "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.",
+    "Setup Warning" : "Aviso de setup",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
+    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
+    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "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." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
+    "Locale not working" : "Internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
+    "URL generation in notification emails" : "Geração URL em e-mails de notificação",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity checks" : "Verificações de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Sharing" : "Partilha",
+    "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
+    "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
+    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Allow public uploads" : "Permitir Envios Públicos",
+    "Set default expiration date" : "Especificar a data padrão de expiração",
+    "Expire after " : "Expira após",
+    "days" : "dias",
+    "Enforce expiration date" : "Forçar a data de expiração",
+    "Allow resharing" : "Permitir repartilha",
+    "Restrict users to only share with users in their groups" : "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
+    "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+    "Exclude groups from sharing" : "Excluir grupos das partilhas",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
+    "Security" : "Segurança",
+    "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",
+    "Send mode" : "Modo de envio",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de autenticaçã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",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar configurações de email",
+    "Send email" : "Enviar email",
+    "Log" : "Registo",
+    "Log level" : "Nível do registo",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicações",
+    "Add your app" : "Adicione a sua aplicação",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Utilizador",
+    "Admin Documentation" : "Documentação de administrador.",
+    "Update to %s" : "Actualizar para %s",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicação",
+    "Administrator Documentation" : "Documentação de administrador.",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
+    "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "A sua palavra-passe foi alterada",
+    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
+    "Current password" : "Palavra-chave actual",
+    "New password" : "Nova palavra-chave",
+    "Change password" : "Alterar palavra-chave",
+    "Full Name" : "Nome completo",
+    "Email" : "Email",
+    "Your email address" : "O seu endereço de email",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha uma fotografia de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome Comum",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
+    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
+    "Show storage location" : "Mostrar a localização do armazenamento",
+    "Show last log in" : "Mostrar ultimo acesso de entrada",
+    "Login Name" : "Nome de utilizador",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperar password de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
+    "Add Group" : "Adicionar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administrador",
+    "Default Quota" : "Quota por padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de utilizador",
+    "Group Admin for" : "Administrador de Grupo para",
+    "Quota" : "Quota",
+    "Storage Location" : "Localização do Armazenamento",
+    "Last Login" : "Ultimo acesso",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova palavra-passe",
+    "Default" : "Padrão"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
new file mode 100644
index 00000000000..e8b20792b3f
--- /dev/null
+++ b/settings/l10n/pt_PT.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro na autenticação",
+    "Your full name has been changed." : "O seu nome completo foi alterado.",
+    "Unable to change full name" : "Não foi possível alterar o seu nome completo",
+    "Group already exists" : "O grupo já existe",
+    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Impossível remover aplicação.",
+    "Email saved" : "Email guardado",
+    "Invalid email" : "Email inválido",
+    "Unable to delete group" : "Impossível apagar grupo",
+    "Unable to delete user" : "Impossível apagar utilizador",
+    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido Inválido",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Wrong password" : "Password errada",
+    "No user supplied" : "Nenhum utilizador especificado.",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
+    "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",
+    "Saved" : "Guardado",
+    "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 correctas",
+    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável ",
+    "Sending..." : "A enviar...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor aguarde...",
+    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Updating...." : "A Actualizar...",
+    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ....",
+    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Valid until {date}" : "Válido até {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
+    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Impossível apagar {objNome}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "deleted {groupName}" : "apagar {Nome do grupo}",
+    "undo" : "desfazer",
+    "no group" : "sem grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "apagar{utilizador}",
+    "add group" : "Adicionar grupo",
+    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
+    "Error creating user" : "Erro a criar utilizador",
+    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL de raiz",
+    "Encryption" : "Encriptação",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de 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." : "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.",
+    "Setup Warning" : "Aviso de setup",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
+    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
+    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "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." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
+    "Locale not working" : "Internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
+    "URL generation in notification emails" : "Geração URL em e-mails de notificação",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity checks" : "Verificações de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Sharing" : "Partilha",
+    "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
+    "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
+    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Allow public uploads" : "Permitir Envios Públicos",
+    "Set default expiration date" : "Especificar a data padrão de expiração",
+    "Expire after " : "Expira após",
+    "days" : "dias",
+    "Enforce expiration date" : "Forçar a data de expiração",
+    "Allow resharing" : "Permitir repartilha",
+    "Restrict users to only share with users in their groups" : "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
+    "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+    "Exclude groups from sharing" : "Excluir grupos das partilhas",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
+    "Security" : "Segurança",
+    "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",
+    "Send mode" : "Modo de envio",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de autenticaçã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",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar configurações de email",
+    "Send email" : "Enviar email",
+    "Log" : "Registo",
+    "Log level" : "Nível do registo",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicações",
+    "Add your app" : "Adicione a sua aplicação",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Utilizador",
+    "Admin Documentation" : "Documentação de administrador.",
+    "Update to %s" : "Actualizar para %s",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicação",
+    "Administrator Documentation" : "Documentação de administrador.",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
+    "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "A sua palavra-passe foi alterada",
+    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
+    "Current password" : "Palavra-chave actual",
+    "New password" : "Nova palavra-chave",
+    "Change password" : "Alterar palavra-chave",
+    "Full Name" : "Nome completo",
+    "Email" : "Email",
+    "Your email address" : "O seu endereço de email",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "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.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha uma fotografia de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome Comum",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Root",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
+    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
+    "Show storage location" : "Mostrar a localização do armazenamento",
+    "Show last log in" : "Mostrar ultimo acesso de entrada",
+    "Login Name" : "Nome de utilizador",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperar password de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
+    "Add Group" : "Adicionar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administrador",
+    "Default Quota" : "Quota por padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de utilizador",
+    "Group Admin for" : "Administrador de Grupo para",
+    "Quota" : "Quota",
+    "Storage Location" : "Localização do Armazenamento",
+    "Last Login" : "Ultimo acesso",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova palavra-passe",
+    "Default" : "Padrão"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
deleted file mode 100644
index 363cf1959f7..00000000000
--- a/settings/l10n/pt_PT.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Ativada",
-"Not enabled" => "Desactivado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Erro na autenticação",
-"Your full name has been changed." => "O seu nome completo foi alterado.",
-"Unable to change full name" => "Não foi possível alterar o seu nome completo",
-"Group already exists" => "O grupo já existe",
-"Unable to add group" => "Impossível acrescentar o grupo",
-"Files decrypted successfully" => "Ficheiros desencriptados com sucesso",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't decrypt your files, check your password and try again" => "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
-"Encryption keys deleted permanently" => "A chave de encriptação foi eliminada permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't remove app." => "Impossível remover aplicação.",
-"Email saved" => "Email guardado",
-"Invalid email" => "Email inválido",
-"Unable to delete group" => "Impossível apagar grupo",
-"Unable to delete user" => "Impossível apagar utilizador",
-"Backups restored successfully" => "Cópias de segurança foram restauradas com sucesso",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido Inválido",
-"Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
-"Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
-"Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
-"Couldn't update app." => "Não foi possível actualizar a aplicação.",
-"Wrong password" => "Password errada",
-"No user supplied" => "Nenhum utilizador especificado.",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
-"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",
-"Saved" => "Guardado",
-"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 correctas",
-"A problem occurred while sending the email. Please revise your settings." => "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
-"Email sent" => "E-mail enviado",
-"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
-"Add trusted domain" => "Adicionar domínio confiável ",
-"Sending..." => "A enviar...",
-"All" => "Todos",
-"Please wait...." => "Por favor aguarde...",
-"Error while disabling app" => "Erro enquanto desactivava a aplicação",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Erro enquanto activava a aplicação",
-"Updating...." => "A Actualizar...",
-"Error while updating app" => "Erro enquanto actualizava a aplicação",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando ....",
-"Error while uninstalling app" => "Erro durante a desinstalação da aplicação",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Seleccione uma fotografia de perfil",
-"Very weak password" => "Password muito fraca",
-"Weak password" => "Password fraca",
-"So-so password" => "Password aceitável",
-"Good password" => "Password Forte",
-"Strong password" => "Password muito forte",
-"Valid until {date}" => "Válido até {date}",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-"Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
-"Restore encryption keys." => "Restaurar chaves encriptadas.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Impossível apagar {objNome}",
-"Error creating group" => "Erro ao criar grupo",
-"A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido",
-"deleted {groupName}" => "apagar {Nome do grupo}",
-"undo" => "desfazer",
-"no group" => "sem grupo",
-"never" => "nunca",
-"deleted {userName}" => "apagar{utilizador}",
-"add group" => "Adicionar grupo",
-"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
-"Error creating user" => "Erro a criar utilizador",
-"A valid password must be provided" => "Uma password válida deve ser fornecida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Informação Pessoal",
-"SSL root certificates" => "Certificados SSL de raiz",
-"Encryption" => "Encriptação",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (problemas fatais, erros, avisos, informação, depuração)",
-"Info, warnings, errors and fatal issues" => "Informação, avisos, erros e problemas fatais",
-"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",
-"Plain" => "Plano",
-"NT LAN Manager" => "Gestor de 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." => "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.",
-"Setup Warning" => "Aviso de setup",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
-"Database Performance Info" => "Informação sobre desempenho da Base de Dados",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
-"Your PHP version is outdated" => "A sua versão do PHP está ultrapassada",
-"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." => "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
-"PHP charset is not set to UTF-8" => "PHP charset não está definido para UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
-"Locale not working" => "Internacionalização não está a funcionar",
-"System locale can not be set to a one which supports UTF-8." => "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
-"URL generation in notification emails" => "Geração URL em e-mails de notificação",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-"Connectivity checks" => "Verificações de conectividade",
-"No problems found" => "Nenhum problema encontrado",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
-"Cron was not executed yet!" => "Cron ainda não foi executado!",
-"Execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-"Sharing" => "Partilha",
-"Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
-"Allow users to share via link" => "Permitir que os utilizadores partilhem através do link",
-"Enforce password protection" => "Forçar protecção da palavra passe",
-"Allow public uploads" => "Permitir Envios Públicos",
-"Set default expiration date" => "Especificar a data padrão de expiração",
-"Expire after " => "Expira após",
-"days" => "dias",
-"Enforce expiration date" => "Forçar a data de expiração",
-"Allow resharing" => "Permitir repartilha",
-"Restrict users to only share with users in their groups" => "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
-"Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
-"Exclude groups from sharing" => "Excluir grupos das partilhas",
-"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
-"Security" => "Segurança",
-"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",
-"Send mode" => "Modo de envio",
-"From address" => "Do endereço",
-"mail" => "Correio",
-"Authentication method" => "Método de autenticaçã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",
-"Store credentials" => "Armazenar credenciais",
-"Test email settings" => "Testar configurações de email",
-"Send email" => "Enviar email",
-"Log" => "Registo",
-"Log level" => "Nível do registo",
-"More" => "Mais",
-"Less" => "Menos",
-"Version" => "Versão",
-"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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Mais aplicações",
-"Add your app" => "Adicione a sua aplicação",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentação:",
-"User Documentation" => "Documentação de Utilizador",
-"Admin Documentation" => "Documentação de administrador.",
-"Update to %s" => "Actualizar para %s",
-"Enable only for specific groups" => "Activar só para grupos específicos",
-"Uninstall App" => "Desinstalar aplicação",
-"Administrator Documentation" => "Documentação de administrador.",
-"Online Documentation" => "Documentação Online",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Suporte Comercial",
-"Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
-"Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-"Password" => "Password",
-"Your password was changed" => "A sua palavra-passe foi alterada",
-"Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
-"Current password" => "Palavra-chave actual",
-"New password" => "Nova palavra-chave",
-"Change password" => "Alterar palavra-chave",
-"Full Name" => "Nome completo",
-"Email" => "Email",
-"Your email address" => "O seu endereço de email",
-"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
-"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.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolha uma fotografia de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajude a traduzir",
-"Common Name" => "Nome Comum",
-"Valid until" => "Válido até",
-"Issued By" => "Emitido Por",
-"Valid until %s" => "Válido até %s",
-"Import Root Certificate" => "Importar Certificado Root",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
-"Restore Encryption Keys" => "Restaurar as chaves de encriptação",
-"Delete Encryption Keys" => "Apagar as chaves de encriptação",
-"Show storage location" => "Mostrar a localização do armazenamento",
-"Show last log in" => "Mostrar ultimo acesso de entrada",
-"Login Name" => "Nome de utilizador",
-"Create" => "Criar",
-"Admin Recovery Password" => "Recuperar password de administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
-"Search Users and Groups" => "Pesquisa Utilizadores e Grupos",
-"Add Group" => "Adicionar grupo",
-"Group" => "Grupo",
-"Everyone" => "Para todos",
-"Admins" => "Administrador",
-"Default Quota" => "Quota por padrão",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Outro",
-"Username" => "Nome de utilizador",
-"Group Admin for" => "Administrador de Grupo para",
-"Quota" => "Quota",
-"Storage Location" => "Localização do Armazenamento",
-"Last Login" => "Ultimo acesso",
-"change full name" => "alterar nome completo",
-"set new password" => "definir nova palavra-passe",
-"Default" => "Padrão"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
new file mode 100644
index 00000000000..64e3d811832
--- /dev/null
+++ b/settings/l10n/ro.js
@@ -0,0 +1,137 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
+    "Authentication error" : "Eroare la autentificare",
+    "Your full name has been changed." : "Numele tău complet a fost schimbat.",
+    "Unable to change full name" : "Nu s-a puput schimba numele complet",
+    "Group already exists" : "Grupul există deja",
+    "Unable to add group" : "Nu s-a putut adăuga grupul",
+    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
+    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
+    "Email saved" : "E-mail salvat",
+    "Invalid email" : "E-mail invalid",
+    "Unable to delete group" : "Nu s-a putut șterge grupul",
+    "Unable to delete user" : "Nu s-a putut șterge utilizatorul",
+    "Language changed" : "Limba a fost schimbată",
+    "Invalid request" : "Cerere eronată",
+    "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
+    "Unable to add user to group %s" : "Nu s-a putut adăuga utilizatorul la grupul %s",
+    "Unable to remove user from group %s" : "Nu s-a putut elimina utilizatorul din grupul %s",
+    "Couldn't update app." : "Aplicaţia nu s-a putut actualiza.",
+    "Wrong password" : "Parolă greșită",
+    "No user supplied" : "Nici un utilizator furnizat",
+    "Unable to change password" : "Imposibil de schimbat parola",
+    "Saved" : "Salvat",
+    "test email settings" : "verifică setările de e-mail",
+    "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
+    "Email sent" : "Mesajul a fost expediat",
+    "Sending..." : "Se expediază...",
+    "All" : "Toate ",
+    "Please wait...." : "Aşteptaţi vă rog....",
+    "Error while disabling app" : "Eroare în timpul dezactivării aplicației",
+    "Disable" : "Dezactivați",
+    "Enable" : "Activare",
+    "Error while enabling app" : "Eroare în timpul activării applicației",
+    "Updating...." : "Actualizare în curs....",
+    "Error while updating app" : "Eroare în timpul actualizării aplicaţiei",
+    "Updated" : "Actualizat",
+    "Select a profile picture" : "Selectează o imagine de profil",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Delete" : "Șterge",
+    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
+    "Groups" : "Grupuri",
+    "undo" : "Anulează ultima acțiune",
+    "never" : "niciodată",
+    "add group" : "adăugaţi grupul",
+    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
+    "Error creating user" : "Eroare la crearea utilizatorului",
+    "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
+    "__language_name__" : "_language_name_",
+    "SSL root certificates" : "Certificate SSL root",
+    "Encryption" : "Încriptare",
+    "None" : "Niciuna",
+    "Login" : "Autentificare",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertisment de securitate",
+    "Setup Warning" : "Atenţie la implementare",
+    "Module 'fileinfo' missing" : "Modulul \"Fileinfo\" lipsește",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
+    "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
+    "Locale not working" : "Localizarea nu funcționează",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
+    "Sharing" : "Partajare",
+    "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
+    "Allow public uploads" : "Permite încărcări publice",
+    "Allow resharing" : "Permite repartajarea",
+    "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "Security" : "Securitate",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
+    "Send mode" : "Modul de expediere",
+    "Authentication method" : "Modul de autentificare",
+    "Server address" : "Adresa server-ului",
+    "Port" : "Portul",
+    "SMTP Username" : "Nume utilizator SMTP",
+    "SMTP Password" : "Parolă SMTP",
+    "Test email settings" : "Verifică setările de e-mail",
+    "Send email" : "Expediază mesajul",
+    "Log" : "Jurnal de activitate",
+    "Log level" : "Nivel jurnal",
+    "More" : "Mai mult",
+    "Less" : "Mai puțin",
+    "Version" : "Versiunea",
+    "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>." : "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "după",
+    "User Documentation" : "Documentație utilizator",
+    "Administrator Documentation" : "Documentație administrator",
+    "Online Documentation" : "Documentație online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Urmărire bug-uri",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
+    "Password" : "Parolă",
+    "Your password was changed" : "Parola a fost modificată",
+    "Unable to change your password" : "Imposibil de-ați schimbat parola",
+    "Current password" : "Parola curentă",
+    "New password" : "Noua parolă",
+    "Change password" : "Schimbă parola",
+    "Full Name" : "Nume complet",
+    "Email" : "Email",
+    "Your email address" : "Adresa ta de email",
+    "Profile picture" : "Imagine de profil",
+    "Upload new" : "Încarcă una nouă",
+    "Select new from Files" : "Selectează una din Fișiere",
+    "Remove image" : "Înlătură imagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Doar png sau jpg de formă pătrată. ",
+    "Cancel" : "Anulare",
+    "Choose as profile image" : "Alege drept imagine de profil",
+    "Language" : "Limba",
+    "Help translate" : "Ajută la traducere",
+    "Import Root Certificate" : "Importă certificat root",
+    "Log-in password" : "Parolă",
+    "Decrypt all Files" : "Decriptează toate fișierele",
+    "Login Name" : "Autentificare",
+    "Create" : "Crează",
+    "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
+    "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
+    "Group" : "Grup",
+    "Default Quota" : "Cotă implicită",
+    "Unlimited" : "Nelimitată",
+    "Other" : "Altele",
+    "Username" : "Nume utilizator",
+    "Quota" : "Cotă",
+    "change full name" : "schimbă numele complet",
+    "set new password" : "setează parolă nouă",
+    "Default" : "Implicită"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
new file mode 100644
index 00000000000..c4c756e9367
--- /dev/null
+++ b/settings/l10n/ro.json
@@ -0,0 +1,135 @@
+{ "translations": {
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
+    "Authentication error" : "Eroare la autentificare",
+    "Your full name has been changed." : "Numele tău complet a fost schimbat.",
+    "Unable to change full name" : "Nu s-a puput schimba numele complet",
+    "Group already exists" : "Grupul există deja",
+    "Unable to add group" : "Nu s-a putut adăuga grupul",
+    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
+    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
+    "Email saved" : "E-mail salvat",
+    "Invalid email" : "E-mail invalid",
+    "Unable to delete group" : "Nu s-a putut șterge grupul",
+    "Unable to delete user" : "Nu s-a putut șterge utilizatorul",
+    "Language changed" : "Limba a fost schimbată",
+    "Invalid request" : "Cerere eronată",
+    "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
+    "Unable to add user to group %s" : "Nu s-a putut adăuga utilizatorul la grupul %s",
+    "Unable to remove user from group %s" : "Nu s-a putut elimina utilizatorul din grupul %s",
+    "Couldn't update app." : "Aplicaţia nu s-a putut actualiza.",
+    "Wrong password" : "Parolă greșită",
+    "No user supplied" : "Nici un utilizator furnizat",
+    "Unable to change password" : "Imposibil de schimbat parola",
+    "Saved" : "Salvat",
+    "test email settings" : "verifică setările de e-mail",
+    "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
+    "Email sent" : "Mesajul a fost expediat",
+    "Sending..." : "Se expediază...",
+    "All" : "Toate ",
+    "Please wait...." : "Aşteptaţi vă rog....",
+    "Error while disabling app" : "Eroare în timpul dezactivării aplicației",
+    "Disable" : "Dezactivați",
+    "Enable" : "Activare",
+    "Error while enabling app" : "Eroare în timpul activării applicației",
+    "Updating...." : "Actualizare în curs....",
+    "Error while updating app" : "Eroare în timpul actualizării aplicaţiei",
+    "Updated" : "Actualizat",
+    "Select a profile picture" : "Selectează o imagine de profil",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Delete" : "Șterge",
+    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
+    "Groups" : "Grupuri",
+    "undo" : "Anulează ultima acțiune",
+    "never" : "niciodată",
+    "add group" : "adăugaţi grupul",
+    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
+    "Error creating user" : "Eroare la crearea utilizatorului",
+    "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
+    "__language_name__" : "_language_name_",
+    "SSL root certificates" : "Certificate SSL root",
+    "Encryption" : "Încriptare",
+    "None" : "Niciuna",
+    "Login" : "Autentificare",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertisment de securitate",
+    "Setup Warning" : "Atenţie la implementare",
+    "Module 'fileinfo' missing" : "Modulul \"Fileinfo\" lipsește",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
+    "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
+    "Locale not working" : "Localizarea nu funcționează",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
+    "Sharing" : "Partajare",
+    "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
+    "Allow public uploads" : "Permite încărcări publice",
+    "Allow resharing" : "Permite repartajarea",
+    "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "Security" : "Securitate",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
+    "Send mode" : "Modul de expediere",
+    "Authentication method" : "Modul de autentificare",
+    "Server address" : "Adresa server-ului",
+    "Port" : "Portul",
+    "SMTP Username" : "Nume utilizator SMTP",
+    "SMTP Password" : "Parolă SMTP",
+    "Test email settings" : "Verifică setările de e-mail",
+    "Send email" : "Expediază mesajul",
+    "Log" : "Jurnal de activitate",
+    "Log level" : "Nivel jurnal",
+    "More" : "Mai mult",
+    "Less" : "Mai puțin",
+    "Version" : "Versiunea",
+    "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>." : "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "după",
+    "User Documentation" : "Documentație utilizator",
+    "Administrator Documentation" : "Documentație administrator",
+    "Online Documentation" : "Documentație online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Urmărire bug-uri",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
+    "Password" : "Parolă",
+    "Your password was changed" : "Parola a fost modificată",
+    "Unable to change your password" : "Imposibil de-ați schimbat parola",
+    "Current password" : "Parola curentă",
+    "New password" : "Noua parolă",
+    "Change password" : "Schimbă parola",
+    "Full Name" : "Nume complet",
+    "Email" : "Email",
+    "Your email address" : "Adresa ta de email",
+    "Profile picture" : "Imagine de profil",
+    "Upload new" : "Încarcă una nouă",
+    "Select new from Files" : "Selectează una din Fișiere",
+    "Remove image" : "Înlătură imagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Doar png sau jpg de formă pătrată. ",
+    "Cancel" : "Anulare",
+    "Choose as profile image" : "Alege drept imagine de profil",
+    "Language" : "Limba",
+    "Help translate" : "Ajută la traducere",
+    "Import Root Certificate" : "Importă certificat root",
+    "Log-in password" : "Parolă",
+    "Decrypt all Files" : "Decriptează toate fișierele",
+    "Login Name" : "Autentificare",
+    "Create" : "Crează",
+    "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
+    "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
+    "Group" : "Grup",
+    "Default Quota" : "Cotă implicită",
+    "Unlimited" : "Nelimitată",
+    "Other" : "Altele",
+    "Username" : "Nume utilizator",
+    "Quota" : "Cotă",
+    "change full name" : "schimbă numele complet",
+    "set new password" : "setează parolă nouă",
+    "Default" : "Implicită"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
deleted file mode 100644
index a0cf5139e52..00000000000
--- a/settings/l10n/ro.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activat",
-"Recommended" => "Recomandat",
-"Authentication error" => "Eroare la autentificare",
-"Your full name has been changed." => "Numele tău complet a fost schimbat.",
-"Unable to change full name" => "Nu s-a puput schimba numele complet",
-"Group already exists" => "Grupul există deja",
-"Unable to add group" => "Nu s-a putut adăuga grupul",
-"Files decrypted successfully" => "Fișierele au fost decriptate cu succes",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
-"Couldn't decrypt your files, check your password and try again" => "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
-"Email saved" => "E-mail salvat",
-"Invalid email" => "E-mail invalid",
-"Unable to delete group" => "Nu s-a putut șterge grupul",
-"Unable to delete user" => "Nu s-a putut șterge utilizatorul",
-"Language changed" => "Limba a fost schimbată",
-"Invalid request" => "Cerere eronată",
-"Admins can't remove themself from the admin group" => "Administratorii nu se pot șterge singuri din grupul admin",
-"Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
-"Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
-"Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
-"Wrong password" => "Parolă greșită",
-"No user supplied" => "Nici un utilizator furnizat",
-"Unable to change password" => "Imposibil de schimbat parola",
-"Saved" => "Salvat",
-"test email settings" => "verifică setările de e-mail",
-"If you received this email, the settings seem to be correct." => "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
-"Email sent" => "Mesajul a fost expediat",
-"Sending..." => "Se expediază...",
-"All" => "Toate ",
-"Please wait...." => "Aşteptaţi vă rog....",
-"Error while disabling app" => "Eroare în timpul dezactivării aplicației",
-"Disable" => "Dezactivați",
-"Enable" => "Activare",
-"Error while enabling app" => "Eroare în timpul activării applicației",
-"Updating...." => "Actualizare în curs....",
-"Error while updating app" => "Eroare în timpul actualizării aplicaţiei",
-"Updated" => "Actualizat",
-"Select a profile picture" => "Selectează o imagine de profil",
-"Very weak password" => "Parolă foarte slabă",
-"Weak password" => "Parolă slabă",
-"Good password" => "Parolă bună",
-"Strong password" => "Parolă puternică",
-"Delete" => "Șterge",
-"Decrypting files... Please wait, this can take some time." => "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
-"Groups" => "Grupuri",
-"undo" => "Anulează ultima acțiune",
-"never" => "niciodată",
-"add group" => "adăugaţi grupul",
-"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
-"Error creating user" => "Eroare la crearea utilizatorului",
-"A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
-"Warning: Home directory for user \"{user}\" already exists" => "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
-"__language_name__" => "_language_name_",
-"SSL root certificates" => "Certificate SSL root",
-"Encryption" => "Încriptare",
-"None" => "Niciuna",
-"Login" => "Autentificare",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avertisment de securitate",
-"Setup Warning" => "Atenţie la implementare",
-"Module 'fileinfo' missing" => "Modulul \"Fileinfo\" lipsește",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
-"Your PHP version is outdated" => "Versiunea PHP folosită este învechită",
-"Locale not working" => "Localizarea nu funcționează",
-"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
-"Sharing" => "Partajare",
-"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
-"Allow public uploads" => "Permite încărcări publice",
-"Allow resharing" => "Permite repartajarea",
-"Allow users to send mail notification for shared files" => "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
-"Security" => "Securitate",
-"Forces the clients to connect to %s via an encrypted connection." => "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
-"Send mode" => "Modul de expediere",
-"Authentication method" => "Modul de autentificare",
-"Server address" => "Adresa server-ului",
-"Port" => "Portul",
-"SMTP Username" => "Nume utilizator SMTP",
-"SMTP Password" => "Parolă SMTP",
-"Test email settings" => "Verifică setările de e-mail",
-"Send email" => "Expediază mesajul",
-"Log" => "Jurnal de activitate",
-"Log level" => "Nivel jurnal",
-"More" => "Mai mult",
-"Less" => "Mai puțin",
-"Version" => "Versiunea",
-"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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "după",
-"User Documentation" => "Documentație utilizator",
-"Administrator Documentation" => "Documentație administrator",
-"Online Documentation" => "Documentație online",
-"Forum" => "Forum",
-"Bugtracker" => "Urmărire bug-uri",
-"Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Ia acum aplicatia pentru sincronizarea fisierelor ",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
-"Password" => "Parolă",
-"Your password was changed" => "Parola a fost modificată",
-"Unable to change your password" => "Imposibil de-ați schimbat parola",
-"Current password" => "Parola curentă",
-"New password" => "Noua parolă",
-"Change password" => "Schimbă parola",
-"Full Name" => "Nume complet",
-"Email" => "Email",
-"Your email address" => "Adresa ta de email",
-"Profile picture" => "Imagine de profil",
-"Upload new" => "Încarcă una nouă",
-"Select new from Files" => "Selectează una din Fișiere",
-"Remove image" => "Înlătură imagine",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Doar png sau jpg de formă pătrată. ",
-"Cancel" => "Anulare",
-"Choose as profile image" => "Alege drept imagine de profil",
-"Language" => "Limba",
-"Help translate" => "Ajută la traducere",
-"Import Root Certificate" => "Importă certificat root",
-"Log-in password" => "Parolă",
-"Decrypt all Files" => "Decriptează toate fișierele",
-"Login Name" => "Autentificare",
-"Create" => "Crează",
-"Admin Recovery Password" => "Parolă de recuperare a Administratorului",
-"Enter the recovery password in order to recover the users files during password change" => "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
-"Group" => "Grup",
-"Default Quota" => "Cotă implicită",
-"Unlimited" => "Nelimitată",
-"Other" => "Altele",
-"Username" => "Nume utilizator",
-"Quota" => "Cotă",
-"change full name" => "schimbă numele complet",
-"set new password" => "setează parolă nouă",
-"Default" => "Implicită"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
new file mode 100644
index 00000000000..3932f2a457c
--- /dev/null
+++ b/settings/l10n/ru.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Включено",
+    "Authentication error" : "Ошибка аутентификации",
+    "Your full name has been changed." : "Ваше полное имя было изменено.",
+    "Unable to change full name" : "Невозможно изменить полное имя",
+    "Group already exists" : "Группа уже существует",
+    "Unable to add group" : "Невозможно добавить группу",
+    "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+    "Couldn't remove app." : "Невозможно удалить приложение.",
+    "Email saved" : "Email сохранен",
+    "Invalid email" : "Неправильный Email",
+    "Unable to delete group" : "Невозможно удалить группу",
+    "Unable to delete user" : "Невозможно удалить пользователя",
+    "Backups restored successfully" : "Резервная копия успешно восстановлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
+    "Language changed" : "Язык изменён",
+    "Invalid request" : "Неправильный запрос",
+    "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы admin",
+    "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" : "Невозможно изменить пароль",
+    "Saved" : "Сохранено",
+    "test email settings" : "проверить настройки почты",
+    "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "Email sent" : "Письмо отправлено",
+    "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
+    "Add trusted domain" : "Добавить доверенный домен",
+    "Sending..." : "Отправляется ...",
+    "All" : "Все",
+    "Please wait...." : "Подождите...",
+    "Error while disabling app" : "Ошибка отключения приложения",
+    "Disable" : "Выключить",
+    "Enable" : "Включить",
+    "Error while enabling app" : "Ошибка включения приложения",
+    "Updating...." : "Обновление...",
+    "Error while updating app" : "Ошибка при обновлении приложения",
+    "Updated" : "Обновлено",
+    "Uninstalling ...." : "Удаление ...",
+    "Error while uninstalling app" : "Ошибка при удалении приложения.",
+    "Uninstall" : "Удалить",
+    "Select a profile picture" : "Выберите аватар",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Стойкий пароль",
+    "Valid until {date}" : "Действительно до {дата}",
+    "Delete" : "Удалить",
+    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
+    "Restore encryption keys." : "Восстановить ключи шифрования.",
+    "Groups" : "Группы",
+    "Unable to delete {objName}" : "Невозможно удалить {objName}",
+    "Error creating group" : "Ошибка создания группы",
+    "A valid group name must be provided" : "Введите правильное имя группы",
+    "deleted {groupName}" : "удалено {groupName}",
+    "undo" : "отмена",
+    "never" : "никогда",
+    "deleted {userName}" : "удалён {userName}",
+    "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__" : "Русский ",
+    "SSL root certificates" : "Корневые сертификаты SSL",
+    "Encryption" : "Шифрование",
+    "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." : "Вы обращаетесь к %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 не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
+    "Setup Warning" : "Предупреждение установки",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+    "Database Performance Info" : "Информация о производительности Базы Данных",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
+    "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-type) файлов.",
+    "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 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
+    "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-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.",
+    "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity checks" : "Проверка соединения",
+    "No problems found" : "Проблемы не найдены",
+    "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+    "Cron" : "Планировщик задач по расписанию",
+    "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так.",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
+    "Sharing" : "Общий доступ",
+    "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
+    "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
+    "Enforce password protection" : "Защита паролем обязательна",
+    "Allow public uploads" : "Разрешить открытые загрузки",
+    "Set default expiration date" : "Установить срок действия по-умолчанию",
+    "Expire after " : "Заканчивается через",
+    "days" : "дней",
+    "Enforce expiration date" : "Срок действия обязателен",
+    "Allow resharing" : "Разрешить переоткрытие общего доступа",
+    "Restrict users to only share with users in their groups" : "Разрешить пользователям публикации только внутри их групп",
+    "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
+    "Exclude groups from sharing" : "Исключить группы из общего доступа",
+    "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
+    "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 подключения.",
+    "Email Server" : "Почтовый сервер",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Отправить сообщение",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "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>.",
+    "More apps" : "Ещё приложения",
+    "by" : ":",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Пользовательская документация",
+    "Admin Documentation" : "Документация администратора",
+    "Enable only for specific groups" : "Включить только для этих групп",
+    "Uninstall App" : "Удалить приложение",
+    "Administrator Documentation" : "Документация администратора",
+    "Online Documentation" : "Online документация",
+    "Forum" : "Форум",
+    "Bugtracker" : "Багтрекер",
+    "Commercial Support" : "Коммерческая поддержка",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+    "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" : "Текущий пароль",
+    "New password" : "Новый пароль",
+    "Change password" : "Сменить пароль",
+    "Full Name" : "Полное имя",
+    "Email" : "E-mail",
+    "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." : "Будет использован аватар вашей оригинальной учетной записи.",
+    "Cancel" : "Отменить",
+    "Choose as profile image" : "Установить как аватар",
+    "Language" : "Язык",
+    "Help translate" : "Помочь с переводом",
+    "Common Name" : "Общее Имя",
+    "Valid until" : "Действительно до",
+    "Issued By" : "Выдан",
+    "Valid until %s" : "Действительно до %s",
+    "Import Root Certificate" : "Импортировать корневые сертификаты",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
+    "Log-in password" : "Пароль входа",
+    "Decrypt all Files" : "Снять шифрование со всех файлов",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
+    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
+    "Show storage location" : "Показать местонахождение хранилища",
+    "Show last log in" : "Показать последний вход в систему",
+    "Login Name" : "Имя пользователя",
+    "Create" : "Создать",
+    "Admin Recovery Password" : "Восстановление пароля администратора",
+    "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users and Groups" : "Искать пользователей и групп",
+    "Add Group" : "Добавить группу",
+    "Group" : "Группа",
+    "Everyone" : "Все",
+    "Admins" : "Администраторы",
+    "Default Quota" : "Квота по умолчанию",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограниченно",
+    "Other" : "Другое",
+    "Username" : "Имя пользователя",
+    "Quota" : "Квота",
+    "Storage Location" : "Место хранилища",
+    "Last Login" : "Последний вход",
+    "change full name" : "изменить полное имя",
+    "set new password" : "установить новый пароль",
+    "Default" : "По умолчанию"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
new file mode 100644
index 00000000000..74500a356a3
--- /dev/null
+++ b/settings/l10n/ru.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Включено",
+    "Authentication error" : "Ошибка аутентификации",
+    "Your full name has been changed." : "Ваше полное имя было изменено.",
+    "Unable to change full name" : "Невозможно изменить полное имя",
+    "Group already exists" : "Группа уже существует",
+    "Unable to add group" : "Невозможно добавить группу",
+    "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+    "Couldn't remove app." : "Невозможно удалить приложение.",
+    "Email saved" : "Email сохранен",
+    "Invalid email" : "Неправильный Email",
+    "Unable to delete group" : "Невозможно удалить группу",
+    "Unable to delete user" : "Невозможно удалить пользователя",
+    "Backups restored successfully" : "Резервная копия успешно восстановлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
+    "Language changed" : "Язык изменён",
+    "Invalid request" : "Неправильный запрос",
+    "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы admin",
+    "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" : "Невозможно изменить пароль",
+    "Saved" : "Сохранено",
+    "test email settings" : "проверить настройки почты",
+    "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "Email sent" : "Письмо отправлено",
+    "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
+    "Add trusted domain" : "Добавить доверенный домен",
+    "Sending..." : "Отправляется ...",
+    "All" : "Все",
+    "Please wait...." : "Подождите...",
+    "Error while disabling app" : "Ошибка отключения приложения",
+    "Disable" : "Выключить",
+    "Enable" : "Включить",
+    "Error while enabling app" : "Ошибка включения приложения",
+    "Updating...." : "Обновление...",
+    "Error while updating app" : "Ошибка при обновлении приложения",
+    "Updated" : "Обновлено",
+    "Uninstalling ...." : "Удаление ...",
+    "Error while uninstalling app" : "Ошибка при удалении приложения.",
+    "Uninstall" : "Удалить",
+    "Select a profile picture" : "Выберите аватар",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Стойкий пароль",
+    "Valid until {date}" : "Действительно до {дата}",
+    "Delete" : "Удалить",
+    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
+    "Restore encryption keys." : "Восстановить ключи шифрования.",
+    "Groups" : "Группы",
+    "Unable to delete {objName}" : "Невозможно удалить {objName}",
+    "Error creating group" : "Ошибка создания группы",
+    "A valid group name must be provided" : "Введите правильное имя группы",
+    "deleted {groupName}" : "удалено {groupName}",
+    "undo" : "отмена",
+    "never" : "никогда",
+    "deleted {userName}" : "удалён {userName}",
+    "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__" : "Русский ",
+    "SSL root certificates" : "Корневые сертификаты SSL",
+    "Encryption" : "Шифрование",
+    "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." : "Вы обращаетесь к %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 не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
+    "Setup Warning" : "Предупреждение установки",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+    "Database Performance Info" : "Информация о производительности Базы Данных",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
+    "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-type) файлов.",
+    "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 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
+    "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-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.",
+    "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity checks" : "Проверка соединения",
+    "No problems found" : "Проблемы не найдены",
+    "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+    "Cron" : "Планировщик задач по расписанию",
+    "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так.",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
+    "Sharing" : "Общий доступ",
+    "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
+    "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
+    "Enforce password protection" : "Защита паролем обязательна",
+    "Allow public uploads" : "Разрешить открытые загрузки",
+    "Set default expiration date" : "Установить срок действия по-умолчанию",
+    "Expire after " : "Заканчивается через",
+    "days" : "дней",
+    "Enforce expiration date" : "Срок действия обязателен",
+    "Allow resharing" : "Разрешить переоткрытие общего доступа",
+    "Restrict users to only share with users in their groups" : "Разрешить пользователям публикации только внутри их групп",
+    "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
+    "Exclude groups from sharing" : "Исключить группы из общего доступа",
+    "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
+    "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 подключения.",
+    "Email Server" : "Почтовый сервер",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Отправить сообщение",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "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>.",
+    "More apps" : "Ещё приложения",
+    "by" : ":",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Пользовательская документация",
+    "Admin Documentation" : "Документация администратора",
+    "Enable only for specific groups" : "Включить только для этих групп",
+    "Uninstall App" : "Удалить приложение",
+    "Administrator Documentation" : "Документация администратора",
+    "Online Documentation" : "Online документация",
+    "Forum" : "Форум",
+    "Bugtracker" : "Багтрекер",
+    "Commercial Support" : "Коммерческая поддержка",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+    "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" : "Текущий пароль",
+    "New password" : "Новый пароль",
+    "Change password" : "Сменить пароль",
+    "Full Name" : "Полное имя",
+    "Email" : "E-mail",
+    "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." : "Будет использован аватар вашей оригинальной учетной записи.",
+    "Cancel" : "Отменить",
+    "Choose as profile image" : "Установить как аватар",
+    "Language" : "Язык",
+    "Help translate" : "Помочь с переводом",
+    "Common Name" : "Общее Имя",
+    "Valid until" : "Действительно до",
+    "Issued By" : "Выдан",
+    "Valid until %s" : "Действительно до %s",
+    "Import Root Certificate" : "Импортировать корневые сертификаты",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
+    "Log-in password" : "Пароль входа",
+    "Decrypt all Files" : "Снять шифрование со всех файлов",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
+    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
+    "Show storage location" : "Показать местонахождение хранилища",
+    "Show last log in" : "Показать последний вход в систему",
+    "Login Name" : "Имя пользователя",
+    "Create" : "Создать",
+    "Admin Recovery Password" : "Восстановление пароля администратора",
+    "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users and Groups" : "Искать пользователей и групп",
+    "Add Group" : "Добавить группу",
+    "Group" : "Группа",
+    "Everyone" : "Все",
+    "Admins" : "Администраторы",
+    "Default Quota" : "Квота по умолчанию",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограниченно",
+    "Other" : "Другое",
+    "Username" : "Имя пользователя",
+    "Quota" : "Квота",
+    "Storage Location" : "Место хранилища",
+    "Last Login" : "Последний вход",
+    "change full name" : "изменить полное имя",
+    "set new password" : "установить новый пароль",
+    "Default" : "По умолчанию"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
deleted file mode 100644
index 7e3c8368951..00000000000
--- a/settings/l10n/ru.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Включено",
-"Authentication error" => "Ошибка аутентификации",
-"Your full name has been changed." => "Ваше полное имя было изменено.",
-"Unable to change full name" => "Невозможно изменить полное имя",
-"Group already exists" => "Группа уже существует",
-"Unable to add group" => "Невозможно добавить группу",
-"Files decrypted successfully" => "Дешифрование файлов прошло успешно",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
-"Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
-"Encryption keys deleted permanently" => "Ключи шифрования перманентно удалены",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
-"Couldn't remove app." => "Невозможно удалить приложение.",
-"Email saved" => "Email сохранен",
-"Invalid email" => "Неправильный Email",
-"Unable to delete group" => "Невозможно удалить группу",
-"Unable to delete user" => "Невозможно удалить пользователя",
-"Backups restored successfully" => "Резервная копия успешно восстановлена",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
-"Language changed" => "Язык изменён",
-"Invalid request" => "Неправильный запрос",
-"Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
-"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" => "Невозможно изменить пароль",
-"Saved" => "Сохранено",
-"test email settings" => "проверить настройки почты",
-"If you received this email, the settings seem to be correct." => "Если вы получили это письмо, настройки верны.",
-"Email sent" => "Письмо отправлено",
-"You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
-"Add trusted domain" => "Добавить доверенный домен",
-"Sending..." => "Отправляется ...",
-"All" => "Все",
-"Please wait...." => "Подождите...",
-"Error while disabling app" => "Ошибка отключения приложения",
-"Disable" => "Выключить",
-"Enable" => "Включить",
-"Error while enabling app" => "Ошибка включения приложения",
-"Updating...." => "Обновление...",
-"Error while updating app" => "Ошибка при обновлении приложения",
-"Updated" => "Обновлено",
-"Uninstalling ...." => "Удаление ...",
-"Error while uninstalling app" => "Ошибка при удалении приложения.",
-"Uninstall" => "Удалить",
-"Select a profile picture" => "Выберите аватар",
-"Very weak password" => "Очень слабый пароль",
-"Weak password" => "Слабый пароль",
-"So-so password" => "Так себе пароль",
-"Good password" => "Хороший пароль",
-"Strong password" => "Стойкий пароль",
-"Valid until {date}" => "Действительно до {дата}",
-"Delete" => "Удалить",
-"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
-"Delete encryption keys permanently." => "Перманентно удалить ключи шифрования. ",
-"Restore encryption keys." => "Восстановить ключи шифрования.",
-"Groups" => "Группы",
-"Unable to delete {objName}" => "Невозможно удалить {objName}",
-"Error creating group" => "Ошибка создания группы",
-"A valid group name must be provided" => "Введите правильное имя группы",
-"deleted {groupName}" => "удалено {groupName}",
-"undo" => "отмена",
-"never" => "никогда",
-"deleted {userName}" => "удалён {userName}",
-"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__" => "Русский ",
-"SSL root certificates" => "Корневые сертификаты SSL",
-"Encryption" => "Шифрование",
-"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." => "Вы обращаетесь к %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 не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
-"Setup Warning" => "Предупреждение установки",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
-"Database Performance Info" => "Информация о производительности Базы Данных",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
-"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-type) файлов.",
-"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 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
-"PHP charset is not set to UTF-8" => "Кодировка PHP не совпадает с UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-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.",
-"URL generation in notification emails" => "Генерирование URL в уведомляющих электронных письмах",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
-"Connectivity checks" => "Проверка соединения",
-"No problems found" => "Проблемы не найдены",
-"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-"Cron" => "Планировщик задач по расписанию",
-"Last cron was executed at %s." => "Последняя cron-задача была запущена: %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так.",
-"Cron was not executed yet!" => "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 system's cron service to call the cron.php file every 15 minutes." => "Использовать системный cron для вызова cron.php каждые 15 минут.",
-"Sharing" => "Общий доступ",
-"Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
-"Allow users to share via link" => "Разрешить пользователям публикации через ссылки",
-"Enforce password protection" => "Защита паролем обязательна",
-"Allow public uploads" => "Разрешить открытые загрузки",
-"Set default expiration date" => "Установить срок действия по-умолчанию",
-"Expire after " => "Заканчивается через",
-"days" => "дней",
-"Enforce expiration date" => "Срок действия обязателен",
-"Allow resharing" => "Разрешить переоткрытие общего доступа",
-"Restrict users to only share with users in their groups" => "Разрешить пользователям публикации только внутри их групп",
-"Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о расшаренных файлах",
-"Exclude groups from sharing" => "Исключить группы из общего доступа",
-"These groups will still be able to receive shares, but not to initiate them." => "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
-"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 подключения.",
-"Email Server" => "Почтовый сервер",
-"This is used for sending out notifications." => "Используется для отправки уведомлений.",
-"Send mode" => "Отправить сообщение",
-"From address" => "Адрес отправителя",
-"mail" => "почта",
-"Authentication method" => "Метод проверки подлинности",
-"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>.",
-"More apps" => "Ещё приложения",
-"by" => ":",
-"Documentation:" => "Документация:",
-"User Documentation" => "Пользовательская документация",
-"Admin Documentation" => "Документация администратора",
-"Enable only for specific groups" => "Включить только для этих групп",
-"Uninstall App" => "Удалить приложение",
-"Administrator Documentation" => "Документация администратора",
-"Online Documentation" => "Online документация",
-"Forum" => "Форум",
-"Bugtracker" => "Багтрекер",
-"Commercial Support" => "Коммерческая поддержка",
-"Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
-"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" => "Текущий пароль",
-"New password" => "Новый пароль",
-"Change password" => "Сменить пароль",
-"Full Name" => "Полное имя",
-"Email" => "E-mail",
-"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." => "Будет использован аватар вашей оригинальной учетной записи.",
-"Cancel" => "Отменить",
-"Choose as profile image" => "Установить как аватар",
-"Language" => "Язык",
-"Help translate" => "Помочь с переводом",
-"Common Name" => "Общее Имя",
-"Valid until" => "Действительно до",
-"Issued By" => "Выдан",
-"Valid until %s" => "Действительно до %s",
-"Import Root Certificate" => "Импортировать корневые сертификаты",
-"The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
-"Log-in password" => "Пароль входа",
-"Decrypt all Files" => "Снять шифрование со всех файлов",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
-"Restore Encryption Keys" => "Восстановить Ключи Шифрования",
-"Delete Encryption Keys" => "Удалить Ключи Шифрования",
-"Show storage location" => "Показать местонахождение хранилища",
-"Show last log in" => "Показать последний вход в систему",
-"Login Name" => "Имя пользователя",
-"Create" => "Создать",
-"Admin Recovery Password" => "Восстановление пароля администратора",
-"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-"Search Users and Groups" => "Искать пользователей и групп",
-"Add Group" => "Добавить группу",
-"Group" => "Группа",
-"Everyone" => "Все",
-"Admins" => "Администраторы",
-"Default Quota" => "Квота по умолчанию",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограниченно",
-"Other" => "Другое",
-"Username" => "Имя пользователя",
-"Quota" => "Квота",
-"Storage Location" => "Место хранилища",
-"Last Login" => "Последний вход",
-"change full name" => "изменить полное имя",
-"set new password" => "установить новый пароль",
-"Default" => "По умолчанию"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
new file mode 100644
index 00000000000..bc894fb031b
--- /dev/null
+++ b/settings/l10n/si_LK.js
@@ -0,0 +1,54 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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" : "අවලංගු අයැදුමක්",
+    "Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
+    "Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
+    "Disable" : "අක්‍රිය කරන්න",
+    "Enable" : "සක්‍රිය කරන්න",
+    "Delete" : "මකා දමන්න",
+    "Groups" : "කණ්ඩායම්",
+    "undo" : "නිෂ්ප්‍රභ කරන්න",
+    "never" : "කවදාවත්",
+    "SSL root certificates" : "SSL මූල සහතිකයන්",
+    "Encryption" : "ගුප්ත කේතනය",
+    "None" : "කිසිවක් නැත",
+    "Login" : "ප්‍රවිශ්ටය",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Sharing" : "හුවමාරු කිරීම",
+    "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Server address" : "සේවාදායකයේ ලිපිනය",
+    "Port" : "තොට",
+    "Log" : "ලඝුව",
+    "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <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> යටතේ.",
+    "by" : "විසින්",
+    "Password" : "මුර පදය",
+    "Your password was changed" : "ඔබගේ මුර පදය වෙනස් කෙරුණි",
+    "Unable to change your password" : "මුර පදය වෙනස් කළ නොහැකි විය",
+    "Current password" : "වත්මන් මුරපදය",
+    "New password" : "නව මුරපදය",
+    "Change password" : "මුරපදය වෙනස් කිරීම",
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Your email address" : "ඔබගේ විද්‍යුත් තැපෑල",
+    "Cancel" : "එපා",
+    "Language" : "භාෂාව",
+    "Help translate" : "පරිවර්ථන සහය",
+    "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
+    "Login Name" : "ප්‍රවිශ්ටය",
+    "Create" : "තනන්න",
+    "Default Quota" : "සාමාන්‍ය සලාකය",
+    "Other" : "වෙනත්",
+    "Username" : "පරිශීලක නම",
+    "Quota" : "සලාකය"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
new file mode 100644
index 00000000000..9d1c5ef4a62
--- /dev/null
+++ b/settings/l10n/si_LK.json
@@ -0,0 +1,52 @@
+{ "translations": {
+    "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" : "අවලංගු අයැදුමක්",
+    "Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
+    "Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
+    "Disable" : "අක්‍රිය කරන්න",
+    "Enable" : "සක්‍රිය කරන්න",
+    "Delete" : "මකා දමන්න",
+    "Groups" : "කණ්ඩායම්",
+    "undo" : "නිෂ්ප්‍රභ කරන්න",
+    "never" : "කවදාවත්",
+    "SSL root certificates" : "SSL මූල සහතිකයන්",
+    "Encryption" : "ගුප්ත කේතනය",
+    "None" : "කිසිවක් නැත",
+    "Login" : "ප්‍රවිශ්ටය",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Sharing" : "හුවමාරු කිරීම",
+    "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Server address" : "සේවාදායකයේ ලිපිනය",
+    "Port" : "තොට",
+    "Log" : "ලඝුව",
+    "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <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> යටතේ.",
+    "by" : "විසින්",
+    "Password" : "මුර පදය",
+    "Your password was changed" : "ඔබගේ මුර පදය වෙනස් කෙරුණි",
+    "Unable to change your password" : "මුර පදය වෙනස් කළ නොහැකි විය",
+    "Current password" : "වත්මන් මුරපදය",
+    "New password" : "නව මුරපදය",
+    "Change password" : "මුරපදය වෙනස් කිරීම",
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Your email address" : "ඔබගේ විද්‍යුත් තැපෑල",
+    "Cancel" : "එපා",
+    "Language" : "භාෂාව",
+    "Help translate" : "පරිවර්ථන සහය",
+    "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
+    "Login Name" : "ප්‍රවිශ්ටය",
+    "Create" : "තනන්න",
+    "Default Quota" : "සාමාන්‍ය සලාකය",
+    "Other" : "වෙනත්",
+    "Username" : "පරිශීලක නම",
+    "Quota" : "සලාකය"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
deleted file mode 100644
index e254e447640..00000000000
--- a/settings/l10n/si_LK.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "අවලංගු අයැදුමක්",
-"Unable to add user to group %s" => "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
-"Unable to remove user from group %s" => "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
-"Disable" => "අක්‍රිය කරන්න",
-"Enable" => "සක්‍රිය කරන්න",
-"Delete" => "මකා දමන්න",
-"Groups" => "කණ්ඩායම්",
-"undo" => "නිෂ්ප්‍රභ කරන්න",
-"never" => "කවදාවත්",
-"SSL root certificates" => "SSL මූල සහතිකයන්",
-"Encryption" => "ගුප්ත කේතනය",
-"None" => "කිසිවක් නැත",
-"Login" => "ප්‍රවිශ්ටය",
-"Security Warning" => "ආරක්ෂක නිවේදනයක්",
-"Sharing" => "හුවමාරු කිරීම",
-"Allow resharing" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
-"Server address" => "සේවාදායකයේ ලිපිනය",
-"Port" => "තොට",
-"Log" => "ලඝුව",
-"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>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <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> යටතේ.",
-"by" => "විසින්",
-"Password" => "මුර පදය",
-"Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
-"Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
-"Current password" => "වත්මන් මුරපදය",
-"New password" => "නව මුරපදය",
-"Change password" => "මුරපදය වෙනස් කිරීම",
-"Email" => "විද්‍යුත් තැපෑල",
-"Your email address" => "ඔබගේ විද්‍යුත් තැපෑල",
-"Cancel" => "එපා",
-"Language" => "භාෂාව",
-"Help translate" => "පරිවර්ථන සහය",
-"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න",
-"Login Name" => "ප්‍රවිශ්ටය",
-"Create" => "තනන්න",
-"Default Quota" => "සාමාන්‍ය සලාකය",
-"Other" => "වෙනත්",
-"Username" => "පරිශීලක නම",
-"Quota" => "සලාකය"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
deleted file mode 100644
index 4a9a13d6d84..00000000000
--- a/settings/l10n/sk.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Odstrániť",
-"never" => "nikdy",
-"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.js b/settings/l10n/sk_SK.js
new file mode 100644
index 00000000000..773b87f5e20
--- /dev/null
+++ b/settings/l10n/sk_SK.js
@@ -0,0 +1,228 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Povolené",
+    "Authentication error" : "Chyba autentifikácie",
+    "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
+    "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
+    "Group already exists" : "Skupina už existuje",
+    "Unable to add group" : "Nie je možné pridať skupinu",
+    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
+    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
+    "Email saved" : "Email uložený",
+    "Invalid email" : "Neplatný email",
+    "Unable to delete group" : "Nie je možné odstrániť skupinu",
+    "Unable to delete user" : "Nie je možné odstrániť používateľa",
+    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Language changed" : "Jazyk zmenený",
+    "Invalid request" : "Neplatná požiadavka",
+    "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
+    "Unable to add user to group %s" : "Nie je možné pridať používateľa do skupiny %s",
+    "Unable to remove user from group %s" : "Nie je možné odstrániť používateľa zo skupiny %s",
+    "Couldn't update app." : "Nemožno aktualizovať aplikáciu.",
+    "Wrong password" : "Nesprávne heslo",
+    "No user supplied" : "Nebol uvedený používateľ",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
+    "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",
+    "Saved" : "Uložené",
+    "test email settings" : "nastavenia testovacieho emailu",
+    "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "Email sent" : "Email odoslaný",
+    "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
+    "Add trusted domain" : "Pridať dôveryhodnú doménu",
+    "Sending..." : "Odosielam...",
+    "All" : "Všetky",
+    "Please wait...." : "Čakajte prosím...",
+    "Error while disabling app" : "Chyba pri zakázaní aplikácie",
+    "Disable" : "Zakázať",
+    "Enable" : "Zapnúť",
+    "Error while enabling app" : "Chyba pri povoľovaní aplikácie",
+    "Updating...." : "Aktualizujem...",
+    "Error while updating app" : "chyba pri aktualizácii aplikácie",
+    "Updated" : "Aktualizované",
+    "Uninstalling ...." : "Prebieha odinštalovanie...",
+    "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie",
+    "Uninstall" : "Odinštalácia",
+    "Select a profile picture" : "Vybrať avatara",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Zmazať",
+    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
+    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
+    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nemožno vymazať {objName}",
+    "Error creating group" : "Chyba pri vytváraní skupiny",
+    "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
+    "deleted {groupName}" : "vymazaná {groupName}",
+    "undo" : "vrátiť",
+    "never" : "nikdy",
+    "deleted {userName}" : "vymazané {userName}",
+    "add group" : "pridať skupinu",
+    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
+    "Error creating user" : "Chyba pri vytváraní používateľa",
+    "A valid password must be provided" : "Musíte zadať platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
+    "__language_name__" : "Slovensky",
+    "SSL root certificates" : "Koreňové SSL certifikáty",
+    "Encryption" : "Šifrovanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
+    "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",
+    "Plain" : "Neformátovaný",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Nastavenia oznámení a upozornení",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
+    "Database Performance Info" : "Informácie o výkone databázy",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+    "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 inštalácia nebude fungovať správne.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
+    "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
+    "Cron was not executed yet!" : "Cron sa ešte nespustil!",
+    "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
+    "Sharing" : "Zdieľanie",
+    "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
+    "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
+    "Enforce password protection" : "Vynútiť ochranu heslom",
+    "Allow public uploads" : "Povoliť verejné nahrávanie súborov",
+    "Set default expiration date" : "Nastaviť predvolený dátum expirácie",
+    "Expire after " : "Platnosť do",
+    "days" : "dni",
+    "Enforce expiration date" : "Vynútiť dátum expirácie",
+    "Allow resharing" : "Povoliť zdieľanie ďalej",
+    "Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
+    "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
+    "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.",
+    "Email Server" : "Email server",
+    "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
+    "Send mode" : "Mód odosielania",
+    "From address" : "Z adresy",
+    "mail" : "email",
+    "Authentication method" : "Autentifikačná metóda",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Server address" : "Adresa servera",
+    "Port" : "Port",
+    "Credentials" : "Prihlasovanie údaje",
+    "SMTP Username" : "SMTP používateľské meno",
+    "SMTP Password" : "SMTP heslo",
+    "Test email settings" : "Nastavenia testovacieho emailu",
+    "Send email" : "Odoslať email",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň záznamu",
+    "More" : "Viac",
+    "Less" : "Menej",
+    "Version" : "Verzia",
+    "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Viac aplikácií",
+    "by" : "od",
+    "Documentation:" : "Dokumentácia:",
+    "User Documentation" : "Príručka používateľa",
+    "Admin Documentation" : "Príručka administrátora",
+    "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
+    "Uninstall App" : "Odinštalovanie aplikácie",
+    "Administrator Documentation" : "Príručka administrátora",
+    "Online Documentation" : "Online príručka",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komerčná podpora",
+    "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
+    "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" : "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",
+    "Change password" : "Zmeniť heslo",
+    "Full Name" : "Meno a priezvisko",
+    "Email" : "Email",
+    "Your email address" : "Vaša emailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+    "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." : "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",
+    "Common Name" : "Bežný názov",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Importovať koreňový certifikát",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
+    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
+    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
+    "Show storage location" : "Zobraziť umiestnenie úložiska",
+    "Show last log in" : "Zobraziť posledné prihlásenie",
+    "Login Name" : "Prihlasovacie meno",
+    "Create" : "Vytvoriť",
+    "Admin Recovery Password" : "Obnovenie hesla administrátora",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
+    "Add Group" : "Pridať skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všetci",
+    "Admins" : "Administrátori",
+    "Default Quota" : "Predvolená kvóta",
+    "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" : "Používateľské meno",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umiestnenie úložiska",
+    "Last Login" : "Posledné prihlásenie",
+    "change full name" : "zmeniť meno a priezvisko",
+    "set new password" : "nastaviť nové heslo",
+    "Default" : "Predvolené"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
new file mode 100644
index 00000000000..44b87fc746d
--- /dev/null
+++ b/settings/l10n/sk_SK.json
@@ -0,0 +1,226 @@
+{ "translations": {
+    "Enabled" : "Povolené",
+    "Authentication error" : "Chyba autentifikácie",
+    "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
+    "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
+    "Group already exists" : "Skupina už existuje",
+    "Unable to add group" : "Nie je možné pridať skupinu",
+    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
+    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
+    "Email saved" : "Email uložený",
+    "Invalid email" : "Neplatný email",
+    "Unable to delete group" : "Nie je možné odstrániť skupinu",
+    "Unable to delete user" : "Nie je možné odstrániť používateľa",
+    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Language changed" : "Jazyk zmenený",
+    "Invalid request" : "Neplatná požiadavka",
+    "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
+    "Unable to add user to group %s" : "Nie je možné pridať používateľa do skupiny %s",
+    "Unable to remove user from group %s" : "Nie je možné odstrániť používateľa zo skupiny %s",
+    "Couldn't update app." : "Nemožno aktualizovať aplikáciu.",
+    "Wrong password" : "Nesprávne heslo",
+    "No user supplied" : "Nebol uvedený používateľ",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
+    "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",
+    "Saved" : "Uložené",
+    "test email settings" : "nastavenia testovacieho emailu",
+    "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "Email sent" : "Email odoslaný",
+    "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
+    "Add trusted domain" : "Pridať dôveryhodnú doménu",
+    "Sending..." : "Odosielam...",
+    "All" : "Všetky",
+    "Please wait...." : "Čakajte prosím...",
+    "Error while disabling app" : "Chyba pri zakázaní aplikácie",
+    "Disable" : "Zakázať",
+    "Enable" : "Zapnúť",
+    "Error while enabling app" : "Chyba pri povoľovaní aplikácie",
+    "Updating...." : "Aktualizujem...",
+    "Error while updating app" : "chyba pri aktualizácii aplikácie",
+    "Updated" : "Aktualizované",
+    "Uninstalling ...." : "Prebieha odinštalovanie...",
+    "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie",
+    "Uninstall" : "Odinštalácia",
+    "Select a profile picture" : "Vybrať avatara",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Zmazať",
+    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
+    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
+    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nemožno vymazať {objName}",
+    "Error creating group" : "Chyba pri vytváraní skupiny",
+    "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
+    "deleted {groupName}" : "vymazaná {groupName}",
+    "undo" : "vrátiť",
+    "never" : "nikdy",
+    "deleted {userName}" : "vymazané {userName}",
+    "add group" : "pridať skupinu",
+    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
+    "Error creating user" : "Chyba pri vytváraní používateľa",
+    "A valid password must be provided" : "Musíte zadať platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
+    "__language_name__" : "Slovensky",
+    "SSL root certificates" : "Koreňové SSL certifikáty",
+    "Encryption" : "Šifrovanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
+    "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",
+    "Plain" : "Neformátovaný",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "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.",
+    "Setup Warning" : "Nastavenia oznámení a upozornení",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
+    "Database Performance Info" : "Informácie o výkone databázy",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+    "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 inštalácia nebude fungovať správne.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
+    "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
+    "Cron was not executed yet!" : "Cron sa ešte nespustil!",
+    "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
+    "Sharing" : "Zdieľanie",
+    "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
+    "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
+    "Enforce password protection" : "Vynútiť ochranu heslom",
+    "Allow public uploads" : "Povoliť verejné nahrávanie súborov",
+    "Set default expiration date" : "Nastaviť predvolený dátum expirácie",
+    "Expire after " : "Platnosť do",
+    "days" : "dni",
+    "Enforce expiration date" : "Vynútiť dátum expirácie",
+    "Allow resharing" : "Povoliť zdieľanie ďalej",
+    "Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
+    "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
+    "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.",
+    "Email Server" : "Email server",
+    "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
+    "Send mode" : "Mód odosielania",
+    "From address" : "Z adresy",
+    "mail" : "email",
+    "Authentication method" : "Autentifikačná metóda",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Server address" : "Adresa servera",
+    "Port" : "Port",
+    "Credentials" : "Prihlasovanie údaje",
+    "SMTP Username" : "SMTP používateľské meno",
+    "SMTP Password" : "SMTP heslo",
+    "Test email settings" : "Nastavenia testovacieho emailu",
+    "Send email" : "Odoslať email",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň záznamu",
+    "More" : "Viac",
+    "Less" : "Menej",
+    "Version" : "Verzia",
+    "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Viac aplikácií",
+    "by" : "od",
+    "Documentation:" : "Dokumentácia:",
+    "User Documentation" : "Príručka používateľa",
+    "Admin Documentation" : "Príručka administrátora",
+    "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
+    "Uninstall App" : "Odinštalovanie aplikácie",
+    "Administrator Documentation" : "Príručka administrátora",
+    "Online Documentation" : "Online príručka",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komerčná podpora",
+    "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
+    "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" : "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",
+    "Change password" : "Zmeniť heslo",
+    "Full Name" : "Meno a priezvisko",
+    "Email" : "Email",
+    "Your email address" : "Vaša emailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+    "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." : "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",
+    "Common Name" : "Bežný názov",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Importovať koreňový certifikát",
+    "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",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
+    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
+    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
+    "Show storage location" : "Zobraziť umiestnenie úložiska",
+    "Show last log in" : "Zobraziť posledné prihlásenie",
+    "Login Name" : "Prihlasovacie meno",
+    "Create" : "Vytvoriť",
+    "Admin Recovery Password" : "Obnovenie hesla administrátora",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
+    "Add Group" : "Pridať skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všetci",
+    "Admins" : "Administrátori",
+    "Default Quota" : "Predvolená kvóta",
+    "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" : "Používateľské meno",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umiestnenie úložiska",
+    "Last Login" : "Posledné prihlásenie",
+    "change full name" : "zmeniť meno a priezvisko",
+    "set new password" : "nastaviť nové heslo",
+    "Default" : "Predvolené"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
deleted file mode 100644
index 5dcfdf6c9dc..00000000000
--- a/settings/l10n/sk_SK.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Povolené",
-"Authentication error" => "Chyba autentifikácie",
-"Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
-"Unable to change full name" => "Nemožno zmeniť meno a priezvisko",
-"Group already exists" => "Skupina už existuje",
-"Unable to add group" => "Nie je možné pridať skupinu",
-"Files decrypted successfully" => "Súbory sú úspešne dešifrované",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
-"Couldn't decrypt your files, check your password and try again" => "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
-"Encryption keys deleted permanently" => "Šifrovacie kľúče sú trvale vymazané",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
-"Couldn't remove app." => "Nemožno odstrániť aplikáciu.",
-"Email saved" => "Email uložený",
-"Invalid email" => "Neplatný email",
-"Unable to delete group" => "Nie je možné odstrániť skupinu",
-"Unable to delete user" => "Nie je možné odstrániť používateľa",
-"Backups restored successfully" => "Zálohy boli úspešne obnovené",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
-"Language changed" => "Jazyk zmenený",
-"Invalid request" => "Neplatná požiadavka",
-"Admins can't remove themself from the admin group" => "Administrátori nesmú odstrániť sami seba zo skupiny admin",
-"Unable to add user to group %s" => "Nie je možné pridať používateľa do skupiny %s",
-"Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
-"Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
-"Wrong password" => "Nesprávne heslo",
-"No user supplied" => "Nebol uvedený používateľ",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
-"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",
-"Saved" => "Uložené",
-"test email settings" => "nastavenia testovacieho emailu",
-"If you received this email, the settings seem to be correct." => "Ak ste dostali tento email, nastavenie je správne.",
-"Email sent" => "Email odoslaný",
-"You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
-"Add trusted domain" => "Pridať dôveryhodnú doménu",
-"Sending..." => "Odosielam...",
-"All" => "Všetky",
-"Please wait...." => "Čakajte prosím...",
-"Error while disabling app" => "Chyba pri zakázaní aplikácie",
-"Disable" => "Zakázať",
-"Enable" => "Zapnúť",
-"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
-"Updating...." => "Aktualizujem...",
-"Error while updating app" => "chyba pri aktualizácii aplikácie",
-"Updated" => "Aktualizované",
-"Uninstalling ...." => "Prebieha odinštalovanie...",
-"Error while uninstalling app" => "Chyba pri odinštalovaní aplikácie",
-"Uninstall" => "Odinštalácia",
-"Select a profile picture" => "Vybrať avatara",
-"Very weak password" => "Veľmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Priemerné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Valid until {date}" => "Platný do {date}",
-"Delete" => "Zmazať",
-"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-"Delete encryption keys permanently." => "Natrvalo vymazať šifrovacie kľúče.",
-"Restore encryption keys." => "Obnoviť šifrovacie kľúče.",
-"Groups" => "Skupiny",
-"Unable to delete {objName}" => "Nemožno vymazať {objName}",
-"Error creating group" => "Chyba pri vytváraní skupiny",
-"A valid group name must be provided" => "Musíte zadať platný názov skupiny",
-"deleted {groupName}" => "vymazaná {groupName}",
-"undo" => "vrátiť",
-"never" => "nikdy",
-"deleted {userName}" => "vymazané {userName}",
-"add group" => "pridať skupinu",
-"A valid username must be provided" => "Musíte zadať platné používateľské meno",
-"Error creating user" => "Chyba pri vytváraní používateľa",
-"A valid password must be provided" => "Musíte zadať platné heslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
-"__language_name__" => "Slovensky",
-"SSL root certificates" => "Koreňové SSL certifikáty",
-"Encryption" => "Šifrovanie",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, upozornenia, chyby a fatálne problémy",
-"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",
-"Plain" => "Neformátovaný",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"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.",
-"Setup Warning" => "Nastavenia oznámení a upozornení",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
-"Database Performance Info" => "Informácie o výkone databázy",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
-"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 inštalácia nebude fungovať správne.",
-"PHP charset is not set to UTF-8" => "Znaková sada PHP nie je nastavená na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
-"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.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
-"URL generation in notification emails" => "Generovanie adresy URL v oznamovacích emailoch",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
-"Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Posledný cron bol spustený %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
-"Cron was not executed yet!" => "Cron sa ešte nespustil!",
-"Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
-"Sharing" => "Zdieľanie",
-"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
-"Allow users to share via link" => "Povoliť používateľom zdieľanie pomocou odkazov",
-"Enforce password protection" => "Vynútiť ochranu heslom",
-"Allow public uploads" => "Povoliť verejné nahrávanie súborov",
-"Set default expiration date" => "Nastaviť predvolený dátum expirácie",
-"Expire after " => "Platnosť do",
-"days" => "dni",
-"Enforce expiration date" => "Vynútiť dátum expirácie",
-"Allow resharing" => "Povoliť zdieľanie ďalej",
-"Restrict users to only share with users in their groups" => "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
-"Allow users to send mail notification for shared files" => "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
-"Exclude groups from sharing" => "Vybrať skupiny zo zdieľania",
-"These groups will still be able to receive shares, but not to initiate them." => "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
-"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.",
-"Email Server" => "Email server",
-"This is used for sending out notifications." => "Používa sa na odosielanie upozornení.",
-"Send mode" => "Mód odosielania",
-"From address" => "Z adresy",
-"mail" => "email",
-"Authentication method" => "Autentifikačná metóda",
-"Authentication required" => "Vyžaduje sa overenie",
-"Server address" => "Adresa servera",
-"Port" => "Port",
-"Credentials" => "Prihlasovanie údaje",
-"SMTP Username" => "SMTP používateľské meno",
-"SMTP Password" => "SMTP heslo",
-"Test email settings" => "Nastavenia testovacieho emailu",
-"Send email" => "Odoslať email",
-"Log" => "Záznam",
-"Log level" => "Úroveň záznamu",
-"More" => "Viac",
-"Less" => "Menej",
-"Version" => "Verzia",
-"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>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Viac aplikácií",
-"by" => "od",
-"Documentation:" => "Dokumentácia:",
-"User Documentation" => "Príručka používateľa",
-"Admin Documentation" => "Príručka administrátora",
-"Enable only for specific groups" => "Povoliť len pre vybrané skupiny",
-"Uninstall App" => "Odinštalovanie aplikácie",
-"Administrator Documentation" => "Príručka administrátora",
-"Online Documentation" => "Online príručka",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Komerčná podpora",
-"Get the apps to sync your files" => "Získať aplikácie na synchronizáciu vašich súborov",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
-"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" => "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",
-"Change password" => "Zmeniť heslo",
-"Full Name" => "Meno a priezvisko",
-"Email" => "Email",
-"Your email address" => "Vaša emailová adresa",
-"Fill in an email address to enable password recovery and receive notifications" => "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
-"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." => "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",
-"Common Name" => "Bežný názov",
-"Valid until" => "Platný do",
-"Issued By" => "Vydal",
-"Valid until %s" => "Platný do %s",
-"Import Root Certificate" => "Importovať koreňový certifikát",
-"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",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
-"Restore Encryption Keys" => "Obnoviť šifrovacie kľúče",
-"Delete Encryption Keys" => "Vymazať šifrovacie kľúče",
-"Show storage location" => "Zobraziť umiestnenie úložiska",
-"Show last log in" => "Zobraziť posledné prihlásenie",
-"Login Name" => "Prihlasovacie meno",
-"Create" => "Vytvoriť",
-"Admin Recovery Password" => "Obnovenie hesla administrátora",
-"Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-"Search Users and Groups" => "Prehľadať používateľov a skupiny",
-"Add Group" => "Pridať skupinu",
-"Group" => "Skupina",
-"Everyone" => "Všetci",
-"Admins" => "Administrátori",
-"Default Quota" => "Predvolená kvóta",
-"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" => "Používateľské meno",
-"Quota" => "Kvóta",
-"Storage Location" => "Umiestnenie úložiska",
-"Last Login" => "Posledné prihlásenie",
-"change full name" => "zmeniť meno a priezvisko",
-"set new password" => "nastaviť nové heslo",
-"Default" => "Predvolené"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
new file mode 100644
index 00000000000..4ff4202cf72
--- /dev/null
+++ b/settings/l10n/sl.js
@@ -0,0 +1,199 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Omogočeno",
+    "Authentication error" : "Napaka med overjanjem",
+    "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
+    "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
+    "Group already exists" : "Skupina že obstaja",
+    "Unable to add group" : "Skupine ni mogoče dodati",
+    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
+    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Couldn't remove app." : "Ni mogoče odstraniti programa.",
+    "Email saved" : "Elektronski naslov je shranjen",
+    "Invalid email" : "Neveljaven elektronski naslov",
+    "Unable to delete group" : "Skupine ni mogoče izbrisati",
+    "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
+    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Language changed" : "Jezik je spremenjen",
+    "Invalid request" : "Neveljavna zahteva",
+    "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
+    "Unable to add user to group %s" : "Uporabnika ni mogoče dodati k skupini %s",
+    "Unable to remove user from group %s" : "Uporabnika ni mogoče odstraniti iz skupine %s",
+    "Couldn't update app." : "Programa ni mogoče posodobiti.",
+    "Wrong password" : "Napačno geslo",
+    "No user supplied" : "Ni navedenega uporabnika",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
+    "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",
+    "Saved" : "Shranjeno",
+    "test email settings" : "preizkusi nastavitve elektronske pošte",
+    "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "Email sent" : "Elektronska pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Add trusted domain" : "Dodaj varno domeno",
+    "Sending..." : "Poteka pošiljanje ...",
+    "All" : "Vsi",
+    "Please wait...." : "Počakajte ...",
+    "Error while disabling app" : "Napaka onemogočanja programa",
+    "Disable" : "Onemogoči",
+    "Enable" : "Omogoči",
+    "Error while enabling app" : "Napaka omogočanja programa",
+    "Updating...." : "Poteka posodabljanje ...",
+    "Error while updating app" : "Prišlo je do napake med posodabljanjem programa.",
+    "Updated" : "Posodobljeno",
+    "Uninstalling ...." : "Odstranjevanje namestitve ...",
+    "Error while uninstalling app" : "Prišlo je do napake med odstranjevanjem programa.",
+    "Uninstall" : "Odstrani namestitev",
+    "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",
+    "Valid until {date}" : "Veljavno do {date}",
+    "Delete" : "Izbriši",
+    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
+    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
+    "Restore encryption keys." : "Obnovi šifrirne ključe.",
+    "Groups" : "Skupine",
+    "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
+    "Error creating group" : "Napaka ustvarjanja skupine",
+    "undo" : "razveljavi",
+    "never" : "nikoli",
+    "add group" : "dodaj skupino",
+    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
+    "Error creating user" : "Napaka ustvarjanja uporabnika",
+    "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
+    "__language_name__" : "Slovenščina",
+    "SSL root certificates" : "Korenska potrdila SSL",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
+    "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
+    "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 .",
+    "Setup Warning" : "Opozorilo nastavitve",
+    "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
+    "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." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity checks" : "Preverjanje povezav",
+    "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
+    "Cron" : "Periodično opravilo",
+    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "Security" : "Varnost",
+    "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",
+    "Send mode" : "Način pošiljanja",
+    "Authentication method" : "Način overitve",
+    "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č",
+    "Less" : "Manj",
+    "Version" : "Različica",
+    "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "by" : "od",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Uporabniška dokumentacija",
+    "Admin Documentation" : "Skrbniška dokumentacija",
+    "Enable only for specific groups" : "Omogoči le za posamezne skupine",
+    "Uninstall App" : "Odstrani program",
+    "Administrator Documentation" : "Skrbniška dokumentacija",
+    "Online Documentation" : "Spletna dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sledilnik hroščev",
+    "Commercial Support" : "Podpora strankam",
+    "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
+    "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
+    "Password" : "Geslo",
+    "Your password was changed" : "Geslo je spremenjeno",
+    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
+    "Current password" : "Trenutno geslo",
+    "New password" : "Novo geslo",
+    "Change password" : "Spremeni geslo",
+    "Full Name" : "Polno ime",
+    "Email" : "Elektronski naslov",
+    "Your email address" : "Osebni elektronski naslov",
+    "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.",
+    "Cancel" : "Prekliči",
+    "Choose as profile image" : "Izberi kot sliko profila",
+    "Language" : "Jezik",
+    "Help translate" : "Sodelujte pri prevajanju",
+    "Common Name" : "Splošno ime",
+    "Valid until" : "Veljavno do",
+    "Import Root Certificate" : "Uvozi korensko potrdilo",
+    "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",
+    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
+    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Login Name" : "Prijavno ime",
+    "Create" : "Ustvari",
+    "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
+    "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
+    "Add Group" : "Dodaj skupino",
+    "Group" : "Skupina",
+    "Everyone" : "Vsi",
+    "Admins" : "Skrbniki",
+    "Default Quota" : "Privzeta količinska omejitev",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
+    "Unlimited" : "Neomejeno",
+    "Other" : "Drugo",
+    "Username" : "Uporabniško ime",
+    "Quota" : "Količinska omejitev",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "Spremeni polno ime",
+    "set new password" : "nastavi novo geslo",
+    "Default" : "Privzeto"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
new file mode 100644
index 00000000000..0fad1072785
--- /dev/null
+++ b/settings/l10n/sl.json
@@ -0,0 +1,197 @@
+{ "translations": {
+    "Enabled" : "Omogočeno",
+    "Authentication error" : "Napaka med overjanjem",
+    "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
+    "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
+    "Group already exists" : "Skupina že obstaja",
+    "Unable to add group" : "Skupine ni mogoče dodati",
+    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
+    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Couldn't remove app." : "Ni mogoče odstraniti programa.",
+    "Email saved" : "Elektronski naslov je shranjen",
+    "Invalid email" : "Neveljaven elektronski naslov",
+    "Unable to delete group" : "Skupine ni mogoče izbrisati",
+    "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
+    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Language changed" : "Jezik je spremenjen",
+    "Invalid request" : "Neveljavna zahteva",
+    "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
+    "Unable to add user to group %s" : "Uporabnika ni mogoče dodati k skupini %s",
+    "Unable to remove user from group %s" : "Uporabnika ni mogoče odstraniti iz skupine %s",
+    "Couldn't update app." : "Programa ni mogoče posodobiti.",
+    "Wrong password" : "Napačno geslo",
+    "No user supplied" : "Ni navedenega uporabnika",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
+    "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",
+    "Saved" : "Shranjeno",
+    "test email settings" : "preizkusi nastavitve elektronske pošte",
+    "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "Email sent" : "Elektronska pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Add trusted domain" : "Dodaj varno domeno",
+    "Sending..." : "Poteka pošiljanje ...",
+    "All" : "Vsi",
+    "Please wait...." : "Počakajte ...",
+    "Error while disabling app" : "Napaka onemogočanja programa",
+    "Disable" : "Onemogoči",
+    "Enable" : "Omogoči",
+    "Error while enabling app" : "Napaka omogočanja programa",
+    "Updating...." : "Poteka posodabljanje ...",
+    "Error while updating app" : "Prišlo je do napake med posodabljanjem programa.",
+    "Updated" : "Posodobljeno",
+    "Uninstalling ...." : "Odstranjevanje namestitve ...",
+    "Error while uninstalling app" : "Prišlo je do napake med odstranjevanjem programa.",
+    "Uninstall" : "Odstrani namestitev",
+    "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",
+    "Valid until {date}" : "Veljavno do {date}",
+    "Delete" : "Izbriši",
+    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
+    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
+    "Restore encryption keys." : "Obnovi šifrirne ključe.",
+    "Groups" : "Skupine",
+    "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
+    "Error creating group" : "Napaka ustvarjanja skupine",
+    "undo" : "razveljavi",
+    "never" : "nikoli",
+    "add group" : "dodaj skupino",
+    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
+    "Error creating user" : "Napaka ustvarjanja uporabnika",
+    "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
+    "__language_name__" : "Slovenščina",
+    "SSL root certificates" : "Korenska potrdila SSL",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
+    "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
+    "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 .",
+    "Setup Warning" : "Opozorilo nastavitve",
+    "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
+    "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." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity checks" : "Preverjanje povezav",
+    "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
+    "Cron" : "Periodično opravilo",
+    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "Security" : "Varnost",
+    "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",
+    "Send mode" : "Način pošiljanja",
+    "Authentication method" : "Način overitve",
+    "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č",
+    "Less" : "Manj",
+    "Version" : "Različica",
+    "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "by" : "od",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Uporabniška dokumentacija",
+    "Admin Documentation" : "Skrbniška dokumentacija",
+    "Enable only for specific groups" : "Omogoči le za posamezne skupine",
+    "Uninstall App" : "Odstrani program",
+    "Administrator Documentation" : "Skrbniška dokumentacija",
+    "Online Documentation" : "Spletna dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sledilnik hroščev",
+    "Commercial Support" : "Podpora strankam",
+    "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
+    "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
+    "Password" : "Geslo",
+    "Your password was changed" : "Geslo je spremenjeno",
+    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
+    "Current password" : "Trenutno geslo",
+    "New password" : "Novo geslo",
+    "Change password" : "Spremeni geslo",
+    "Full Name" : "Polno ime",
+    "Email" : "Elektronski naslov",
+    "Your email address" : "Osebni elektronski naslov",
+    "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.",
+    "Cancel" : "Prekliči",
+    "Choose as profile image" : "Izberi kot sliko profila",
+    "Language" : "Jezik",
+    "Help translate" : "Sodelujte pri prevajanju",
+    "Common Name" : "Splošno ime",
+    "Valid until" : "Veljavno do",
+    "Import Root Certificate" : "Uvozi korensko potrdilo",
+    "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",
+    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
+    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Login Name" : "Prijavno ime",
+    "Create" : "Ustvari",
+    "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
+    "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
+    "Add Group" : "Dodaj skupino",
+    "Group" : "Skupina",
+    "Everyone" : "Vsi",
+    "Admins" : "Skrbniki",
+    "Default Quota" : "Privzeta količinska omejitev",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
+    "Unlimited" : "Neomejeno",
+    "Other" : "Drugo",
+    "Username" : "Uporabniško ime",
+    "Quota" : "Količinska omejitev",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "Spremeni polno ime",
+    "set new password" : "nastavi novo geslo",
+    "Default" : "Privzeto"
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
deleted file mode 100644
index 9866e44afa0..00000000000
--- a/settings/l10n/sl.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Omogočeno",
-"Not enabled" => "Ni omogočeno",
-"Recommended" => "Priporočljivo",
-"Authentication error" => "Napaka med overjanjem",
-"Your full name has been changed." => "Vaše polno ime je spremenjeno.",
-"Unable to change full name" => "Ni mogoče spremeniti polnega imena",
-"Group already exists" => "Skupina že obstaja",
-"Unable to add group" => "Skupine ni mogoče dodati",
-"Files decrypted successfully" => "Datoteke so uspešno odšifrirane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
-"Couldn't decrypt your files, check your password and try again" => "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
-"Encryption keys deleted permanently" => "Šifrirni ključi so trajno izbrisani",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
-"Couldn't remove app." => "Ni mogoče odstraniti programa.",
-"Email saved" => "Elektronski naslov je shranjen",
-"Invalid email" => "Neveljaven elektronski naslov",
-"Unable to delete group" => "Skupine ni mogoče izbrisati",
-"Unable to delete user" => "Uporabnika ni mogoče izbrisati",
-"Backups restored successfully" => "Varnostne kopije so uspešno obnovljene.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
-"Language changed" => "Jezik je spremenjen",
-"Invalid request" => "Neveljavna zahteva",
-"Admins can't remove themself from the admin group" => "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
-"Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
-"Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
-"Couldn't update app." => "Programa ni mogoče posodobiti.",
-"Wrong password" => "Napačno geslo",
-"No user supplied" => "Ni navedenega uporabnika",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
-"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",
-"Saved" => "Shranjeno",
-"test email settings" => "preizkusi nastavitve elektronske pošte",
-"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
-"A problem occurred while sending the email. Please revise your settings." => "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
-"Email sent" => "Elektronska pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
-"Add trusted domain" => "Dodaj varno domeno",
-"Sending..." => "Poteka pošiljanje ...",
-"All" => "Vsi",
-"Please wait...." => "Počakajte ...",
-"Error while disabling app" => "Napaka onemogočanja programa",
-"Disable" => "Onemogoči",
-"Enable" => "Omogoči",
-"Error while enabling app" => "Napaka omogočanja programa",
-"Updating...." => "Poteka posodabljanje ...",
-"Error while updating app" => "Prišlo je do napake med posodabljanjem programa.",
-"Updated" => "Posodobljeno",
-"Uninstalling ...." => "Odstranjevanje namestitve ...",
-"Error while uninstalling app" => "Prišlo je do napake med odstranjevanjem programa.",
-"Uninstall" => "Odstrani namestitev",
-"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",
-"Valid until {date}" => "Veljavno do {date}",
-"Delete" => "Izbriši",
-"Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-"Delete encryption keys permanently." => "Trajno izbriše šifrirne ključe",
-"Restore encryption keys." => "Obnovi šifrirne ključe.",
-"Groups" => "Skupine",
-"Unable to delete {objName}" => "Ni mogoče izbrisati {objName}",
-"Error creating group" => "Napaka ustvarjanja skupine",
-"A valid group name must be provided" => "Navedeno mora biti veljavno ime skupine",
-"deleted {groupName}" => "izbrisano {groupName}",
-"undo" => "razveljavi",
-"no group" => "ni skupine",
-"never" => "nikoli",
-"deleted {userName}" => "izbrisano {userName}",
-"add group" => "dodaj skupino",
-"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
-"Error creating user" => "Napaka ustvarjanja uporabnika",
-"A valid password must be provided" => "Navedeno mora biti veljavno geslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
-"__language_name__" => "Slovenščina",
-"Personal Info" => "Osebni podatki",
-"SSL root certificates" => "Korenska potrdila SSL",
-"Encryption" => "Šifriranje",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
-"Info, warnings, errors and fatal issues" => "Podrobnosti, opozorila, napake in usodne dogodke",
-"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 .",
-"Setup Warning" => "Opozorilo nastavitve",
-"Database Performance Info" => "Podrobnosti delovanja podatkovne zbirke",
-"Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
-"Your PHP version is outdated" => "Nameščena različica PHP je zastarela",
-"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." => "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
-"PHP charset is not set to UTF-8" => "Jezikovni znakovni nabor PHP ni določen kot UTF-8",
-"Locale not working" => "Jezikovne prilagoditve ne delujejo.",
-"System locale can not be set to a one which supports UTF-8." => "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
-"Connectivity checks" => "Preverjanje povezav",
-"No problems found" => "Ni zaznanih težav",
-"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
-"Cron" => "Periodično opravilo",
-"Last cron was executed at %s." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
-"Cron was not executed yet!" => "Periodično opravilo cron še ni zagnano!",
-"Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-"Sharing" => "Souporaba",
-"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
-"Allow users to share via link" => "Uporabnikom dovoli omogočanje souporabe s povezavami",
-"Enforce password protection" => "Vsili zaščito z geslom",
-"Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
-"Set default expiration date" => "Nastavitev privzetega datuma poteka",
-"Expire after " => "Preteče po",
-"days" => "dneh",
-"Enforce expiration date" => "Vsili datum preteka",
-"Allow resharing" => "Dovoli nadaljnjo souporabo",
-"Restrict users to only share with users in their groups" => "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
-"Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
-"Exclude groups from sharing" => "Izloči skupine iz souporabe",
-"These groups will still be able to receive shares, but not to initiate them." => "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-"Security" => "Varnost",
-"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",
-"This is used for sending out notifications." => "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
-"Send mode" => "Način pošiljanja",
-"From address" => "Naslov pošiljatelja",
-"Authentication method" => "Način overitve",
-"Authentication required" => "Zahtevana je overitev",
-"Server address" => "Naslov strežnika",
-"Port" => "Vrata",
-"Credentials" => "Poverila",
-"SMTP Username" => "Uporabniško ime SMTP",
-"SMTP Password" => "Geslo SMTP",
-"Store credentials" => "Shrani poverila",
-"Test email settings" => "Preizkus nastavitev elektronske pošte",
-"Send email" => "Pošlji elektronsko sporočilo",
-"Log" => "Dnevnik",
-"Log level" => "Raven beleženja",
-"More" => "Več",
-"Less" => "Manj",
-"Version" => "Različica",
-"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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
-"More apps" => "Več programov",
-"Add your app" => "Dodajte program",
-"by" => "od",
-"Documentation:" => "Dokumentacija:",
-"User Documentation" => "Uporabniška dokumentacija",
-"Admin Documentation" => "Skrbniška dokumentacija",
-"Update to %s" => "Posodobi na %s",
-"Enable only for specific groups" => "Omogoči le za posamezne skupine",
-"Uninstall App" => "Odstrani program",
-"Administrator Documentation" => "Skrbniška dokumentacija",
-"Online Documentation" => "Spletna dokumentacija",
-"Forum" => "Forum",
-"Bugtracker" => "Sledilnik hroščev",
-"Commercial Support" => "Podpora strankam",
-"Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
-"Show First Run Wizard again" => "Zaženi čarovnika prvega zagona",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
-"Password" => "Geslo",
-"Your password was changed" => "Geslo je spremenjeno",
-"Unable to change your password" => "Gesla ni mogoče spremeniti.",
-"Current password" => "Trenutno geslo",
-"New password" => "Novo geslo",
-"Change password" => "Spremeni geslo",
-"Full Name" => "Polno ime",
-"Email" => "Elektronski naslov",
-"Your email address" => "Osebni elektronski naslov",
-"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.",
-"Cancel" => "Prekliči",
-"Choose as profile image" => "Izberi kot sliko profila",
-"Language" => "Jezik",
-"Help translate" => "Sodelujte pri prevajanju",
-"Common Name" => "Splošno ime",
-"Valid until" => "Veljavno do",
-"Issued By" => "Izdajatelj",
-"Valid until %s" => "Veljavno do %s",
-"Import Root Certificate" => "Uvozi korensko potrdilo",
-"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",
-"Restore Encryption Keys" => "Obnovi šifrirne ključe",
-"Delete Encryption Keys" => "Izbriši šifrirne ključe",
-"Show storage location" => "Pokaži mesto shrambe",
-"Show last log in" => "Pokaži podatke zadnje prijave",
-"Login Name" => "Prijavno ime",
-"Create" => "Ustvari",
-"Admin Recovery Password" => "Obnovitev skrbniškega gesla",
-"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-"Search Users and Groups" => "Iskanje uporabnikov in skupin",
-"Add Group" => "Dodaj skupino",
-"Group" => "Skupina",
-"Everyone" => "Vsi",
-"Admins" => "Skrbniki",
-"Default Quota" => "Privzeta količinska omejitev",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
-"Unlimited" => "Neomejeno",
-"Other" => "Drugo",
-"Username" => "Uporabniško ime",
-"Group Admin for" => "Skrbnik skupine za",
-"Quota" => "Količinska omejitev",
-"Storage Location" => "Mesto shrambe",
-"Last Login" => "Zadnja prijava",
-"change full name" => "Spremeni polno ime",
-"set new password" => "nastavi novo geslo",
-"Default" => "Privzeto"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
new file mode 100644
index 00000000000..6a00beb0e2f
--- /dev/null
+++ b/settings/l10n/sq.js
@@ -0,0 +1,116 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Gabim autentifikimi",
+    "Group already exists" : "Grupi ekziston",
+    "Unable to add group" : "E pamundur të shtohet grupi",
+    "Email saved" : "Email u ruajt",
+    "Invalid email" : "Email jo i vlefshëm",
+    "Unable to delete group" : "E pamundur të fshihet grupi",
+    "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Language changed" : "Gjuha u ndryshua",
+    "Invalid request" : "Kërkesë e pavlefshme",
+    "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
+    "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.",
+    "Wrong password" : "Fjalëkalim i gabuar",
+    "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Saved" : "U ruajt",
+    "Email sent" : "Email-i u dërgua",
+    "Sending..." : "Duke dërguar",
+    "All" : "Të gjitha",
+    "Please wait...." : "Ju lutem prisni...",
+    "Disable" : "Çaktivizo",
+    "Enable" : "Aktivizo",
+    "Updating...." : "Duke përditësuar...",
+    "Error while updating app" : "Gabim gjatë përditësimit të app",
+    "Updated" : "I përditësuar",
+    "Select a profile picture" : "Zgjidh një foto profili",
+    "Delete" : "Fshi",
+    "Groups" : "Grupet",
+    "deleted {groupName}" : "u fshi {groupName}",
+    "undo" : "anullo veprimin",
+    "never" : "asnjëherë",
+    "deleted {userName}" : "u fshi {userName}",
+    "add group" : "shto grup",
+    "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
+    "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
+    "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+    "__language_name__" : "Shqip",
+    "Encryption" : "Kodifikimi",
+    "None" : "Asgjë",
+    "Login" : "Hyr",
+    "Security Warning" : "Njoftim për sigurinë",
+    "Setup Warning" : "Lajmërim konfigurimi",
+    "Module 'fileinfo' missing" : "Mungon moduli 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
+    "Locale not working" : "Locale nuk është funksional",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "Sharing" : "Ndarje",
+    "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
+    "Allow public uploads" : "Lejo ngarkimin publik",
+    "Expire after " : "Skadon pas",
+    "days" : "diitë",
+    "Allow resharing" : "Lejo ri-ndarjen",
+    "Security" : "Siguria",
+    "Enforce HTTPS" : "Detyro HTTPS",
+    "Send mode" : "Mënyra e dërgimit",
+    "From address" : "Nga adresa",
+    "mail" : "postë",
+    "Server address" : "Adresa e serverit",
+    "Port" : "Porta",
+    "Credentials" : "Kredencialet",
+    "Send email" : "Dërgo email",
+    "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>.",
+    "by" : "nga",
+    "Documentation:" : "Dokumentacioni:",
+    "User Documentation" : "Dokumentacion përdoruesi",
+    "Administrator Documentation" : "Dokumentacion administratori",
+    "Online Documentation" : "Dokumentacion online",
+    "Forum" : "Forumi",
+    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
+    "Commercial Support" : "Suport komercial",
+    "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
+    "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
+    "Password" : "Fjalëkalim",
+    "Your password was changed" : "fjalëkalimi juaj u ndryshua",
+    "Unable to change your password" : "Nuk është e mundur të ndryshohet fjalëkalimi",
+    "Current password" : "Fjalëkalimi aktual",
+    "New password" : "Fjalëkalimi i ri",
+    "Change password" : "Ndrysho fjalëkalimin",
+    "Full Name" : "Emri i plotë",
+    "Email" : "Email",
+    "Your email address" : "Adresa juaj email",
+    "Profile picture" : "Foto Profili",
+    "Remove image" : "Fshi imazh",
+    "Cancel" : "Anullo",
+    "Choose as profile image" : "Vendos si foto profili",
+    "Language" : "Gjuha",
+    "Help translate" : "Ndihmoni në përkthim",
+    "Log-in password" : "Fjalëkalimi i hyrjes",
+    "Login Name" : "Emri i Përdoruesit",
+    "Create" : "Krijo",
+    "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
+    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
+    "Add Group" : "Shto Grup",
+    "Group" : "Grup",
+    "Everyone" : "Të gjithë",
+    "Unlimited" : "E pakufizuar",
+    "Other" : "Tjetër",
+    "Username" : "Përdoruesi",
+    "Last Login" : "Hyrja e fundit",
+    "change full name" : "ndrysho emrin e plotë",
+    "set new password" : "vendos fjalëkalim të ri",
+    "Default" : "Paracaktuar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
new file mode 100644
index 00000000000..944d21022d6
--- /dev/null
+++ b/settings/l10n/sq.json
@@ -0,0 +1,114 @@
+{ "translations": {
+    "Authentication error" : "Gabim autentifikimi",
+    "Group already exists" : "Grupi ekziston",
+    "Unable to add group" : "E pamundur të shtohet grupi",
+    "Email saved" : "Email u ruajt",
+    "Invalid email" : "Email jo i vlefshëm",
+    "Unable to delete group" : "E pamundur të fshihet grupi",
+    "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Language changed" : "Gjuha u ndryshua",
+    "Invalid request" : "Kërkesë e pavlefshme",
+    "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
+    "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.",
+    "Wrong password" : "Fjalëkalim i gabuar",
+    "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Saved" : "U ruajt",
+    "Email sent" : "Email-i u dërgua",
+    "Sending..." : "Duke dërguar",
+    "All" : "Të gjitha",
+    "Please wait...." : "Ju lutem prisni...",
+    "Disable" : "Çaktivizo",
+    "Enable" : "Aktivizo",
+    "Updating...." : "Duke përditësuar...",
+    "Error while updating app" : "Gabim gjatë përditësimit të app",
+    "Updated" : "I përditësuar",
+    "Select a profile picture" : "Zgjidh një foto profili",
+    "Delete" : "Fshi",
+    "Groups" : "Grupet",
+    "deleted {groupName}" : "u fshi {groupName}",
+    "undo" : "anullo veprimin",
+    "never" : "asnjëherë",
+    "deleted {userName}" : "u fshi {userName}",
+    "add group" : "shto grup",
+    "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
+    "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
+    "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+    "__language_name__" : "Shqip",
+    "Encryption" : "Kodifikimi",
+    "None" : "Asgjë",
+    "Login" : "Hyr",
+    "Security Warning" : "Njoftim për sigurinë",
+    "Setup Warning" : "Lajmërim konfigurimi",
+    "Module 'fileinfo' missing" : "Mungon moduli 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
+    "Locale not working" : "Locale nuk është funksional",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "Sharing" : "Ndarje",
+    "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
+    "Allow public uploads" : "Lejo ngarkimin publik",
+    "Expire after " : "Skadon pas",
+    "days" : "diitë",
+    "Allow resharing" : "Lejo ri-ndarjen",
+    "Security" : "Siguria",
+    "Enforce HTTPS" : "Detyro HTTPS",
+    "Send mode" : "Mënyra e dërgimit",
+    "From address" : "Nga adresa",
+    "mail" : "postë",
+    "Server address" : "Adresa e serverit",
+    "Port" : "Porta",
+    "Credentials" : "Kredencialet",
+    "Send email" : "Dërgo email",
+    "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>.",
+    "by" : "nga",
+    "Documentation:" : "Dokumentacioni:",
+    "User Documentation" : "Dokumentacion përdoruesi",
+    "Administrator Documentation" : "Dokumentacion administratori",
+    "Online Documentation" : "Dokumentacion online",
+    "Forum" : "Forumi",
+    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
+    "Commercial Support" : "Suport komercial",
+    "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
+    "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
+    "Password" : "Fjalëkalim",
+    "Your password was changed" : "fjalëkalimi juaj u ndryshua",
+    "Unable to change your password" : "Nuk është e mundur të ndryshohet fjalëkalimi",
+    "Current password" : "Fjalëkalimi aktual",
+    "New password" : "Fjalëkalimi i ri",
+    "Change password" : "Ndrysho fjalëkalimin",
+    "Full Name" : "Emri i plotë",
+    "Email" : "Email",
+    "Your email address" : "Adresa juaj email",
+    "Profile picture" : "Foto Profili",
+    "Remove image" : "Fshi imazh",
+    "Cancel" : "Anullo",
+    "Choose as profile image" : "Vendos si foto profili",
+    "Language" : "Gjuha",
+    "Help translate" : "Ndihmoni në përkthim",
+    "Log-in password" : "Fjalëkalimi i hyrjes",
+    "Login Name" : "Emri i Përdoruesit",
+    "Create" : "Krijo",
+    "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
+    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
+    "Add Group" : "Shto Grup",
+    "Group" : "Grup",
+    "Everyone" : "Të gjithë",
+    "Unlimited" : "E pakufizuar",
+    "Other" : "Tjetër",
+    "Username" : "Përdoruesi",
+    "Last Login" : "Hyrja e fundit",
+    "change full name" : "ndrysho emrin e plotë",
+    "set new password" : "vendos fjalëkalim të ri",
+    "Default" : "Paracaktuar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
deleted file mode 100644
index e09d1ed128b..00000000000
--- a/settings/l10n/sq.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Gabim autentifikimi",
-"Group already exists" => "Grupi ekziston",
-"Unable to add group" => "E pamundur të shtohet grupi",
-"Email saved" => "Email u ruajt",
-"Invalid email" => "Email jo i vlefshëm",
-"Unable to delete group" => "E pamundur të fshihet grupi",
-"Unable to delete user" => "E pamundur të fshihet përdoruesi",
-"Language changed" => "Gjuha u ndryshua",
-"Invalid request" => "Kërkesë e pavlefshme",
-"Admins can't remove themself from the admin group" => "Administratorët nuk mund të heqin vehten prej grupit admin",
-"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.",
-"Wrong password" => "Fjalëkalim i gabuar",
-"Unable to change password" => "Fjalëkalimi nuk mund të ndryshohet",
-"Saved" => "U ruajt",
-"Email sent" => "Email-i u dërgua",
-"Sending..." => "Duke dërguar",
-"All" => "Të gjitha",
-"Please wait...." => "Ju lutem prisni...",
-"Disable" => "Çaktivizo",
-"Enable" => "Aktivizo",
-"Updating...." => "Duke përditësuar...",
-"Error while updating app" => "Gabim gjatë përditësimit të app",
-"Updated" => "I përditësuar",
-"Select a profile picture" => "Zgjidh një foto profili",
-"Delete" => "Fshi",
-"Groups" => "Grupet",
-"deleted {groupName}" => "u fshi {groupName}",
-"undo" => "anullo veprimin",
-"never" => "asnjëherë",
-"deleted {userName}" => "u fshi {userName}",
-"add group" => "shto grup",
-"A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi",
-"Error creating user" => "Gabim gjatë krijimit të përdoruesit",
-"A valid password must be provided" => "Duhet të jepni një fjalëkalim te vlefshëm",
-"__language_name__" => "Shqip",
-"Encryption" => "Kodifikimi",
-"None" => "Asgjë",
-"Login" => "Hyr",
-"Security Warning" => "Njoftim për sigurinë",
-"Setup Warning" => "Lajmërim konfigurimi",
-"Module 'fileinfo' missing" => "Mungon moduli 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
-"Locale not working" => "Locale nuk është funksional",
-"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-"Sharing" => "Ndarje",
-"Allow apps to use the Share API" => "Lejoni aplikacionet të përdorin share API",
-"Allow public uploads" => "Lejo ngarkimin publik",
-"Expire after " => "Skadon pas",
-"days" => "diitë",
-"Allow resharing" => "Lejo ri-ndarjen",
-"Security" => "Siguria",
-"Enforce HTTPS" => "Detyro HTTPS",
-"Send mode" => "Mënyra e dërgimit",
-"From address" => "Nga adresa",
-"mail" => "postë",
-"Server address" => "Adresa e serverit",
-"Port" => "Porta",
-"Credentials" => "Kredencialet",
-"Send email" => "Dërgo email",
-"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>.",
-"by" => "nga",
-"Documentation:" => "Dokumentacioni:",
-"User Documentation" => "Dokumentacion përdoruesi",
-"Administrator Documentation" => "Dokumentacion administratori",
-"Online Documentation" => "Dokumentacion online",
-"Forum" => "Forumi",
-"Bugtracker" => "Bugtracker - ndjekja e problemeve",
-"Commercial Support" => "Suport komercial",
-"Get the apps to sync your files" => "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
-"Show First Run Wizard again" => "Rishfaq përsëri fazat për hapjen e herës së parë",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
-"Password" => "Fjalëkalim",
-"Your password was changed" => "fjalëkalimi juaj u ndryshua",
-"Unable to change your password" => "Nuk është e mundur të ndryshohet fjalëkalimi",
-"Current password" => "Fjalëkalimi aktual",
-"New password" => "Fjalëkalimi i ri",
-"Change password" => "Ndrysho fjalëkalimin",
-"Full Name" => "Emri i plotë",
-"Email" => "Email",
-"Your email address" => "Adresa juaj email",
-"Profile picture" => "Foto Profili",
-"Remove image" => "Fshi imazh",
-"Cancel" => "Anullo",
-"Choose as profile image" => "Vendos si foto profili",
-"Language" => "Gjuha",
-"Help translate" => "Ndihmoni në përkthim",
-"Log-in password" => "Fjalëkalimi i hyrjes",
-"Login Name" => "Emri i Përdoruesit",
-"Create" => "Krijo",
-"Admin Recovery Password" => "Rigjetja e fjalëkalimit të Admin",
-"Enter the recovery password in order to recover the users files during password change" => "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
-"Search Users and Groups" => "Kërko Përdorues apo Grupe",
-"Add Group" => "Shto Grup",
-"Group" => "Grup",
-"Everyone" => "Të gjithë",
-"Unlimited" => "E pakufizuar",
-"Other" => "Tjetër",
-"Username" => "Përdoruesi",
-"Last Login" => "Hyrja e fundit",
-"change full name" => "ndrysho emrin e plotë",
-"set new password" => "vendos fjalëkalim të ri",
-"Default" => "Paracaktuar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
new file mode 100644
index 00000000000..e978e45a02f
--- /dev/null
+++ b/settings/l10n/sr.js
@@ -0,0 +1,88 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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." : "Не могу да ажурирам апликацију.",
+    "Email sent" : "Порука је послата",
+    "Please wait...." : "Сачекајте…",
+    "Disable" : "Искључи",
+    "Enable" : "Омогући",
+    "Updating...." : "Ажурирам…",
+    "Error while updating app" : "Грешка при ажурирању апликације",
+    "Updated" : "Ажурирано",
+    "Delete" : "Обриши",
+    "Groups" : "Групе",
+    "undo" : "опозови",
+    "never" : "никада",
+    "add group" : "додај групу",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "Error creating user" : "Грешка при прављењу корисника",
+    "A valid password must be provided" : "Морате унети исправну лозинку",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "Шифровање",
+    "None" : "Ништа",
+    "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." : "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
+    "Locale not working" : "Локализација не ради",
+    "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
+    "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
+    "Sharing" : "Дељење",
+    "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
+    "Allow resharing" : "Дозволи поновно дељење",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "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)\">АГПЛ лиценцом</abbr></a>.",
+    "by" : "од",
+    "User Documentation" : "Корисничка документација",
+    "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" : "Тренутна лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Измени лозинку",
+    "Email" : "Е-пошта",
+    "Your email address" : "Ваша адреса е-поште",
+    "Cancel" : "Откажи",
+    "Language" : "Језик",
+    "Help translate" : " Помозите у превођењу",
+    "Login Name" : "Корисничко име",
+    "Create" : "Направи",
+    "Group" : "Група",
+    "Default Quota" : "Подразумевано ограничење",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друго",
+    "Username" : "Корисничко име",
+    "Quota" : "Ограничење",
+    "set new password" : "постави нову лозинку",
+    "Default" : "Подразумевано"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
new file mode 100644
index 00000000000..3d9c23be8ba
--- /dev/null
+++ b/settings/l10n/sr.json
@@ -0,0 +1,86 @@
+{ "translations": {
+    "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." : "Не могу да ажурирам апликацију.",
+    "Email sent" : "Порука је послата",
+    "Please wait...." : "Сачекајте…",
+    "Disable" : "Искључи",
+    "Enable" : "Омогући",
+    "Updating...." : "Ажурирам…",
+    "Error while updating app" : "Грешка при ажурирању апликације",
+    "Updated" : "Ажурирано",
+    "Delete" : "Обриши",
+    "Groups" : "Групе",
+    "undo" : "опозови",
+    "never" : "никада",
+    "add group" : "додај групу",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "Error creating user" : "Грешка при прављењу корисника",
+    "A valid password must be provided" : "Морате унети исправну лозинку",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "Шифровање",
+    "None" : "Ништа",
+    "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." : "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
+    "Locale not working" : "Локализација не ради",
+    "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
+    "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
+    "Sharing" : "Дељење",
+    "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
+    "Allow resharing" : "Дозволи поновно дељење",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "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)\">АГПЛ лиценцом</abbr></a>.",
+    "by" : "од",
+    "User Documentation" : "Корисничка документација",
+    "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" : "Тренутна лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Измени лозинку",
+    "Email" : "Е-пошта",
+    "Your email address" : "Ваша адреса е-поште",
+    "Cancel" : "Откажи",
+    "Language" : "Језик",
+    "Help translate" : " Помозите у превођењу",
+    "Login Name" : "Корисничко име",
+    "Create" : "Направи",
+    "Group" : "Група",
+    "Default Quota" : "Подразумевано ограничење",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друго",
+    "Username" : "Корисничко име",
+    "Quota" : "Ограничење",
+    "set new password" : "постави нову лозинку",
+    "Default" : "Подразумевано"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
deleted file mode 100644
index eced1165e82..00000000000
--- a/settings/l10n/sr.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "Не могу да ажурирам апликацију.",
-"Email sent" => "Порука је послата",
-"Please wait...." => "Сачекајте…",
-"Disable" => "Искључи",
-"Enable" => "Омогући",
-"Updating...." => "Ажурирам…",
-"Error while updating app" => "Грешка при ажурирању апликације",
-"Updated" => "Ажурирано",
-"Delete" => "Обриши",
-"Groups" => "Групе",
-"undo" => "опозови",
-"never" => "никада",
-"add group" => "додај групу",
-"A valid username must be provided" => "Морате унети исправно корисничко име",
-"Error creating user" => "Грешка при прављењу корисника",
-"A valid password must be provided" => "Морате унети исправну лозинку",
-"__language_name__" => "__language_name__",
-"Encryption" => "Шифровање",
-"None" => "Ништа",
-"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." => "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
-"Locale not working" => "Локализација не ради",
-"Please double check the <a href='%s'>installation guides</a>." => "Погледајте <a href='%s'>водиче за инсталацију</a>.",
-"Execute one task with each page loaded" => "Изврши један задатак са сваком учитаном страницом",
-"Sharing" => "Дељење",
-"Allow apps to use the Share API" => "Дозвољава апликацијама да користе API Share",
-"Allow resharing" => "Дозволи поновно дељење",
-"Security" => "Безбедност",
-"Enforce HTTPS" => "Наметни HTTPS",
-"Server address" => "Адреса сервера",
-"Port" => "Порт",
-"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)\">АГПЛ лиценцом</abbr></a>.",
-"by" => "од",
-"User Documentation" => "Корисничка документација",
-"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" => "Тренутна лозинка",
-"New password" => "Нова лозинка",
-"Change password" => "Измени лозинку",
-"Email" => "Е-пошта",
-"Your email address" => "Ваша адреса е-поште",
-"Cancel" => "Откажи",
-"Language" => "Језик",
-"Help translate" => " Помозите у превођењу",
-"Login Name" => "Корисничко име",
-"Create" => "Направи",
-"Group" => "Група",
-"Default Quota" => "Подразумевано ограничење",
-"Unlimited" => "Неограничено",
-"Other" => "Друго",
-"Username" => "Корисничко име",
-"Quota" => "Ограничење",
-"set new password" => "постави нову лозинку",
-"Default" => "Подразумевано"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js
new file mode 100644
index 00000000000..1a85ab01f37
--- /dev/null
+++ b/settings/l10n/sr@latin.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Greška pri autentifikaciji",
+    "Language changed" : "Jezik je izmenjen",
+    "Invalid request" : "Neispravan zahtev",
+    "Email sent" : "Email poslat",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Obriši",
+    "Groups" : "Grupe",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "by" : "od",
+    "Password" : "Lozinka",
+    "Unable to change your password" : "Ne mogu da izmenim vašu lozinku",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Izmeni lozinku",
+    "Email" : "E-mail",
+    "Cancel" : "Otkaži",
+    "Language" : "Jezik",
+    "Create" : "Napravi",
+    "Group" : "Grupa",
+    "Other" : "Drugo",
+    "Username" : "Korisničko ime"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json
new file mode 100644
index 00000000000..654c8ded122
--- /dev/null
+++ b/settings/l10n/sr@latin.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Authentication error" : "Greška pri autentifikaciji",
+    "Language changed" : "Jezik je izmenjen",
+    "Invalid request" : "Neispravan zahtev",
+    "Email sent" : "Email poslat",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Obriši",
+    "Groups" : "Grupe",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "by" : "od",
+    "Password" : "Lozinka",
+    "Unable to change your password" : "Ne mogu da izmenim vašu lozinku",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Izmeni lozinku",
+    "Email" : "E-mail",
+    "Cancel" : "Otkaži",
+    "Language" : "Jezik",
+    "Create" : "Napravi",
+    "Group" : "Grupa",
+    "Other" : "Drugo",
+    "Username" : "Korisničko ime"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
deleted file mode 100644
index 7116283bed3..00000000000
--- a/settings/l10n/sr@latin.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Greška pri autentifikaciji",
-"Language changed" => "Jezik je izmenjen",
-"Invalid request" => "Neispravan zahtev",
-"Email sent" => "Email poslat",
-"Very weak password" => "Veoma slaba lozinka",
-"Weak password" => "Slaba lozinka",
-"So-so password" => "Osrednja lozinka",
-"Good password" => "Dobra lozinka",
-"Strong password" => "Jaka lozinka",
-"Delete" => "Obriši",
-"Groups" => "Grupe",
-"Security Warning" => "Bezbednosno upozorenje",
-"by" => "od",
-"Password" => "Lozinka",
-"Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
-"Current password" => "Trenutna lozinka",
-"New password" => "Nova lozinka",
-"Change password" => "Izmeni lozinku",
-"Email" => "E-mail",
-"Cancel" => "Otkaži",
-"Language" => "Jezik",
-"Create" => "Napravi",
-"Group" => "Grupa",
-"Other" => "Drugo",
-"Username" => "Korisničko ime"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
new file mode 100644
index 00000000000..3ca7dd28c9e
--- /dev/null
+++ b/settings/l10n/sv.js
@@ -0,0 +1,218 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
+    "Authentication error" : "Fel vid autentisering",
+    "Your full name has been changed." : "Hela ditt namn har ändrats",
+    "Unable to change full name" : "Kunde inte ändra hela namnet",
+    "Group already exists" : "Gruppen finns redan",
+    "Unable to add group" : "Kan inte lägga till grupp",
+    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
+    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
+    "Couldn't remove app." : "Kunde inte ta bort applikationen.",
+    "Email saved" : "E-post sparad",
+    "Invalid email" : "Ogiltig e-post",
+    "Unable to delete group" : "Kan inte radera grupp",
+    "Unable to delete user" : "Kan inte radera användare",
+    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
+    "Language changed" : "Språk ändrades",
+    "Invalid request" : "Ogiltig begäran",
+    "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
+    "Unable to add user to group %s" : "Kan inte lägga till användare i gruppen %s",
+    "Unable to remove user from group %s" : "Kan inte radera användare från gruppen %s",
+    "Couldn't update app." : "Kunde inte uppdatera appen.",
+    "Wrong password" : "Fel lösenord",
+    "No user supplied" : "Ingen användare angiven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
+    "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",
+    "Saved" : "Sparad",
+    "test email settings" : "testa e-post inställningar",
+    "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
+    "Email sent" : "E-post skickat",
+    "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
+    "Add trusted domain" : "Lägg till trusted domain",
+    "Sending..." : "Skickar...",
+    "All" : "Alla",
+    "Please wait...." : "Var god vänta...",
+    "Error while disabling app" : "Fel vid inaktivering av app",
+    "Disable" : "Deaktivera",
+    "Enable" : "Aktivera",
+    "Error while enabling app" : "Fel vid aktivering av app",
+    "Updating...." : "Uppdaterar...",
+    "Error while updating app" : "Fel uppstod vid uppdatering av appen",
+    "Updated" : "Uppdaterad",
+    "Uninstalling ...." : "Avinstallerar ....",
+    "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
+    "Uninstall" : "Avinstallera",
+    "Select a profile picture" : "Välj en profilbild",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Valid until {date}" : "Giltig t.o.m. {date}",
+    "Delete" : "Radera",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
+    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
+    "Restore encryption keys." : "Återställ krypteringsnycklar",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunde inte radera {objName}",
+    "Error creating group" : "Fel vid skapande av grupp",
+    "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges",
+    "deleted {groupName}" : "raderade {groupName} ",
+    "undo" : "ångra",
+    "never" : "aldrig",
+    "deleted {userName}" : "raderade {userName}",
+    "add group" : "lägg till grupp",
+    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
+    "Error creating user" : "Fel vid skapande av användare",
+    "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__",
+    "SSL root certificates" : "SSL rotcertifikat",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "None" : "Ingen",
+    "Login" : "Logga in",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Säkerhetsvarning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
+    "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",
+    "Database Performance Info" : "Databasprestanda Information",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+    "Your PHP version is outdated" : "Din PHP version är föråldrad",
+    "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." : "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
+    "Locale not working" : "Locale fungerar inte",
+    "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Sista cron kördes vid %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
+    "Cron was not executed yet!" : "Cron kördes inte ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Sharing" : "Dela",
+    "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
+    "Allow users to share via link" : "Tillåt användare att dela via länk",
+    "Enforce password protection" : "Tillämpa lösenordskydd",
+    "Allow public uploads" : "Tillåt offentlig uppladdning",
+    "Set default expiration date" : "Ställ in standardutgångsdatum",
+    "Expire after " : "Förfaller efter",
+    "days" : "dagar",
+    "Enforce expiration date" : "Tillämpa förfallodatum",
+    "Allow resharing" : "Tillåt vidaredelning",
+    "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper",
+    "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
+    "Exclude groups from sharing" : "Exkludera grupp från att dela",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
+    "Security" : "Säkerhet",
+    "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",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP användarnamn",
+    "SMTP Password" : "SMTP lösenord",
+    "Test email settings" : "Testa e-post inställningar",
+    "Send email" : "Skicka e-post",
+    "Log" : "Logg",
+    "Log level" : "Nivå på loggning",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Fler appar",
+    "by" : "av",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Användardokumentation",
+    "Admin Documentation" : "Administratörsdokumentation",
+    "Update to %s" : "Uppdatera till %s",
+    "Enable only for specific groups" : "Aktivera endast för specifika grupper",
+    "Uninstall App" : "Avinstallera Applikation",
+    "Administrator Documentation" : "Administratörsdokumentation",
+    "Online Documentation" : "Onlinedokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommersiell support",
+    "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
+    "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
+    "Password" : "Lösenord",
+    "Your password was changed" : "Ditt lösenord har ändrats",
+    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
+    "Current password" : "Nuvarande lösenord",
+    "New password" : "Nytt lösenord",
+    "Change password" : "Ändra lösenord",
+    "Full Name" : "Hela namnet",
+    "Email" : "E-post",
+    "Your email address" : "Din e-postadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
+    "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.",
+    "Your avatar is provided by your original account." : "Din avatar tillhandahålls av ditt ursprungliga konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Välj som profilbild",
+    "Language" : "Språk",
+    "Help translate" : "Hjälp att översätta",
+    "Import Root Certificate" : "Importera rotcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
+    "Log-in password" : "Inloggningslösenord",
+    "Decrypt all Files" : "Dekryptera alla filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
+    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
+    "Delete Encryption Keys" : "Radera krypteringsnycklar",
+    "Login Name" : "Inloggningsnamn",
+    "Create" : "Skapa",
+    "Admin Recovery Password" : "Admin återställningslösenord",
+    "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
+    "Search Users and Groups" : "Sök Användare och Grupper",
+    "Add Group" : "Lägg till Grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Alla",
+    "Admins" : "Administratörer",
+    "Default Quota" : "Förvald datakvot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
+    "Unlimited" : "Obegränsad",
+    "Other" : "Annat",
+    "Username" : "Användarnamn",
+    "Quota" : "Kvot",
+    "Storage Location" : "Lagringsplats",
+    "Last Login" : "Senaste inloggning",
+    "change full name" : "ändra hela namnet",
+    "set new password" : "ange nytt lösenord",
+    "Default" : "Förvald"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
new file mode 100644
index 00000000000..9229d8fb670
--- /dev/null
+++ b/settings/l10n/sv.json
@@ -0,0 +1,216 @@
+{ "translations": {
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
+    "Authentication error" : "Fel vid autentisering",
+    "Your full name has been changed." : "Hela ditt namn har ändrats",
+    "Unable to change full name" : "Kunde inte ändra hela namnet",
+    "Group already exists" : "Gruppen finns redan",
+    "Unable to add group" : "Kan inte lägga till grupp",
+    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
+    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
+    "Couldn't remove app." : "Kunde inte ta bort applikationen.",
+    "Email saved" : "E-post sparad",
+    "Invalid email" : "Ogiltig e-post",
+    "Unable to delete group" : "Kan inte radera grupp",
+    "Unable to delete user" : "Kan inte radera användare",
+    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
+    "Language changed" : "Språk ändrades",
+    "Invalid request" : "Ogiltig begäran",
+    "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
+    "Unable to add user to group %s" : "Kan inte lägga till användare i gruppen %s",
+    "Unable to remove user from group %s" : "Kan inte radera användare från gruppen %s",
+    "Couldn't update app." : "Kunde inte uppdatera appen.",
+    "Wrong password" : "Fel lösenord",
+    "No user supplied" : "Ingen användare angiven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
+    "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",
+    "Saved" : "Sparad",
+    "test email settings" : "testa e-post inställningar",
+    "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
+    "Email sent" : "E-post skickat",
+    "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
+    "Add trusted domain" : "Lägg till trusted domain",
+    "Sending..." : "Skickar...",
+    "All" : "Alla",
+    "Please wait...." : "Var god vänta...",
+    "Error while disabling app" : "Fel vid inaktivering av app",
+    "Disable" : "Deaktivera",
+    "Enable" : "Aktivera",
+    "Error while enabling app" : "Fel vid aktivering av app",
+    "Updating...." : "Uppdaterar...",
+    "Error while updating app" : "Fel uppstod vid uppdatering av appen",
+    "Updated" : "Uppdaterad",
+    "Uninstalling ...." : "Avinstallerar ....",
+    "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
+    "Uninstall" : "Avinstallera",
+    "Select a profile picture" : "Välj en profilbild",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Valid until {date}" : "Giltig t.o.m. {date}",
+    "Delete" : "Radera",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
+    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
+    "Restore encryption keys." : "Återställ krypteringsnycklar",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunde inte radera {objName}",
+    "Error creating group" : "Fel vid skapande av grupp",
+    "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges",
+    "deleted {groupName}" : "raderade {groupName} ",
+    "undo" : "ångra",
+    "never" : "aldrig",
+    "deleted {userName}" : "raderade {userName}",
+    "add group" : "lägg till grupp",
+    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
+    "Error creating user" : "Fel vid skapande av användare",
+    "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__",
+    "SSL root certificates" : "SSL rotcertifikat",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "None" : "Ingen",
+    "Login" : "Logga in",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Säkerhetsvarning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
+    "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",
+    "Database Performance Info" : "Databasprestanda Information",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+    "Your PHP version is outdated" : "Din PHP version är föråldrad",
+    "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." : "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
+    "Locale not working" : "Locale fungerar inte",
+    "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Sista cron kördes vid %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
+    "Cron was not executed yet!" : "Cron kördes inte ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Sharing" : "Dela",
+    "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
+    "Allow users to share via link" : "Tillåt användare att dela via länk",
+    "Enforce password protection" : "Tillämpa lösenordskydd",
+    "Allow public uploads" : "Tillåt offentlig uppladdning",
+    "Set default expiration date" : "Ställ in standardutgångsdatum",
+    "Expire after " : "Förfaller efter",
+    "days" : "dagar",
+    "Enforce expiration date" : "Tillämpa förfallodatum",
+    "Allow resharing" : "Tillåt vidaredelning",
+    "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper",
+    "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
+    "Exclude groups from sharing" : "Exkludera grupp från att dela",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
+    "Security" : "Säkerhet",
+    "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",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP användarnamn",
+    "SMTP Password" : "SMTP lösenord",
+    "Test email settings" : "Testa e-post inställningar",
+    "Send email" : "Skicka e-post",
+    "Log" : "Logg",
+    "Log level" : "Nivå på loggning",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Fler appar",
+    "by" : "av",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Användardokumentation",
+    "Admin Documentation" : "Administratörsdokumentation",
+    "Update to %s" : "Uppdatera till %s",
+    "Enable only for specific groups" : "Aktivera endast för specifika grupper",
+    "Uninstall App" : "Avinstallera Applikation",
+    "Administrator Documentation" : "Administratörsdokumentation",
+    "Online Documentation" : "Onlinedokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommersiell support",
+    "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
+    "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
+    "Password" : "Lösenord",
+    "Your password was changed" : "Ditt lösenord har ändrats",
+    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
+    "Current password" : "Nuvarande lösenord",
+    "New password" : "Nytt lösenord",
+    "Change password" : "Ändra lösenord",
+    "Full Name" : "Hela namnet",
+    "Email" : "E-post",
+    "Your email address" : "Din e-postadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
+    "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.",
+    "Your avatar is provided by your original account." : "Din avatar tillhandahålls av ditt ursprungliga konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Välj som profilbild",
+    "Language" : "Språk",
+    "Help translate" : "Hjälp att översätta",
+    "Import Root Certificate" : "Importera rotcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
+    "Log-in password" : "Inloggningslösenord",
+    "Decrypt all Files" : "Dekryptera alla filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
+    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
+    "Delete Encryption Keys" : "Radera krypteringsnycklar",
+    "Login Name" : "Inloggningsnamn",
+    "Create" : "Skapa",
+    "Admin Recovery Password" : "Admin återställningslösenord",
+    "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
+    "Search Users and Groups" : "Sök Användare och Grupper",
+    "Add Group" : "Lägg till Grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Alla",
+    "Admins" : "Administratörer",
+    "Default Quota" : "Förvald datakvot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
+    "Unlimited" : "Obegränsad",
+    "Other" : "Annat",
+    "Username" : "Användarnamn",
+    "Quota" : "Kvot",
+    "Storage Location" : "Lagringsplats",
+    "Last Login" : "Senaste inloggning",
+    "change full name" : "ändra hela namnet",
+    "set new password" : "ange nytt lösenord",
+    "Default" : "Förvald"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
deleted file mode 100644
index 60ca3488e04..00000000000
--- a/settings/l10n/sv.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiverad",
-"Not enabled" => "Inte aktiverad",
-"Recommended" => "Rekomenderad",
-"Authentication error" => "Fel vid autentisering",
-"Your full name has been changed." => "Hela ditt namn har ändrats",
-"Unable to change full name" => "Kunde inte ändra hela namnet",
-"Group already exists" => "Gruppen finns redan",
-"Unable to add group" => "Kan inte lägga till grupp",
-"Files decrypted successfully" => "Filerna dekrypterades utan fel",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
-"Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
-"Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
-"Couldn't remove app." => "Kunde inte ta bort applikationen.",
-"Email saved" => "E-post sparad",
-"Invalid email" => "Ogiltig e-post",
-"Unable to delete group" => "Kan inte radera grupp",
-"Unable to delete user" => "Kan inte radera användare",
-"Backups restored successfully" => "Återställning av säkerhetskopior lyckades",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
-"Language changed" => "Språk ändrades",
-"Invalid request" => "Ogiltig begäran",
-"Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
-"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
-"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
-"Couldn't update app." => "Kunde inte uppdatera appen.",
-"Wrong password" => "Fel lösenord",
-"No user supplied" => "Ingen användare angiven",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
-"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",
-"Saved" => "Sparad",
-"test email settings" => "testa e-post inställningar",
-"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
-"Email sent" => "E-post skickat",
-"You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
-"Add trusted domain" => "Lägg till trusted domain",
-"Sending..." => "Skickar...",
-"All" => "Alla",
-"Please wait...." => "Var god vänta...",
-"Error while disabling app" => "Fel vid inaktivering av app",
-"Disable" => "Deaktivera",
-"Enable" => "Aktivera",
-"Error while enabling app" => "Fel vid aktivering av app",
-"Updating...." => "Uppdaterar...",
-"Error while updating app" => "Fel uppstod vid uppdatering av appen",
-"Updated" => "Uppdaterad",
-"Uninstalling ...." => "Avinstallerar ....",
-"Error while uninstalling app" => "Ett fel inträffade när applikatonen avinstallerades",
-"Uninstall" => "Avinstallera",
-"Select a profile picture" => "Välj en profilbild",
-"Very weak password" => "Väldigt svagt lösenord",
-"Weak password" => "Svagt lösenord",
-"So-so password" => "Okej lösenord",
-"Good password" => "Bra lösenord",
-"Strong password" => "Starkt lösenord",
-"Valid until {date}" => "Giltig t.o.m. {date}",
-"Delete" => "Radera",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
-"Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
-"Restore encryption keys." => "Återställ krypteringsnycklar",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kunde inte radera {objName}",
-"Error creating group" => "Fel vid skapande av grupp",
-"A valid group name must be provided" => "Ett giltigt gruppnamn måste anges",
-"deleted {groupName}" => "raderade {groupName} ",
-"undo" => "ångra",
-"never" => "aldrig",
-"deleted {userName}" => "raderade {userName}",
-"add group" => "lägg till grupp",
-"A valid username must be provided" => "Ett giltigt användarnamn måste anges",
-"Error creating user" => "Fel vid skapande av användare",
-"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__",
-"SSL root certificates" => "SSL rotcertifikat",
-"Encryption" => "Kryptering",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Allting (allvarliga fel, fel, varningar, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, varningar och allvarliga fel",
-"Warnings, errors and fatal issues" => "Varningar, fel och allvarliga fel",
-"Errors and fatal issues" => "Fel och allvarliga fel",
-"Fatal issues only" => "Endast allvarliga fel",
-"None" => "Ingen",
-"Login" => "Logga in",
-"Plain" => "Enkel",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Säkerhetsvarning",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
-"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",
-"Database Performance Info" => "Databasprestanda Information",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
-"Your PHP version is outdated" => "Din PHP version är föråldrad",
-"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." => "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
-"Locale not working" => "Locale fungerar inte",
-"System locale can not be set to a one which supports UTF-8." => "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
-"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Sista cron kördes vid %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
-"Cron was not executed yet!" => "Cron kördes inte ännu!",
-"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-"Sharing" => "Dela",
-"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
-"Allow users to share via link" => "Tillåt användare att dela via länk",
-"Enforce password protection" => "Tillämpa lösenordskydd",
-"Allow public uploads" => "Tillåt offentlig uppladdning",
-"Set default expiration date" => "Ställ in standardutgångsdatum",
-"Expire after " => "Förfaller efter",
-"days" => "dagar",
-"Enforce expiration date" => "Tillämpa förfallodatum",
-"Allow resharing" => "Tillåt vidaredelning",
-"Restrict users to only share with users in their groups" => "Begränsa användare till att enbart kunna dela med användare i deras grupper",
-"Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
-"Exclude groups from sharing" => "Exkludera grupp från att dela",
-"These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
-"Security" => "Säkerhet",
-"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",
-"Email Server" => "E-postserver",
-"This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
-"Send mode" => "Sändningsläge",
-"From address" => "Från adress",
-"mail" => "mail",
-"Authentication method" => "Autentiseringsmetod",
-"Authentication required" => "Autentisering krävs",
-"Server address" => "Serveradress",
-"Port" => "Port",
-"Credentials" => "Inloggningsuppgifter",
-"SMTP Username" => "SMTP användarnamn",
-"SMTP Password" => "SMTP lösenord",
-"Test email settings" => "Testa e-post inställningar",
-"Send email" => "Skicka e-post",
-"Log" => "Logg",
-"Log level" => "Nivå på loggning",
-"More" => "Mer",
-"Less" => "Mindre",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Fler appar",
-"by" => "av",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Användardokumentation",
-"Admin Documentation" => "Administratörsdokumentation",
-"Update to %s" => "Uppdatera till %s",
-"Enable only for specific groups" => "Aktivera endast för specifika grupper",
-"Uninstall App" => "Avinstallera Applikation",
-"Administrator Documentation" => "Administratörsdokumentation",
-"Online Documentation" => "Onlinedokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommersiell support",
-"Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
-"Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Password" => "Lösenord",
-"Your password was changed" => "Ditt lösenord har ändrats",
-"Unable to change your password" => "Kunde inte ändra ditt lösenord",
-"Current password" => "Nuvarande lösenord",
-"New password" => "Nytt lösenord",
-"Change password" => "Ändra lösenord",
-"Full Name" => "Hela namnet",
-"Email" => "E-post",
-"Your email address" => "Din e-postadress",
-"Fill in an email address to enable password recovery and receive notifications" => "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
-"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.",
-"Your avatar is provided by your original account." => "Din avatar tillhandahålls av ditt ursprungliga konto.",
-"Cancel" => "Avbryt",
-"Choose as profile image" => "Välj som profilbild",
-"Language" => "Språk",
-"Help translate" => "Hjälp att översätta",
-"Import Root Certificate" => "Importera rotcertifikat",
-"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
-"Log-in password" => "Inloggningslösenord",
-"Decrypt all Files" => "Dekryptera alla filer",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
-"Restore Encryption Keys" => "Återställ krypteringsnycklar",
-"Delete Encryption Keys" => "Radera krypteringsnycklar",
-"Login Name" => "Inloggningsnamn",
-"Create" => "Skapa",
-"Admin Recovery Password" => "Admin återställningslösenord",
-"Enter the recovery password in order to recover the users files during password change" => "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-"Search Users and Groups" => "Sök Användare och Grupper",
-"Add Group" => "Lägg till Grupp",
-"Group" => "Grupp",
-"Everyone" => "Alla",
-"Admins" => "Administratörer",
-"Default Quota" => "Förvald datakvot",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
-"Unlimited" => "Obegränsad",
-"Other" => "Annat",
-"Username" => "Användarnamn",
-"Quota" => "Kvot",
-"Storage Location" => "Lagringsplats",
-"Last Login" => "Senaste inloggning",
-"change full name" => "ändra hela namnet",
-"set new password" => "ange nytt lösenord",
-"Default" => "Förvald"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_IN.js b/settings/l10n/ta_IN.js
new file mode 100644
index 00000000000..83e55977512
--- /dev/null
+++ b/settings/l10n/ta_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "More" : "மேலும்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ta_IN.json b/settings/l10n/ta_IN.json
new file mode 100644
index 00000000000..6c79fe76a8f
--- /dev/null
+++ b/settings/l10n/ta_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "More" : "மேலும்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ta_IN.php b/settings/l10n/ta_IN.php
deleted file mode 100644
index 87afecee84d..00000000000
--- a/settings/l10n/ta_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"More" => "மேலும்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js
new file mode 100644
index 00000000000..45c3b753b45
--- /dev/null
+++ b/settings/l10n/ta_LK.js
@@ -0,0 +1,55 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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" : "செல்லுபடியற்ற வேண்டுகோள்",
+    "Unable to add user to group %s" : "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
+    "Unable to remove user from group %s" : "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
+    "All" : "எல்லாம்",
+    "Disable" : "இயலுமைப்ப",
+    "Enable" : "இயலுமைப்படுத்துக",
+    "Delete" : "நீக்குக",
+    "Groups" : "குழுக்கள்",
+    "undo" : "முன் செயல் நீக்கம் ",
+    "never" : "ஒருபோதும்",
+    "__language_name__" : "_மொழி_பெயர்_",
+    "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
+    "Encryption" : "மறைக்குறியீடு",
+    "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>.",
+    "by" : "மூலம்",
+    "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" : "தற்போதைய கடவுச்சொல்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Change password" : "கடவுச்சொல்லை மாற்றுக",
+    "Email" : "மின்னஞ்சல்",
+    "Your email address" : "உங்களுடைய மின்னஞ்சல் முகவரி",
+    "Cancel" : "இரத்து செய்க",
+    "Language" : "மொழி",
+    "Help translate" : "மொழிபெயர்க்க உதவி",
+    "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
+    "Login Name" : "புகுபதிகை",
+    "Create" : "உருவாக்குக",
+    "Default Quota" : "பொது இருப்பு பங்கு",
+    "Other" : "மற்றவை",
+    "Username" : "பயனாளர் பெயர்",
+    "Quota" : "பங்கு"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json
new file mode 100644
index 00000000000..ab306822e2c
--- /dev/null
+++ b/settings/l10n/ta_LK.json
@@ -0,0 +1,53 @@
+{ "translations": {
+    "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" : "செல்லுபடியற்ற வேண்டுகோள்",
+    "Unable to add user to group %s" : "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
+    "Unable to remove user from group %s" : "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
+    "All" : "எல்லாம்",
+    "Disable" : "இயலுமைப்ப",
+    "Enable" : "இயலுமைப்படுத்துக",
+    "Delete" : "நீக்குக",
+    "Groups" : "குழுக்கள்",
+    "undo" : "முன் செயல் நீக்கம் ",
+    "never" : "ஒருபோதும்",
+    "__language_name__" : "_மொழி_பெயர்_",
+    "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
+    "Encryption" : "மறைக்குறியீடு",
+    "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>.",
+    "by" : "மூலம்",
+    "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" : "தற்போதைய கடவுச்சொல்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Change password" : "கடவுச்சொல்லை மாற்றுக",
+    "Email" : "மின்னஞ்சல்",
+    "Your email address" : "உங்களுடைய மின்னஞ்சல் முகவரி",
+    "Cancel" : "இரத்து செய்க",
+    "Language" : "மொழி",
+    "Help translate" : "மொழிபெயர்க்க உதவி",
+    "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
+    "Login Name" : "புகுபதிகை",
+    "Create" : "உருவாக்குக",
+    "Default Quota" : "பொது இருப்பு பங்கு",
+    "Other" : "மற்றவை",
+    "Username" : "பயனாளர் பெயர்",
+    "Quota" : "பங்கு"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
deleted file mode 100644
index 7d7df14e9d3..00000000000
--- a/settings/l10n/ta_LK.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "செல்லுபடியற்ற வேண்டுகோள்",
-"Unable to add user to group %s" => "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
-"Unable to remove user from group %s" => "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
-"All" => "எல்லாம்",
-"Disable" => "இயலுமைப்ப",
-"Enable" => "இயலுமைப்படுத்துக",
-"Delete" => "நீக்குக",
-"Groups" => "குழுக்கள்",
-"undo" => "முன் செயல் நீக்கம் ",
-"never" => "ஒருபோதும்",
-"__language_name__" => "_மொழி_பெயர்_",
-"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
-"Encryption" => "மறைக்குறியீடு",
-"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>.",
-"by" => "மூலம்",
-"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" => "தற்போதைய கடவுச்சொல்",
-"New password" => "புதிய கடவுச்சொல்",
-"Change password" => "கடவுச்சொல்லை மாற்றுக",
-"Email" => "மின்னஞ்சல்",
-"Your email address" => "உங்களுடைய மின்னஞ்சல் முகவரி",
-"Cancel" => "இரத்து செய்க",
-"Language" => "மொழி",
-"Help translate" => "மொழிபெயர்க்க உதவி",
-"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க",
-"Login Name" => "புகுபதிகை",
-"Create" => "உருவாக்குக",
-"Default Quota" => "பொது இருப்பு பங்கு",
-"Other" => "மற்றவை",
-"Username" => "பயனாளர் பெயர்",
-"Quota" => "பங்கு"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/te.js b/settings/l10n/te.js
new file mode 100644
index 00000000000..f09acb41060
--- /dev/null
+++ b/settings/l10n/te.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Delete" : "తొలగించు",
+    "Server address" : "సేవకి చిరునామా",
+    "More" : "మరిన్ని",
+    "Password" : "సంకేతపదం",
+    "New password" : "కొత్త సంకేతపదం",
+    "Email" : "ఈమెయిలు",
+    "Your email address" : "మీ ఈమెయిలు చిరునామా",
+    "Cancel" : "రద్దుచేయి",
+    "Language" : "భాష",
+    "Username" : "వాడుకరి పేరు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/te.json b/settings/l10n/te.json
new file mode 100644
index 00000000000..031f99d1498
--- /dev/null
+++ b/settings/l10n/te.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Delete" : "తొలగించు",
+    "Server address" : "సేవకి చిరునామా",
+    "More" : "మరిన్ని",
+    "Password" : "సంకేతపదం",
+    "New password" : "కొత్త సంకేతపదం",
+    "Email" : "ఈమెయిలు",
+    "Your email address" : "మీ ఈమెయిలు చిరునామా",
+    "Cancel" : "రద్దుచేయి",
+    "Language" : "భాష",
+    "Username" : "వాడుకరి పేరు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
deleted file mode 100644
index d5f2c6c8d16..00000000000
--- a/settings/l10n/te.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "తొలగించు",
-"Server address" => "సేవకి చిరునామా",
-"More" => "మరిన్ని",
-"Password" => "సంకేతపదం",
-"New password" => "కొత్త సంకేతపదం",
-"Email" => "ఈమెయిలు",
-"Your email address" => "మీ ఈమెయిలు చిరునామా",
-"Cancel" => "రద్దుచేయి",
-"Language" => "భాష",
-"Username" => "వాడుకరి పేరు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
new file mode 100644
index 00000000000..010303a5872
--- /dev/null
+++ b/settings/l10n/th_TH.js
@@ -0,0 +1,81 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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." : "ไม่สามารถอัพเดทแอปฯ",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "All" : "ทั้งหมด",
+    "Please wait...." : "กรุณารอสักครู่...",
+    "Disable" : "ปิดใช้งาน",
+    "Enable" : "เปิดใช้งาน",
+    "Updating...." : "กำลังอัพเดทข้อมูล...",
+    "Error while updating app" : "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
+    "Updated" : "อัพเดทแล้ว",
+    "Delete" : "ลบ",
+    "Groups" : "กลุ่ม",
+    "undo" : "เลิกทำ",
+    "never" : "ไม่ต้องเลย",
+    "__language_name__" : "ภาษาไทย",
+    "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+    "Encryption" : "การเข้ารหัส",
+    "None" : "ไม่มี",
+    "Login" : "เข้าสู่ระบบ",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+    "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "Log level" : "ระดับการเก็บบันทึก log",
+    "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>." : "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.",
+    "by" : "โดย",
+    "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
+    "Forum" : "กระดานสนทนา",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
+    "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" : "รหัสผ่านปัจจุบัน",
+    "New password" : "รหัสผ่านใหม่",
+    "Change password" : "เปลี่ยนรหัสผ่าน",
+    "Email" : "อีเมล",
+    "Your email address" : "ที่อยู่อีเมล์ของคุณ",
+    "Profile picture" : "รูปภาพโปรไฟล์",
+    "Cancel" : "ยกเลิก",
+    "Language" : "ภาษา",
+    "Help translate" : "ช่วยกันแปล",
+    "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Create" : "สร้าง",
+    "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
+    "Unlimited" : "ไม่จำกัดจำนวน",
+    "Other" : "อื่นๆ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Quota" : "พื้นที่",
+    "set new password" : "ตั้งค่ารหัสผ่านใหม่",
+    "Default" : "ค่าเริ่มต้น"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
new file mode 100644
index 00000000000..28a346aab65
--- /dev/null
+++ b/settings/l10n/th_TH.json
@@ -0,0 +1,79 @@
+{ "translations": {
+    "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." : "ไม่สามารถอัพเดทแอปฯ",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "All" : "ทั้งหมด",
+    "Please wait...." : "กรุณารอสักครู่...",
+    "Disable" : "ปิดใช้งาน",
+    "Enable" : "เปิดใช้งาน",
+    "Updating...." : "กำลังอัพเดทข้อมูล...",
+    "Error while updating app" : "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
+    "Updated" : "อัพเดทแล้ว",
+    "Delete" : "ลบ",
+    "Groups" : "กลุ่ม",
+    "undo" : "เลิกทำ",
+    "never" : "ไม่ต้องเลย",
+    "__language_name__" : "ภาษาไทย",
+    "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+    "Encryption" : "การเข้ารหัส",
+    "None" : "ไม่มี",
+    "Login" : "เข้าสู่ระบบ",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+    "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "Log level" : "ระดับการเก็บบันทึก log",
+    "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>." : "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.",
+    "by" : "โดย",
+    "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
+    "Forum" : "กระดานสนทนา",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
+    "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" : "รหัสผ่านปัจจุบัน",
+    "New password" : "รหัสผ่านใหม่",
+    "Change password" : "เปลี่ยนรหัสผ่าน",
+    "Email" : "อีเมล",
+    "Your email address" : "ที่อยู่อีเมล์ของคุณ",
+    "Profile picture" : "รูปภาพโปรไฟล์",
+    "Cancel" : "ยกเลิก",
+    "Language" : "ภาษา",
+    "Help translate" : "ช่วยกันแปล",
+    "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Create" : "สร้าง",
+    "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
+    "Unlimited" : "ไม่จำกัดจำนวน",
+    "Other" : "อื่นๆ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Quota" : "พื้นที่",
+    "set new password" : "ตั้งค่ารหัสผ่านใหม่",
+    "Default" : "ค่าเริ่มต้น"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
deleted file mode 100644
index 5abacd4f4b1..00000000000
--- a/settings/l10n/th_TH.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "ไม่สามารถอัพเดทแอปฯ",
-"Email sent" => "ส่งอีเมล์แล้ว",
-"All" => "ทั้งหมด",
-"Please wait...." => "กรุณารอสักครู่...",
-"Disable" => "ปิดใช้งาน",
-"Enable" => "เปิดใช้งาน",
-"Updating...." => "กำลังอัพเดทข้อมูล...",
-"Error while updating app" => "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
-"Updated" => "อัพเดทแล้ว",
-"Delete" => "ลบ",
-"Groups" => "กลุ่ม",
-"undo" => "เลิกทำ",
-"never" => "ไม่ต้องเลย",
-"__language_name__" => "ภาษาไทย",
-"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
-"Encryption" => "การเข้ารหัส",
-"None" => "ไม่มี",
-"Login" => "เข้าสู่ระบบ",
-"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-"Sharing" => "การแชร์ข้อมูล",
-"Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
-"Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
-"Server address" => "ที่อยู่เซิร์ฟเวอร์",
-"Port" => "พอร์ต",
-"Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-"Log" => "บันทึกการเปลี่ยนแปลง",
-"Log level" => "ระดับการเก็บบันทึก log",
-"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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.",
-"by" => "โดย",
-"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
-"Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
-"Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
-"Forum" => "กระดานสนทนา",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
-"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" => "รหัสผ่านปัจจุบัน",
-"New password" => "รหัสผ่านใหม่",
-"Change password" => "เปลี่ยนรหัสผ่าน",
-"Email" => "อีเมล",
-"Your email address" => "ที่อยู่อีเมล์ของคุณ",
-"Profile picture" => "รูปภาพโปรไฟล์",
-"Cancel" => "ยกเลิก",
-"Language" => "ภาษา",
-"Help translate" => "ช่วยกันแปล",
-"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
-"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
-"Create" => "สร้าง",
-"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
-"Unlimited" => "ไม่จำกัดจำนวน",
-"Other" => "อื่นๆ",
-"Username" => "ชื่อผู้ใช้งาน",
-"Quota" => "พื้นที่",
-"set new password" => "ตั้งค่ารหัสผ่านใหม่",
-"Default" => "ค่าเริ่มต้น"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
new file mode 100644
index 00000000000..dd4519d02d0
--- /dev/null
+++ b/settings/l10n/tr.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Your full name has been changed." : "Tam adınız değiştirildi.",
+    "Unable to change full name" : "Tam adınız değiştirilirken hata",
+    "Group already exists" : "Grup zaten mevcut",
+    "Unable to add group" : "Grup eklenemiyor",
+    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
+    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Couldn't remove app." : "Uygulama kaldırılamadı.",
+    "Email saved" : "E-posta kaydedildi",
+    "Invalid email" : "Geçersiz e-posta",
+    "Unable to delete group" : "Grup silinemiyor",
+    "Unable to delete user" : "Kullanıcı silinemiyor",
+    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Language changed" : "Dil değiştirildi",
+    "Invalid request" : "Geçersiz istek",
+    "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.",
+    "Wrong password" : "Hatalı parola",
+    "No user supplied" : "Kullanıcı girilmedi",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+    "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",
+    "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 email. Please revise your settings." : "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
+    "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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
+    "Add trusted domain" : "Güvenilir alan adı ekle",
+    "Sending..." : "Gönderiliyor...",
+    "All" : "Tümü",
+    "Please wait...." : "Lütfen bekleyin....",
+    "Error while disabling app" : "Uygulama devre dışı bırakılırken hata",
+    "Disable" : "Devre Dışı Bırak",
+    "Enable" : "Etkinleştir",
+    "Error while enabling app" : "Uygulama etkinleştirilirken hata",
+    "Updating...." : "Güncelleniyor....",
+    "Error while updating app" : "Uygulama güncellenirken hata",
+    "Updated" : "Güncellendi",
+    "Uninstalling ...." : "Kaldırılıyor ....",
+    "Error while uninstalling app" : "Uygulama kaldırılırken hata",
+    "Uninstall" : "Kaldır",
+    "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",
+    "Valid until {date}" : "{date} tarihine kadar geçerli",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
+    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
+    "Groups" : "Gruplar",
+    "Unable to delete {objName}" : "{objName} silinemiyor",
+    "Error creating group" : "Grup oluşturulurken hata",
+    "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geri al",
+    "never" : "hiçbir zaman",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "grup ekle",
+    "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+    "Error creating user" : "Kullanıcı oluşturulurken hata",
+    "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
+    "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
+    "__language_name__" : "Türkçe",
+    "SSL root certificates" : "SSL kök sertifikaları",
+    "Encryption" : "Şifreleme",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "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 erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak ü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." : "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
+    "Setup Warning" : "Kurulum Uyarısı",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
+    "Database Performance Info" : "Veritabanı Başarım Bilgisi",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+    "Your PHP version is outdated" : "PHP sürümünüz eski",
+    "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 sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
+    "PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
+    "Locale not working" : "Yerel çalışmıyor",
+    "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
+    "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
+    "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
+    "No problems found" : "Sorun bulunamadı",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+    "Sharing" : "Paylaşım",
+    "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
+    "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
+    "Enforce password protection" : "Parola korumasını zorla",
+    "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
+    "Set default expiration date" : "Öntanımlı son kullanma tarihini ayarla",
+    "Expire after " : "Süre",
+    "days" : "gün sonra dolsun",
+    "Enforce expiration date" : "Son kullanma tarihini zorla",
+    "Allow resharing" : "Yeniden paylaşıma izin ver",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
+    "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
+    "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
+    "Security" : "Güvenlik",
+    "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.",
+    "Send mode" : "Gönderme kipi",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "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ı",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "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",
+    "Less" : "Daha az",
+    "Version" : "Sürüm",
+    "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 topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
+    "More apps" : "Daha fazla Uygulama",
+    "Add your app" : "Uygulamanızı ekleyin",
+    "by" : "oluşturan",
+    "licensed" : "lisanslı",
+    "Documentation:" : "Belgelendirme:",
+    "User Documentation" : "Kullanıcı Belgelendirmesi",
+    "Admin Documentation" : "Yönetici Belgelendirmesi",
+    "Update to %s" : "%s sürümüne güncelle",
+    "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
+    "Uninstall App" : "Uygulamayı Kaldır",
+    "Administrator Documentation" : "Yönetici Belgelendirmesi",
+    "Online Documentation" : "Çevrimiçi Belgelendirme",
+    "Forum" : "Forum",
+    "Bugtracker" : "Hata Takip Sistemi",
+    "Commercial Support" : "Ticari Destek",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
+    "Password" : "Parola",
+    "Your password was changed" : "Parolanız değiştirildi",
+    "Unable to change your password" : "Parolanız değiştirilemiyor",
+    "Current password" : "Mevcut parola",
+    "New password" : "Yeni parola",
+    "Change password" : "Parola değiştir",
+    "Full Name" : "Tam Adı",
+    "Email" : "E-posta",
+    "Your email address" : "E-posta adresiniz",
+    "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.",
+    "Cancel" : "İptal",
+    "Choose as profile image" : "Profil resmi olarak seç",
+    "Language" : "Dil",
+    "Help translate" : "Çevirilere yardım edin",
+    "Common Name" : "Ortak Ad",
+    "Valid until" : "Geçerlilik",
+    "Issued By" : "Veren",
+    "Valid until %s" : "%s tarihine kadar geçerli",
+    "Import Root Certificate" : "Kök Sertifikalarını İçe Aktar",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
+    "Log-in password" : "Oturum açma parolası",
+    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
+    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
+    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
+    "Show storage location" : "Depolama konumunu göster",
+    "Show last log in" : "Son oturum açılma zamanını göster",
+    "Login Name" : "Giriş Adı",
+    "Create" : "Oluştur",
+    "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
+    "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
+    "Add Group" : "Grup Ekle",
+    "Group" : "Grup",
+    "Everyone" : "Herkes",
+    "Admins" : "Yöneticiler",
+    "Default Quota" : "Öntanımlı Kota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
+    "Unlimited" : "Sınırsız",
+    "Other" : "Diğer",
+    "Username" : "Kullanıcı Adı",
+    "Quota" : "Kota",
+    "Storage Location" : "Depolama Konumu",
+    "Last Login" : "Son Giriş",
+    "change full name" : "tam adı değiştir",
+    "set new password" : "yeni parola belirle",
+    "Default" : "Öntanımlı"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
new file mode 100644
index 00000000000..bba74d9e117
--- /dev/null
+++ b/settings/l10n/tr.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Your full name has been changed." : "Tam adınız değiştirildi.",
+    "Unable to change full name" : "Tam adınız değiştirilirken hata",
+    "Group already exists" : "Grup zaten mevcut",
+    "Unable to add group" : "Grup eklenemiyor",
+    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
+    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Couldn't remove app." : "Uygulama kaldırılamadı.",
+    "Email saved" : "E-posta kaydedildi",
+    "Invalid email" : "Geçersiz e-posta",
+    "Unable to delete group" : "Grup silinemiyor",
+    "Unable to delete user" : "Kullanıcı silinemiyor",
+    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Language changed" : "Dil değiştirildi",
+    "Invalid request" : "Geçersiz istek",
+    "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.",
+    "Wrong password" : "Hatalı parola",
+    "No user supplied" : "Kullanıcı girilmedi",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+    "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",
+    "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 email. Please revise your settings." : "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
+    "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.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
+    "Add trusted domain" : "Güvenilir alan adı ekle",
+    "Sending..." : "Gönderiliyor...",
+    "All" : "Tümü",
+    "Please wait...." : "Lütfen bekleyin....",
+    "Error while disabling app" : "Uygulama devre dışı bırakılırken hata",
+    "Disable" : "Devre Dışı Bırak",
+    "Enable" : "Etkinleştir",
+    "Error while enabling app" : "Uygulama etkinleştirilirken hata",
+    "Updating...." : "Güncelleniyor....",
+    "Error while updating app" : "Uygulama güncellenirken hata",
+    "Updated" : "Güncellendi",
+    "Uninstalling ...." : "Kaldırılıyor ....",
+    "Error while uninstalling app" : "Uygulama kaldırılırken hata",
+    "Uninstall" : "Kaldır",
+    "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",
+    "Valid until {date}" : "{date} tarihine kadar geçerli",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
+    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
+    "Groups" : "Gruplar",
+    "Unable to delete {objName}" : "{objName} silinemiyor",
+    "Error creating group" : "Grup oluşturulurken hata",
+    "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geri al",
+    "never" : "hiçbir zaman",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "grup ekle",
+    "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+    "Error creating user" : "Kullanıcı oluşturulurken hata",
+    "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
+    "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
+    "__language_name__" : "Türkçe",
+    "SSL root certificates" : "SSL kök sertifikaları",
+    "Encryption" : "Şifreleme",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "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 erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak ü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." : "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
+    "Setup Warning" : "Kurulum Uyarısı",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
+    "Database Performance Info" : "Veritabanı Başarım Bilgisi",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+    "Your PHP version is outdated" : "PHP sürümünüz eski",
+    "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 sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
+    "PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
+    "Locale not working" : "Yerel çalışmıyor",
+    "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
+    "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
+    "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
+    "No problems found" : "Sorun bulunamadı",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+    "Sharing" : "Paylaşım",
+    "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
+    "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
+    "Enforce password protection" : "Parola korumasını zorla",
+    "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
+    "Set default expiration date" : "Öntanımlı son kullanma tarihini ayarla",
+    "Expire after " : "Süre",
+    "days" : "gün sonra dolsun",
+    "Enforce expiration date" : "Son kullanma tarihini zorla",
+    "Allow resharing" : "Yeniden paylaşıma izin ver",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
+    "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
+    "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
+    "Security" : "Güvenlik",
+    "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.",
+    "Send mode" : "Gönderme kipi",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "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ı",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "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",
+    "Less" : "Daha az",
+    "Version" : "Sürüm",
+    "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 topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
+    "More apps" : "Daha fazla Uygulama",
+    "Add your app" : "Uygulamanızı ekleyin",
+    "by" : "oluşturan",
+    "licensed" : "lisanslı",
+    "Documentation:" : "Belgelendirme:",
+    "User Documentation" : "Kullanıcı Belgelendirmesi",
+    "Admin Documentation" : "Yönetici Belgelendirmesi",
+    "Update to %s" : "%s sürümüne güncelle",
+    "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
+    "Uninstall App" : "Uygulamayı Kaldır",
+    "Administrator Documentation" : "Yönetici Belgelendirmesi",
+    "Online Documentation" : "Çevrimiçi Belgelendirme",
+    "Forum" : "Forum",
+    "Bugtracker" : "Hata Takip Sistemi",
+    "Commercial Support" : "Ticari Destek",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
+    "Password" : "Parola",
+    "Your password was changed" : "Parolanız değiştirildi",
+    "Unable to change your password" : "Parolanız değiştirilemiyor",
+    "Current password" : "Mevcut parola",
+    "New password" : "Yeni parola",
+    "Change password" : "Parola değiştir",
+    "Full Name" : "Tam Adı",
+    "Email" : "E-posta",
+    "Your email address" : "E-posta adresiniz",
+    "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.",
+    "Cancel" : "İptal",
+    "Choose as profile image" : "Profil resmi olarak seç",
+    "Language" : "Dil",
+    "Help translate" : "Çevirilere yardım edin",
+    "Common Name" : "Ortak Ad",
+    "Valid until" : "Geçerlilik",
+    "Issued By" : "Veren",
+    "Valid until %s" : "%s tarihine kadar geçerli",
+    "Import Root Certificate" : "Kök Sertifikalarını İçe Aktar",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
+    "Log-in password" : "Oturum açma parolası",
+    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
+    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
+    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
+    "Show storage location" : "Depolama konumunu göster",
+    "Show last log in" : "Son oturum açılma zamanını göster",
+    "Login Name" : "Giriş Adı",
+    "Create" : "Oluştur",
+    "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
+    "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
+    "Add Group" : "Grup Ekle",
+    "Group" : "Grup",
+    "Everyone" : "Herkes",
+    "Admins" : "Yöneticiler",
+    "Default Quota" : "Öntanımlı Kota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
+    "Unlimited" : "Sınırsız",
+    "Other" : "Diğer",
+    "Username" : "Kullanıcı Adı",
+    "Quota" : "Kota",
+    "Storage Location" : "Depolama Konumu",
+    "Last Login" : "Son Giriş",
+    "change full name" : "tam adı değiştir",
+    "set new password" : "yeni parola belirle",
+    "Default" : "Öntanımlı"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
deleted file mode 100644
index 23a0f1dcdd4..00000000000
--- a/settings/l10n/tr.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Etkin",
-"Not enabled" => "Etkin değil",
-"Recommended" => "Önerilen",
-"Authentication error" => "Kimlik doğrulama hatası",
-"Your full name has been changed." => "Tam adınız değiştirildi.",
-"Unable to change full name" => "Tam adınız değiştirilirken hata",
-"Group already exists" => "Grup zaten mevcut",
-"Unable to add group" => "Grup eklenemiyor",
-"Files decrypted successfully" => "Dosyaların şifrelemesi başarıyla kaldırıldı",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
-"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
-"Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
-"Couldn't remove app." => "Uygulama kaldırılamadı.",
-"Email saved" => "E-posta kaydedildi",
-"Invalid email" => "Geçersiz e-posta",
-"Unable to delete group" => "Grup silinemiyor",
-"Unable to delete user" => "Kullanıcı silinemiyor",
-"Backups restored successfully" => "Yedekler başarıyla geri yüklendi",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
-"Language changed" => "Dil değiştirildi",
-"Invalid request" => "Geçersiz istek",
-"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.",
-"Wrong password" => "Hatalı parola",
-"No user supplied" => "Kullanıcı girilmedi",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
-"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",
-"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 email. Please revise your settings." => "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
-"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.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
-"Add trusted domain" => "Güvenilir alan adı ekle",
-"Sending..." => "Gönderiliyor...",
-"All" => "Tümü",
-"Please wait...." => "Lütfen bekleyin....",
-"Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
-"Disable" => "Devre Dışı Bırak",
-"Enable" => "Etkinleştir",
-"Error while enabling app" => "Uygulama etkinleştirilirken hata",
-"Updating...." => "Güncelleniyor....",
-"Error while updating app" => "Uygulama güncellenirken hata",
-"Updated" => "Güncellendi",
-"Uninstalling ...." => "Kaldırılıyor ....",
-"Error while uninstalling app" => "Uygulama kaldırılırken hata",
-"Uninstall" => "Kaldır",
-"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",
-"Valid until {date}" => "{date} tarihine kadar geçerli",
-"Delete" => "Sil",
-"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
-"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
-"Groups" => "Gruplar",
-"Unable to delete {objName}" => "{objName} silinemiyor",
-"Error creating group" => "Grup oluşturulurken hata",
-"A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
-"deleted {groupName}" => "{groupName} silindi",
-"undo" => "geri al",
-"no group" => "grup yok",
-"never" => "hiçbir zaman",
-"deleted {userName}" => "{userName} silindi",
-"add group" => "grup ekle",
-"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
-"Error creating user" => "Kullanıcı oluşturulurken hata",
-"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
-"Warning: Home directory for user \"{user}\" already exists" => "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
-"__language_name__" => "Türkçe",
-"Personal Info" => "Kişisel Bilgi",
-"SSL root certificates" => "SSL kök sertifikaları",
-"Encryption" => "Şifreleme",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
-"Info, warnings, errors and fatal issues" => "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
-"Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ciddi sorunlar",
-"Errors and fatal issues" => "Hatalar ve ciddi sorunlar",
-"Fatal issues only" => "Sadece ciddi sorunlar",
-"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 erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak ü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." => "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
-"Setup Warning" => "Kurulum Uyarısı",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
-"Database Performance Info" => "Veritabanı Başarım Bilgisi",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
-"Your PHP version is outdated" => "PHP sürümünüz eski",
-"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 sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
-"PHP charset is not set to UTF-8" => "PHP karakter kümesi UTF-8 olarak ayarlı değil",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
-"Locale not working" => "Yerel çalışmıyor",
-"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
-"This means that there might be problems with certain characters in file names." => "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
-"URL generation in notification emails" => "Bildirim e-postalarında URL oluşturulması",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
-"Connectivity checks" => "Bağlanabilirlik kontrolleri",
-"No problems found" => "Sorun bulunamadı",
-"Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Son cron %s zamanında çalıştırıldı.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
-"Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
-"Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-"Sharing" => "Paylaşım",
-"Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
-"Allow users to share via link" => "Kullanıcıların bağlantı ile paylaşmasına izin ver",
-"Enforce password protection" => "Parola korumasını zorla",
-"Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
-"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
-"Expire after " => "Süre",
-"days" => "gün sonra dolsun",
-"Enforce expiration date" => "Son kullanma tarihini zorla",
-"Allow resharing" => "Yeniden paylaşıma izin ver",
-"Restrict users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
-"Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
-"Exclude groups from sharing" => "Grupları paylaşma eyleminden hariç tut",
-"These groups will still be able to receive shares, but not to initiate them." => "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
-"Security" => "Güvenlik",
-"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.",
-"Send mode" => "Gönderme kipi",
-"From address" => "Kimden adresi",
-"mail" => "posta",
-"Authentication method" => "Kimlik doğrulama yöntemi",
-"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ı",
-"Store credentials" => "Kimlik bilgilerini depola",
-"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",
-"Less" => "Daha az",
-"Version" => "Sürüm",
-"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 topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
-"More apps" => "Daha fazla Uygulama",
-"Add your app" => "Uygulamanızı ekleyin",
-"by" => "oluşturan",
-"licensed" => "lisanslı",
-"Documentation:" => "Belgelendirme:",
-"User Documentation" => "Kullanıcı Belgelendirmesi",
-"Admin Documentation" => "Yönetici Belgelendirmesi",
-"Update to %s" => "%s sürümüne güncelle",
-"Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
-"Uninstall App" => "Uygulamayı Kaldır",
-"Administrator Documentation" => "Yönetici Belgelendirmesi",
-"Online Documentation" => "Çevrimiçi Belgelendirme",
-"Forum" => "Forum",
-"Bugtracker" => "Hata Takip Sistemi",
-"Commercial Support" => "Ticari Destek",
-"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
-"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazı'nı yeniden göster",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
-"Password" => "Parola",
-"Your password was changed" => "Parolanız değiştirildi",
-"Unable to change your password" => "Parolanız değiştirilemiyor",
-"Current password" => "Mevcut parola",
-"New password" => "Yeni parola",
-"Change password" => "Parola değiştir",
-"Full Name" => "Tam Adı",
-"Email" => "E-posta",
-"Your email address" => "E-posta adresiniz",
-"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.",
-"Cancel" => "İptal",
-"Choose as profile image" => "Profil resmi olarak seç",
-"Language" => "Dil",
-"Help translate" => "Çevirilere yardım edin",
-"Common Name" => "Ortak Ad",
-"Valid until" => "Geçerlilik",
-"Issued By" => "Veren",
-"Valid until %s" => "%s tarihine kadar geçerli",
-"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar",
-"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
-"Log-in password" => "Oturum açma parolası",
-"Decrypt all Files" => "Tüm Dosyaların Şifrelemesini Kaldır",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
-"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
-"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
-"Show storage location" => "Depolama konumunu göster",
-"Show last log in" => "Son oturum açılma zamanını göster",
-"Login Name" => "Giriş Adı",
-"Create" => "Oluştur",
-"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
-"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-"Search Users and Groups" => "Kullanıcı ve Grupları Ara",
-"Add Group" => "Grup Ekle",
-"Group" => "Grup",
-"Everyone" => "Herkes",
-"Admins" => "Yöneticiler",
-"Default Quota" => "Öntanımlı Kota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
-"Unlimited" => "Sınırsız",
-"Other" => "Diğer",
-"Username" => "Kullanıcı Adı",
-"Group Admin for" => "Grup Yöneticisi",
-"Quota" => "Kota",
-"Storage Location" => "Depolama Konumu",
-"Last Login" => "Son Giriş",
-"change full name" => "tam adı değiştir",
-"set new password" => "yeni parola belirle",
-"Default" => "Öntanımlı"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ug.js b/settings/l10n/ug.js
new file mode 100644
index 00000000000..76ee878feea
--- /dev/null
+++ b/settings/l10n/ug.js
@@ -0,0 +1,72 @@
+OC.L10N.register(
+    "settings",
+    {
+    "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." : "ئەپنى يېڭىلىيالمايدۇ.",
+    "All" : "ھەممىسى",
+    "Please wait...." : "سەل كۈتۈڭ…",
+    "Disable" : "چەكلە",
+    "Enable" : "قوزغات",
+    "Updating...." : "يېڭىلاۋاتىدۇ…",
+    "Error while updating app" : "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
+    "Updated" : "يېڭىلاندى",
+    "Delete" : "ئۆچۈر",
+    "Groups" : "گۇرۇپپا",
+    "undo" : "يېنىۋال",
+    "never" : "ھەرگىز",
+    "add group" : "گۇرۇپپا قوش",
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+    "__language_name__" : "ئۇيغۇرچە",
+    "Encryption" : "شىفىرلاش",
+    "None" : "يوق",
+    "Login" : "تىزىمغا كىرىڭ",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
+    "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Server address" : "مۇلازىمېتىر ئادرىسى",
+    "Port" : "ئېغىز",
+    "Log" : "خاتىرە",
+    "Log level" : "خاتىرە دەرىجىسى",
+    "More" : "تېخىمۇ كۆپ",
+    "Less" : "ئاز",
+    "Version" : "نەشرى",
+    "by" : "سەنئەتكار",
+    "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
+    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
+    "Online Documentation" : "توردىكى قوللانما",
+    "Forum" : "مۇنبەر",
+    "Password" : "ئىم",
+    "Your password was changed" : "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
+    "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
+    "Current password" : "نۆۋەتتىكى ئىم",
+    "New password" : "يېڭى ئىم",
+    "Change password" : "ئىم ئۆزگەرت",
+    "Email" : "تورخەت",
+    "Your email address" : "تورخەت ئادرېسىڭىز",
+    "Cancel" : "ۋاز كەچ",
+    "Language" : "تىل",
+    "Help translate" : "تەرجىمىگە ياردەم",
+    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Create" : "قۇر",
+    "Unlimited" : "چەكسىز",
+    "Other" : "باشقا",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "set new password" : "يېڭى ئىم تەڭشە",
+    "Default" : "كۆڭۈلدىكى"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ug.json b/settings/l10n/ug.json
new file mode 100644
index 00000000000..babcddc048e
--- /dev/null
+++ b/settings/l10n/ug.json
@@ -0,0 +1,70 @@
+{ "translations": {
+    "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." : "ئەپنى يېڭىلىيالمايدۇ.",
+    "All" : "ھەممىسى",
+    "Please wait...." : "سەل كۈتۈڭ…",
+    "Disable" : "چەكلە",
+    "Enable" : "قوزغات",
+    "Updating...." : "يېڭىلاۋاتىدۇ…",
+    "Error while updating app" : "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
+    "Updated" : "يېڭىلاندى",
+    "Delete" : "ئۆچۈر",
+    "Groups" : "گۇرۇپپا",
+    "undo" : "يېنىۋال",
+    "never" : "ھەرگىز",
+    "add group" : "گۇرۇپپا قوش",
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+    "__language_name__" : "ئۇيغۇرچە",
+    "Encryption" : "شىفىرلاش",
+    "None" : "يوق",
+    "Login" : "تىزىمغا كىرىڭ",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
+    "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Server address" : "مۇلازىمېتىر ئادرىسى",
+    "Port" : "ئېغىز",
+    "Log" : "خاتىرە",
+    "Log level" : "خاتىرە دەرىجىسى",
+    "More" : "تېخىمۇ كۆپ",
+    "Less" : "ئاز",
+    "Version" : "نەشرى",
+    "by" : "سەنئەتكار",
+    "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
+    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
+    "Online Documentation" : "توردىكى قوللانما",
+    "Forum" : "مۇنبەر",
+    "Password" : "ئىم",
+    "Your password was changed" : "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
+    "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
+    "Current password" : "نۆۋەتتىكى ئىم",
+    "New password" : "يېڭى ئىم",
+    "Change password" : "ئىم ئۆزگەرت",
+    "Email" : "تورخەت",
+    "Your email address" : "تورخەت ئادرېسىڭىز",
+    "Cancel" : "ۋاز كەچ",
+    "Language" : "تىل",
+    "Help translate" : "تەرجىمىگە ياردەم",
+    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Create" : "قۇر",
+    "Unlimited" : "چەكسىز",
+    "Other" : "باشقا",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "set new password" : "يېڭى ئىم تەڭشە",
+    "Default" : "كۆڭۈلدىكى"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
deleted file mode 100644
index 0bd29895d96..00000000000
--- a/settings/l10n/ug.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "ئەپنى يېڭىلىيالمايدۇ.",
-"All" => "ھەممىسى",
-"Please wait...." => "سەل كۈتۈڭ…",
-"Disable" => "چەكلە",
-"Enable" => "قوزغات",
-"Updating...." => "يېڭىلاۋاتىدۇ…",
-"Error while updating app" => "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
-"Updated" => "يېڭىلاندى",
-"Delete" => "ئۆچۈر",
-"Groups" => "گۇرۇپپا",
-"undo" => "يېنىۋال",
-"never" => "ھەرگىز",
-"add group" => "گۇرۇپپا قوش",
-"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
-"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
-"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
-"__language_name__" => "ئۇيغۇرچە",
-"Encryption" => "شىفىرلاش",
-"None" => "يوق",
-"Login" => "تىزىمغا كىرىڭ",
-"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
-"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
-"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
-"Sharing" => "ھەمبەھىر",
-"Security" => "بىخەتەرلىك",
-"Server address" => "مۇلازىمېتىر ئادرىسى",
-"Port" => "ئېغىز",
-"Log" => "خاتىرە",
-"Log level" => "خاتىرە دەرىجىسى",
-"More" => "تېخىمۇ كۆپ",
-"Less" => "ئاز",
-"Version" => "نەشرى",
-"by" => "سەنئەتكار",
-"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
-"Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
-"Online Documentation" => "توردىكى قوللانما",
-"Forum" => "مۇنبەر",
-"Password" => "ئىم",
-"Your password was changed" => "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
-"Unable to change your password" => "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
-"Current password" => "نۆۋەتتىكى ئىم",
-"New password" => "يېڭى ئىم",
-"Change password" => "ئىم ئۆزگەرت",
-"Email" => "تورخەت",
-"Your email address" => "تورخەت ئادرېسىڭىز",
-"Cancel" => "ۋاز كەچ",
-"Language" => "تىل",
-"Help translate" => "تەرجىمىگە ياردەم",
-"Login Name" => "تىزىمغا كىرىش ئاتى",
-"Create" => "قۇر",
-"Unlimited" => "چەكسىز",
-"Other" => "باشقا",
-"Username" => "ئىشلەتكۈچى ئاتى",
-"set new password" => "يېڭى ئىم تەڭشە",
-"Default" => "كۆڭۈلدىكى"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
new file mode 100644
index 00000000000..fc1798dbbeb
--- /dev/null
+++ b/settings/l10n/uk.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
+    "Authentication error" : "Помилка автентифікації",
+    "Your full name has been changed." : "Ваше ім'я було змінене",
+    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Group already exists" : "Група вже існує",
+    "Unable to add group" : "Не вдалося додати групу",
+    "Files decrypted successfully" : "Файли розшифровані успішно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
+    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't remove app." : "Неможливо видалити додаток.",
+    "Email saved" : "Адресу збережено",
+    "Invalid email" : "Невірна адреса",
+    "Unable to delete group" : "Не вдалося видалити групу",
+    "Unable to delete user" : "Не вдалося видалити користувача",
+    "Backups restored successfully" : "Резервна копія успішно відновлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "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" : "Неможливо змінити пароль",
+    "Saved" : "Збереженно",
+    "test email settings" : "перевірити налаштування електронної пошти",
+    "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
+    "A problem occurred while sending the email. Please revise your settings." : "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
+    "Email sent" : "Ел. пошта надіслана",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
+    "Add trusted domain" : "Додати довірений домен",
+    "Sending..." : "Надсилання...",
+    "All" : "Всі",
+    "Please wait...." : "Зачекайте, будь ласка...",
+    "Error while disabling app" : "Помилка відключення додатка",
+    "Disable" : "Вимкнути",
+    "Enable" : "Включити",
+    "Error while enabling app" : "Помилка підключення додатка",
+    "Updating...." : "Оновлюється...",
+    "Error while updating app" : "Помилка при оновленні програми",
+    "Updated" : "Оновлено",
+    "Uninstalling ...." : "Видалення...",
+    "Error while uninstalling app" : "Помилка видалення додатка",
+    "Uninstall" : "Видалити",
+    "Select a profile picture" : "Обрати зображення облікового запису",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Valid until {date}" : "Дійсно до {date}",
+    "Delete" : "Видалити",
+    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
+    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
+    "Restore encryption keys." : "Відновити ключі шифрування.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Не вдалося видалити {objName}",
+    "Error creating group" : "Помилка створення групи",
+    "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
+    "deleted {groupName}" : "видалено {groupName}",
+    "undo" : "відмінити",
+    "never" : "ніколи",
+    "deleted {userName}" : "видалено {userName}",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL корневі сертифікати",
+    "Encryption" : "Шифрування",
+    "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." : "Ви звертаєтесь до %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, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+    "Setup Warning" : "Попередження при Налаштуванні",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.",
+    "Database Performance Info" : "Інформація продуктивності баз даних",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
+    "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 або новішої, оскільки старі версії працюють не правильно.  ",
+    "PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-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.",
+    "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity checks" : "Перевірка з'єднання",
+    "No problems found" : "Проблем не виявленно",
+    "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Останню cron-задачу було запущено: %s. Минуло вже більше години, здається щось не так.",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
+    "Sharing" : "Спільний доступ",
+    "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
+    "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
+    "Enforce password protection" : "Захист паролем обов'язковий",
+    "Allow public uploads" : "Дозволити публічне завантаження",
+    "Set default expiration date" : "Встановити термін дії за замовчуванням",
+    "Expire after " : "Скінчиться через",
+    "days" : "днів",
+    "Enforce expiration date" : "Термін дії обов'язково",
+    "Allow resharing" : "Дозволити перевідкривати спільний доступ",
+    "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+    "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
+    "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
+    "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.",
+    "Email Server" : "Сервер електронної пошти",
+    "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
+    "Send mode" : "Надіслати повідомлення",
+    "From address" : "Адреса відправника",
+    "mail" : "пошта",
+    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication required" : "Потрібна аутентифікація",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Credentials" : "Облікові дані",
+    "SMTP Username" : "Ім'я користувача SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Зберігання облікових даних",
+    "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>.",
+    "More apps" : "Більше додатків",
+    "Add your app" : "Додати свій додаток",
+    "by" : "по",
+    "licensed" : "Ліцензовано",
+    "Documentation:" : "Документація:",
+    "User Documentation" : "Документація Користувача",
+    "Admin Documentation" : "Документація Адміністратора",
+    "Update to %s" : "Оновити до %s",
+    "Enable only for specific groups" : "Включити тільки для конкретних груп",
+    "Uninstall App" : "Видалити додаток",
+    "Administrator Documentation" : "Документація Адміністратора",
+    "Online Documentation" : "Он-Лайн Документація",
+    "Forum" : "Форум",
+    "Bugtracker" : "БагТрекер",
+    "Commercial Support" : "Комерційна підтримка",
+    "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
+    "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" : "Поточний пароль",
+    "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" : "Допомогти з перекладом",
+    "Common Name" : "Ім'я:",
+    "Valid until" : "Дійсно до",
+    "Issued By" : "Виданий",
+    "Valid until %s" : "Дійсно до %s",
+    "Import Root Certificate" : "Імпортувати корневі сертифікати",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
+    "Log-in password" : "Пароль входу",
+    "Decrypt all Files" : "Розшифрувати всі файли",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
+    "Restore Encryption Keys" : "Відновити ключі шифрування",
+    "Delete Encryption Keys" : "Видалити ключі шифрування",
+    "Show storage location" : "Показати місцезнаходження сховища",
+    "Show last log in" : "Показати останній вхід в систему",
+    "Login Name" : "Ім'я Логіну",
+    "Create" : "Створити",
+    "Admin Recovery Password" : "Пароль адміністратора для відновлення",
+    "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users and Groups" : "Шукати користувачів та групи",
+    "Add Group" : "Додати групу",
+    "Group" : "Група",
+    "Everyone" : "Всі",
+    "Admins" : "Адміністратори",
+    "Default Quota" : "Квота за замовчуванням",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
+    "Unlimited" : "Необмежено",
+    "Other" : "Інше",
+    "Username" : "Ім'я користувача",
+    "Quota" : "Квота",
+    "Storage Location" : "Місцезнаходження сховища",
+    "Last Login" : "Останній вхід",
+    "change full name" : "змінити ім'я",
+    "set new password" : "встановити новий пароль",
+    "Default" : "За замовчуванням"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
new file mode 100644
index 00000000000..3a5088ef069
--- /dev/null
+++ b/settings/l10n/uk.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
+    "Authentication error" : "Помилка автентифікації",
+    "Your full name has been changed." : "Ваше ім'я було змінене",
+    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Group already exists" : "Група вже існує",
+    "Unable to add group" : "Не вдалося додати групу",
+    "Files decrypted successfully" : "Файли розшифровані успішно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
+    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't remove app." : "Неможливо видалити додаток.",
+    "Email saved" : "Адресу збережено",
+    "Invalid email" : "Невірна адреса",
+    "Unable to delete group" : "Не вдалося видалити групу",
+    "Unable to delete user" : "Не вдалося видалити користувача",
+    "Backups restored successfully" : "Резервна копія успішно відновлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "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" : "Неможливо змінити пароль",
+    "Saved" : "Збереженно",
+    "test email settings" : "перевірити налаштування електронної пошти",
+    "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
+    "A problem occurred while sending the email. Please revise your settings." : "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
+    "Email sent" : "Ел. пошта надіслана",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
+    "Add trusted domain" : "Додати довірений домен",
+    "Sending..." : "Надсилання...",
+    "All" : "Всі",
+    "Please wait...." : "Зачекайте, будь ласка...",
+    "Error while disabling app" : "Помилка відключення додатка",
+    "Disable" : "Вимкнути",
+    "Enable" : "Включити",
+    "Error while enabling app" : "Помилка підключення додатка",
+    "Updating...." : "Оновлюється...",
+    "Error while updating app" : "Помилка при оновленні програми",
+    "Updated" : "Оновлено",
+    "Uninstalling ...." : "Видалення...",
+    "Error while uninstalling app" : "Помилка видалення додатка",
+    "Uninstall" : "Видалити",
+    "Select a profile picture" : "Обрати зображення облікового запису",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Valid until {date}" : "Дійсно до {date}",
+    "Delete" : "Видалити",
+    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
+    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
+    "Restore encryption keys." : "Відновити ключі шифрування.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Не вдалося видалити {objName}",
+    "Error creating group" : "Помилка створення групи",
+    "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
+    "deleted {groupName}" : "видалено {groupName}",
+    "undo" : "відмінити",
+    "never" : "ніколи",
+    "deleted {userName}" : "видалено {userName}",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL корневі сертифікати",
+    "Encryption" : "Шифрування",
+    "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." : "Ви звертаєтесь до %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, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+    "Setup Warning" : "Попередження при Налаштуванні",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.",
+    "Database Performance Info" : "Інформація продуктивності баз даних",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
+    "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 або новішої, оскільки старі версії працюють не правильно.  ",
+    "PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-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.",
+    "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity checks" : "Перевірка з'єднання",
+    "No problems found" : "Проблем не виявленно",
+    "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Останню cron-задачу було запущено: %s. Минуло вже більше години, здається щось не так.",
+    "Cron was not executed yet!" : "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 system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
+    "Sharing" : "Спільний доступ",
+    "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
+    "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
+    "Enforce password protection" : "Захист паролем обов'язковий",
+    "Allow public uploads" : "Дозволити публічне завантаження",
+    "Set default expiration date" : "Встановити термін дії за замовчуванням",
+    "Expire after " : "Скінчиться через",
+    "days" : "днів",
+    "Enforce expiration date" : "Термін дії обов'язково",
+    "Allow resharing" : "Дозволити перевідкривати спільний доступ",
+    "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+    "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
+    "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
+    "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.",
+    "Email Server" : "Сервер електронної пошти",
+    "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
+    "Send mode" : "Надіслати повідомлення",
+    "From address" : "Адреса відправника",
+    "mail" : "пошта",
+    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication required" : "Потрібна аутентифікація",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Credentials" : "Облікові дані",
+    "SMTP Username" : "Ім'я користувача SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Зберігання облікових даних",
+    "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>.",
+    "More apps" : "Більше додатків",
+    "Add your app" : "Додати свій додаток",
+    "by" : "по",
+    "licensed" : "Ліцензовано",
+    "Documentation:" : "Документація:",
+    "User Documentation" : "Документація Користувача",
+    "Admin Documentation" : "Документація Адміністратора",
+    "Update to %s" : "Оновити до %s",
+    "Enable only for specific groups" : "Включити тільки для конкретних груп",
+    "Uninstall App" : "Видалити додаток",
+    "Administrator Documentation" : "Документація Адміністратора",
+    "Online Documentation" : "Он-Лайн Документація",
+    "Forum" : "Форум",
+    "Bugtracker" : "БагТрекер",
+    "Commercial Support" : "Комерційна підтримка",
+    "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
+    "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" : "Поточний пароль",
+    "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" : "Допомогти з перекладом",
+    "Common Name" : "Ім'я:",
+    "Valid until" : "Дійсно до",
+    "Issued By" : "Виданий",
+    "Valid until %s" : "Дійсно до %s",
+    "Import Root Certificate" : "Імпортувати корневі сертифікати",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
+    "Log-in password" : "Пароль входу",
+    "Decrypt all Files" : "Розшифрувати всі файли",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
+    "Restore Encryption Keys" : "Відновити ключі шифрування",
+    "Delete Encryption Keys" : "Видалити ключі шифрування",
+    "Show storage location" : "Показати місцезнаходження сховища",
+    "Show last log in" : "Показати останній вхід в систему",
+    "Login Name" : "Ім'я Логіну",
+    "Create" : "Створити",
+    "Admin Recovery Password" : "Пароль адміністратора для відновлення",
+    "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users and Groups" : "Шукати користувачів та групи",
+    "Add Group" : "Додати групу",
+    "Group" : "Група",
+    "Everyone" : "Всі",
+    "Admins" : "Адміністратори",
+    "Default Quota" : "Квота за замовчуванням",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
+    "Unlimited" : "Необмежено",
+    "Other" : "Інше",
+    "Username" : "Ім'я користувача",
+    "Quota" : "Квота",
+    "Storage Location" : "Місцезнаходження сховища",
+    "Last Login" : "Останній вхід",
+    "change full name" : "змінити ім'я",
+    "set new password" : "встановити новий пароль",
+    "Default" : "За замовчуванням"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
deleted file mode 100644
index 39cb54a4f1a..00000000000
--- a/settings/l10n/uk.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Увімкнено",
-"Not enabled" => "Вимкнено",
-"Recommended" => "Рекомендуємо",
-"Authentication error" => "Помилка автентифікації",
-"Your full name has been changed." => "Ваше ім'я було змінене",
-"Unable to change full name" => "Неможливо змінити ім'я",
-"Group already exists" => "Група вже існує",
-"Unable to add group" => "Не вдалося додати групу",
-"Files decrypted successfully" => "Файли розшифровані успішно",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"Couldn't decrypt your files, check your password and try again" => "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
-"Encryption keys deleted permanently" => "Ключі шифрування видалені назавжди",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"Couldn't remove app." => "Неможливо видалити додаток.",
-"Email saved" => "Адресу збережено",
-"Invalid email" => "Невірна адреса",
-"Unable to delete group" => "Не вдалося видалити групу",
-"Unable to delete user" => "Не вдалося видалити користувача",
-"Backups restored successfully" => "Резервна копія успішно відновлена",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"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" => "Неможливо змінити пароль",
-"Saved" => "Збереженно",
-"test email settings" => "перевірити налаштування електронної пошти",
-"If you received this email, the settings seem to be correct." => "Якщо ви отримали цього листа, налаштування вірні.",
-"A problem occurred while sending the email. Please revise your settings." => "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
-"Email sent" => "Ел. пошта надіслана",
-"You need to set your user email before being able to send test emails." => "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
-"Add trusted domain" => "Додати довірений домен",
-"Sending..." => "Надсилання...",
-"All" => "Всі",
-"Please wait...." => "Зачекайте, будь ласка...",
-"Error while disabling app" => "Помилка відключення додатка",
-"Disable" => "Вимкнути",
-"Enable" => "Включити",
-"Error while enabling app" => "Помилка підключення додатка",
-"Updating...." => "Оновлюється...",
-"Error while updating app" => "Помилка при оновленні програми",
-"Updated" => "Оновлено",
-"Uninstalling ...." => "Видалення...",
-"Error while uninstalling app" => "Помилка видалення додатка",
-"Uninstall" => "Видалити",
-"Select a profile picture" => "Обрати зображення облікового запису",
-"Very weak password" => "Дуже слабкий пароль",
-"Weak password" => "Слабкий пароль",
-"So-so password" => "Такий собі пароль",
-"Good password" => "Добрий пароль",
-"Strong password" => "Надійний пароль",
-"Valid until {date}" => "Дійсно до {date}",
-"Delete" => "Видалити",
-"Decrypting files... Please wait, this can take some time." => "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
-"Delete encryption keys permanently." => "Видалити ключі шифрування назавжди.",
-"Restore encryption keys." => "Відновити ключі шифрування.",
-"Groups" => "Групи",
-"Unable to delete {objName}" => "Не вдалося видалити {objName}",
-"Error creating group" => "Помилка створення групи",
-"A valid group name must be provided" => "Потрібно задати вірне ім'я групи",
-"deleted {groupName}" => "видалено {groupName}",
-"undo" => "відмінити",
-"no group" => "без групи",
-"never" => "ніколи",
-"deleted {userName}" => "видалено {userName}",
-"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__" => "__language_name__",
-"Personal Info" => "Особиста інформація",
-"SSL root certificates" => "SSL корневі сертифікати",
-"Encryption" => "Шифрування",
-"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." => "Ви звертаєтесь до %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, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
-"Setup Warning" => "Попередження при Налаштуванні",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.",
-"Database Performance Info" => "Інформація продуктивності баз даних",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
-"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 або новішої, оскільки старі версії працюють не правильно.  ",
-"PHP charset is not set to UTF-8" => "Кодування PHP не співпадає з UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-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.",
-"URL generation in notification emails" => "Генерування URL для повідомлень в електроних листах",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
-"Connectivity checks" => "Перевірка з'єднання",
-"No problems found" => "Проблем не виявленно",
-"Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Останню cron-задачу було запущено: %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Останню cron-задачу було запущено: %s. Минуло вже більше години, здається щось не так.",
-"Cron was not executed yet!" => "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 system's cron service to call the cron.php file every 15 minutes." => "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
-"Sharing" => "Спільний доступ",
-"Allow apps to use the Share API" => "Дозволити програмам використовувати API спільного доступу",
-"Allow users to share via link" => "Дозволити користувачам ділитися через посилання",
-"Enforce password protection" => "Захист паролем обов'язковий",
-"Allow public uploads" => "Дозволити публічне завантаження",
-"Set default expiration date" => "Встановити термін дії за замовчуванням",
-"Expire after " => "Скінчиться через",
-"days" => "днів",
-"Enforce expiration date" => "Термін дії обов'язково",
-"Allow resharing" => "Дозволити перевідкривати спільний доступ",
-"Restrict users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
-"Allow users to send mail notification for shared files" => "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
-"Exclude groups from sharing" => "Виключити групи зі спільного доступу",
-"These groups will still be able to receive shares, but not to initiate them." => "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-"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.",
-"Email Server" => "Сервер електронної пошти",
-"This is used for sending out notifications." => "Використовується для відсилання повідомлень.",
-"Send mode" => "Надіслати повідомлення",
-"From address" => "Адреса відправника",
-"mail" => "пошта",
-"Authentication method" => "Метод перевірки автентифікації",
-"Authentication required" => "Потрібна аутентифікація",
-"Server address" => "Адреса сервера",
-"Port" => "Порт",
-"Credentials" => "Облікові дані",
-"SMTP Username" => "Ім'я користувача SMTP",
-"SMTP Password" => "Пароль SMTP",
-"Store credentials" => "Зберігання облікових даних",
-"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>.",
-"More apps" => "Більше додатків",
-"Add your app" => "Додати свій додаток",
-"by" => "по",
-"licensed" => "Ліцензовано",
-"Documentation:" => "Документація:",
-"User Documentation" => "Документація Користувача",
-"Admin Documentation" => "Документація Адміністратора",
-"Update to %s" => "Оновити до %s",
-"Enable only for specific groups" => "Включити тільки для конкретних груп",
-"Uninstall App" => "Видалити додаток",
-"Administrator Documentation" => "Документація Адміністратора",
-"Online Documentation" => "Он-Лайн Документація",
-"Forum" => "Форум",
-"Bugtracker" => "БагТрекер",
-"Commercial Support" => "Комерційна підтримка",
-"Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
-"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" => "Поточний пароль",
-"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" => "Допомогти з перекладом",
-"Common Name" => "Ім'я:",
-"Valid until" => "Дійсно до",
-"Issued By" => "Виданий",
-"Valid until %s" => "Дійсно до %s",
-"Import Root Certificate" => "Імпортувати корневі сертифікати",
-"The encryption app is no longer enabled, please decrypt all your files" => "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
-"Log-in password" => "Пароль входу",
-"Decrypt all Files" => "Розшифрувати всі файли",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
-"Restore Encryption Keys" => "Відновити ключі шифрування",
-"Delete Encryption Keys" => "Видалити ключі шифрування",
-"Show storage location" => "Показати місцезнаходження сховища",
-"Show last log in" => "Показати останній вхід в систему",
-"Login Name" => "Ім'я Логіну",
-"Create" => "Створити",
-"Admin Recovery Password" => "Пароль адміністратора для відновлення",
-"Enter the recovery password in order to recover the users files during password change" => "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-"Search Users and Groups" => "Шукати користувачів та групи",
-"Add Group" => "Додати групу",
-"Group" => "Група",
-"Everyone" => "Всі",
-"Admins" => "Адміністратори",
-"Default Quota" => "Квота за замовчуванням",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
-"Unlimited" => "Необмежено",
-"Other" => "Інше",
-"Username" => "Ім'я користувача",
-"Group Admin for" => "Адміністратор групи",
-"Quota" => "Квота",
-"Storage Location" => "Місцезнаходження сховища",
-"Last Login" => "Останній вхід",
-"change full name" => "змінити ім'я",
-"set new password" => "встановити новий пароль",
-"Default" => "За замовчуванням"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/ur.php b/settings/l10n/ur.php
deleted file mode 100644
index 1b41db1d679..00000000000
--- a/settings/l10n/ur.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "خرابی"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ur_PK.js b/settings/l10n/ur_PK.js
new file mode 100644
index 00000000000..f9a042bc94f
--- /dev/null
+++ b/settings/l10n/ur_PK.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "غلط درخواست",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Delete" : "حذف کریں",
+    "Security Warning" : "حفاظتی انتباہ",
+    "More" : "مزید",
+    "Less" : "کم",
+    "Password" : "پاسورڈ",
+    "New password" : "نیا پاسورڈ",
+    "Cancel" : "منسوخ کریں",
+    "Other" : "دیگر",
+    "Username" : "یوزر نیم"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur_PK.json b/settings/l10n/ur_PK.json
new file mode 100644
index 00000000000..99a7bda9ad7
--- /dev/null
+++ b/settings/l10n/ur_PK.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Invalid request" : "غلط درخواست",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Delete" : "حذف کریں",
+    "Security Warning" : "حفاظتی انتباہ",
+    "More" : "مزید",
+    "Less" : "کم",
+    "Password" : "پاسورڈ",
+    "New password" : "نیا پاسورڈ",
+    "Cancel" : "منسوخ کریں",
+    "Other" : "دیگر",
+    "Username" : "یوزر نیم"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
deleted file mode 100644
index 17e7d843f3f..00000000000
--- a/settings/l10n/ur_PK.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "غلط درخواست",
-"Email sent" => "ارسال شدہ ای میل ",
-"Very weak password" => "بہت کمزور پاسورڈ",
-"Weak password" => "کمزور پاسورڈ",
-"So-so password" => "نص نص پاسورڈ",
-"Good password" => "اچھا پاسورڈ",
-"Strong password" => "مضبوط پاسورڈ",
-"Delete" => "حذف کریں",
-"Security Warning" => "حفاظتی انتباہ",
-"More" => "مزید",
-"Less" => "کم",
-"Password" => "پاسورڈ",
-"New password" => "نیا پاسورڈ",
-"Cancel" => "منسوخ کریں",
-"Other" => "دیگر",
-"Username" => "یوزر نیم"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
new file mode 100644
index 00000000000..cebe573d07c
--- /dev/null
+++ b/settings/l10n/vi.js
@@ -0,0 +1,90 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Bật",
+    "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",
+    "Invalid email" : "Email không hợp lệ",
+    "Unable to delete group" : "Không thể xóa nhóm",
+    "Unable to delete user" : "Không thể xóa người dùng",
+    "Language changed" : "Ngôn ngữ đã được thay đổi",
+    "Invalid request" : "Yêu cầu không hợp lệ",
+    "Admins can't remove themself from the admin group" : "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
+    "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",
+    "Email sent" : "Email đã được gửi",
+    "All" : "Tất cả",
+    "Please wait...." : "Xin hãy đợi...",
+    "Disable" : "Tắt",
+    "Enable" : "Bật",
+    "Updating...." : "Đang cập nhật...",
+    "Error while updating app" : "Lỗi khi cập nhật ứng dụng",
+    "Updated" : "Đã cập nhật",
+    "Delete" : "Xóa",
+    "Groups" : "Nhóm",
+    "undo" : "lùi lại",
+    "never" : "không thay đổi",
+    "__language_name__" : "__Ngôn ngữ___",
+    "SSL root certificates" : "Chứng chỉ SSL root",
+    "Encryption" : "Mã hóa",
+    "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ẻ",
+    "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
+    "Allow resharing" : "Cho phép chia sẻ lại",
+    "Server address" : "Địa chỉ máy chủ",
+    "Port" : "Cổng",
+    "Credentials" : "Giấy chứng nhận",
+    "Log" : "Log",
+    "More" : "hơn",
+    "Less" : "ít",
+    "Version" : "Phiên bản",
+    "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>." : "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "bởi",
+    "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",
+    "Bugtracker" : "Hệ ghi nhận lỗi",
+    "Commercial Support" : "Hỗ trợ có phí",
+    "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
+    "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
+    "Password" : "Mật khẩu",
+    "Your password was changed" : "Mật khẩu của bạn đã được thay đổi.",
+    "Unable to change your password" : "Không thể đổi mật khẩu",
+    "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",
+    "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",
+    "Import Root Certificate" : "Nhập Root Certificate",
+    "Login Name" : "Tên đăng nhập",
+    "Create" : "Tạo",
+    "Group" : "N",
+    "Default Quota" : "Hạn ngạch mặt định",
+    "Unlimited" : "Không giới hạn",
+    "Other" : "Khác",
+    "Username" : "Tên đăng nhập",
+    "Quota" : "Hạn ngạch",
+    "change full name" : "Đổi họ và t",
+    "set new password" : "đặt mật khẩu mới",
+    "Default" : "Mặc định"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
new file mode 100644
index 00000000000..2a1cbecc235
--- /dev/null
+++ b/settings/l10n/vi.json
@@ -0,0 +1,88 @@
+{ "translations": {
+    "Enabled" : "Bật",
+    "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",
+    "Invalid email" : "Email không hợp lệ",
+    "Unable to delete group" : "Không thể xóa nhóm",
+    "Unable to delete user" : "Không thể xóa người dùng",
+    "Language changed" : "Ngôn ngữ đã được thay đổi",
+    "Invalid request" : "Yêu cầu không hợp lệ",
+    "Admins can't remove themself from the admin group" : "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
+    "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",
+    "Email sent" : "Email đã được gửi",
+    "All" : "Tất cả",
+    "Please wait...." : "Xin hãy đợi...",
+    "Disable" : "Tắt",
+    "Enable" : "Bật",
+    "Updating...." : "Đang cập nhật...",
+    "Error while updating app" : "Lỗi khi cập nhật ứng dụng",
+    "Updated" : "Đã cập nhật",
+    "Delete" : "Xóa",
+    "Groups" : "Nhóm",
+    "undo" : "lùi lại",
+    "never" : "không thay đổi",
+    "__language_name__" : "__Ngôn ngữ___",
+    "SSL root certificates" : "Chứng chỉ SSL root",
+    "Encryption" : "Mã hóa",
+    "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ẻ",
+    "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
+    "Allow resharing" : "Cho phép chia sẻ lại",
+    "Server address" : "Địa chỉ máy chủ",
+    "Port" : "Cổng",
+    "Credentials" : "Giấy chứng nhận",
+    "Log" : "Log",
+    "More" : "hơn",
+    "Less" : "ít",
+    "Version" : "Phiên bản",
+    "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>." : "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "bởi",
+    "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",
+    "Bugtracker" : "Hệ ghi nhận lỗi",
+    "Commercial Support" : "Hỗ trợ có phí",
+    "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
+    "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
+    "Password" : "Mật khẩu",
+    "Your password was changed" : "Mật khẩu của bạn đã được thay đổi.",
+    "Unable to change your password" : "Không thể đổi mật khẩu",
+    "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",
+    "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",
+    "Import Root Certificate" : "Nhập Root Certificate",
+    "Login Name" : "Tên đăng nhập",
+    "Create" : "Tạo",
+    "Group" : "N",
+    "Default Quota" : "Hạn ngạch mặt định",
+    "Unlimited" : "Không giới hạn",
+    "Other" : "Khác",
+    "Username" : "Tên đăng nhập",
+    "Quota" : "Hạn ngạch",
+    "change full name" : "Đổi họ và t",
+    "set new password" : "đặt mật khẩu mới",
+    "Default" : "Mặc định"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
deleted file mode 100644
index 5abff6a4e6b..00000000000
--- a/settings/l10n/vi.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Bật",
-"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",
-"Invalid email" => "Email không hợp lệ",
-"Unable to delete group" => "Không thể xóa nhóm",
-"Unable to delete user" => "Không thể xóa người dùng",
-"Language changed" => "Ngôn ngữ đã được thay đổi",
-"Invalid request" => "Yêu cầu không hợp lệ",
-"Admins can't remove themself from the admin group" => "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
-"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",
-"Email sent" => "Email đã được gửi",
-"All" => "Tất cả",
-"Please wait...." => "Xin hãy đợi...",
-"Disable" => "Tắt",
-"Enable" => "Bật",
-"Updating...." => "Đang cập nhật...",
-"Error while updating app" => "Lỗi khi cập nhật ứng dụng",
-"Updated" => "Đã cập nhật",
-"Delete" => "Xóa",
-"Groups" => "Nhóm",
-"undo" => "lùi lại",
-"never" => "không thay đổi",
-"__language_name__" => "__Ngôn ngữ___",
-"SSL root certificates" => "Chứng chỉ SSL root",
-"Encryption" => "Mã hóa",
-"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ẻ",
-"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
-"Allow resharing" => "Cho phép chia sẻ lại",
-"Server address" => "Địa chỉ máy chủ",
-"Port" => "Cổng",
-"Credentials" => "Giấy chứng nhận",
-"Log" => "Log",
-"More" => "hơn",
-"Less" => "ít",
-"Version" => "Phiên bản",
-"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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "bởi",
-"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",
-"Bugtracker" => "Hệ ghi nhận lỗi",
-"Commercial Support" => "Hỗ trợ có phí",
-"Get the apps to sync your files" => "Nhận ứng dụng để đồng bộ file của bạn",
-"Show First Run Wizard again" => "Hiện lại việc chạy đồ thuật khởi đầu",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
-"Password" => "Mật khẩu",
-"Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
-"Unable to change your password" => "Không thể đổi mật khẩu",
-"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",
-"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",
-"Import Root Certificate" => "Nhập Root Certificate",
-"Login Name" => "Tên đăng nhập",
-"Create" => "Tạo",
-"Group" => "N",
-"Default Quota" => "Hạn ngạch mặt định",
-"Unlimited" => "Không giới hạn",
-"Other" => "Khác",
-"Username" => "Tên đăng nhập",
-"Quota" => "Hạn ngạch",
-"change full name" => "Đổi họ và t",
-"set new password" => "đặt mật khẩu mới",
-"Default" => "Mặc định"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
new file mode 100644
index 00000000000..77e0a3e9451
--- /dev/null
+++ b/settings/l10n/zh_CN.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "开启",
+    "Authentication error" : "认证错误",
+    "Your full name has been changed." : "您的全名已修改。",
+    "Unable to change full name" : "无法修改全名",
+    "Group already exists" : "已存在该组",
+    "Unable to add group" : "无法增加组",
+    "Files decrypted successfully" : "文件解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
+    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
+    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
+    "Couldn't remove app." : "无法删除应用。",
+    "Email saved" : "电子邮件已保存",
+    "Invalid email" : "无效的电子邮件",
+    "Unable to delete group" : "无法删除组",
+    "Unable to delete user" : "无法删除用户",
+    "Backups restored successfully" : "恢复备份成功",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
+    "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." : "无法更新 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" : "不能更改密码",
+    "Saved" : "已保存",
+    "test email settings" : "测试电子邮件设置",
+    "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
+    "Email sent" : "邮件已发送",
+    "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
+    "Add trusted domain" : "添加信任域",
+    "Sending..." : "正在发送...",
+    "All" : "全部",
+    "Please wait...." : "请稍等....",
+    "Error while disabling app" : "禁用 app 时出错",
+    "Disable" : "禁用",
+    "Enable" : "开启",
+    "Error while enabling app" : "启用 app 时出错",
+    "Updating...." : "正在更新....",
+    "Error while updating app" : "更新 app 时出错",
+    "Updated" : "已更新",
+    "Uninstalling ...." : "卸载中....",
+    "Error while uninstalling app" : "卸载应用时发生了一个错误",
+    "Uninstall" : "卸载",
+    "Select a profile picture" : "选择头像",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Valid until {date}" : "有效期至 {date}",
+    "Delete" : "删除",
+    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
+    "Delete encryption keys permanently." : "永久删除加密密钥。",
+    "Restore encryption keys." : "恢复加密密钥。",
+    "Groups" : "组",
+    "Unable to delete {objName}" : "无法删除 {objName}",
+    "Error creating group" : "创建组时出错",
+    "A valid group name must be provided" : "请提供一个有效的组名称",
+    "deleted {groupName}" : "已删除 {groupName}",
+    "undo" : "撤销",
+    "never" : "从不",
+    "deleted {userName}" : "已删除 {userName}",
+    "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__" : "简体中文",
+    "SSL root certificates" : "SSL根证书",
+    "Encryption" : "加密",
+    "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" : "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." : "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
+    "Setup Warning" : "设置警告",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Database Performance Info" : "数据库性能信息",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
+    "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 版本不是最新版",
+    "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 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
+    "PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-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。",
+    "URL generation in notification emails" : "在通知邮件里生成URL",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
+    "Connectivity checks" : "网络连接检查",
+    "No problems found" : "未发现问题",
+    "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
+    "Cron" : "计划任务",
+    "Last cron was executed at %s." : "上次定时任务执行于 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "上次定时任务执行于 %s。这是在一个小时之前执行的，可能出了什么问题。",
+    "Cron was not executed yet!" : "定时任务还未被执行！",
+    "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 服务来通过 http 每 15 分钟执行 cron.php。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
+    "Sharing" : "共享",
+    "Allow apps to use the Share API" : "允许应用软件使用共享API",
+    "Allow users to share via link" : "允许用户通过链接分享文件",
+    "Enforce password protection" : "强制密码保护",
+    "Allow public uploads" : "允许公开上传",
+    "Set default expiration date" : "设置默认过期日期",
+    "Expire after " : "过期于",
+    "days" : "天",
+    "Enforce expiration date" : "强制过期日期",
+    "Allow resharing" : "允许再次共享",
+    "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
+    "Exclude groups from sharing" : "在分享中排除组",
+    "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "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.",
+    "Email Server" : "电子邮件服务器",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "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>许可证下发布。",
+    "More apps" : "更多应用",
+    "by" : "被",
+    "Documentation:" : "文档：",
+    "User Documentation" : "用户文档",
+    "Admin Documentation" : "管理员文档",
+    "Enable only for specific groups" : "仅对特定的组开放",
+    "Uninstall App" : "下载应用",
+    "Administrator Documentation" : "管理员文档",
+    "Online Documentation" : "在线文档",
+    "Forum" : "论坛",
+    "Bugtracker" : "问题跟踪器",
+    "Commercial Support" : "商业支持",
+    "Get the apps to sync your files" : "安装应用进行文件同步",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
+    "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" : "当前密码",
+    "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" : "帮助翻译",
+    "Common Name" : "通用名称",
+    "Valid until" : "有效期至",
+    "Issued By" : "授权由",
+    "Valid until %s" : "有效期至 %s",
+    "Import Root Certificate" : "导入根证书",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
+    "Log-in password" : "登录密码",
+    "Decrypt all Files" : "解密所有文件",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
+    "Restore Encryption Keys" : "恢复加密密钥",
+    "Delete Encryption Keys" : "删除加密密钥",
+    "Show storage location" : "显示存储位置",
+    "Show last log in" : "显示最后登录",
+    "Login Name" : "登录名称",
+    "Create" : "创建",
+    "Admin Recovery Password" : "管理恢复密码",
+    "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
+    "Search Users and Groups" : "搜索用户和组",
+    "Add Group" : "增加组",
+    "Group" : "分组",
+    "Everyone" : "所有人",
+    "Admins" : "管理员",
+    "Default Quota" : "默认配额",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "无限",
+    "Other" : "其它",
+    "Username" : "用户名",
+    "Quota" : "配额",
+    "Storage Location" : "存储空间位置",
+    "Last Login" : "最后登录",
+    "change full name" : "更改全名",
+    "set new password" : "设置新密码",
+    "Default" : "默认"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
new file mode 100644
index 00000000000..ddfc5cab5ad
--- /dev/null
+++ b/settings/l10n/zh_CN.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "开启",
+    "Authentication error" : "认证错误",
+    "Your full name has been changed." : "您的全名已修改。",
+    "Unable to change full name" : "无法修改全名",
+    "Group already exists" : "已存在该组",
+    "Unable to add group" : "无法增加组",
+    "Files decrypted successfully" : "文件解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
+    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
+    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
+    "Couldn't remove app." : "无法删除应用。",
+    "Email saved" : "电子邮件已保存",
+    "Invalid email" : "无效的电子邮件",
+    "Unable to delete group" : "无法删除组",
+    "Unable to delete user" : "无法删除用户",
+    "Backups restored successfully" : "恢复备份成功",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
+    "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." : "无法更新 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" : "不能更改密码",
+    "Saved" : "已保存",
+    "test email settings" : "测试电子邮件设置",
+    "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
+    "Email sent" : "邮件已发送",
+    "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
+    "Add trusted domain" : "添加信任域",
+    "Sending..." : "正在发送...",
+    "All" : "全部",
+    "Please wait...." : "请稍等....",
+    "Error while disabling app" : "禁用 app 时出错",
+    "Disable" : "禁用",
+    "Enable" : "开启",
+    "Error while enabling app" : "启用 app 时出错",
+    "Updating...." : "正在更新....",
+    "Error while updating app" : "更新 app 时出错",
+    "Updated" : "已更新",
+    "Uninstalling ...." : "卸载中....",
+    "Error while uninstalling app" : "卸载应用时发生了一个错误",
+    "Uninstall" : "卸载",
+    "Select a profile picture" : "选择头像",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Valid until {date}" : "有效期至 {date}",
+    "Delete" : "删除",
+    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
+    "Delete encryption keys permanently." : "永久删除加密密钥。",
+    "Restore encryption keys." : "恢复加密密钥。",
+    "Groups" : "组",
+    "Unable to delete {objName}" : "无法删除 {objName}",
+    "Error creating group" : "创建组时出错",
+    "A valid group name must be provided" : "请提供一个有效的组名称",
+    "deleted {groupName}" : "已删除 {groupName}",
+    "undo" : "撤销",
+    "never" : "从不",
+    "deleted {userName}" : "已删除 {userName}",
+    "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__" : "简体中文",
+    "SSL root certificates" : "SSL根证书",
+    "Encryption" : "加密",
+    "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" : "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." : "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
+    "Setup Warning" : "设置警告",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Database Performance Info" : "数据库性能信息",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
+    "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 版本不是最新版",
+    "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 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
+    "PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-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。",
+    "URL generation in notification emails" : "在通知邮件里生成URL",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
+    "Connectivity checks" : "网络连接检查",
+    "No problems found" : "未发现问题",
+    "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
+    "Cron" : "计划任务",
+    "Last cron was executed at %s." : "上次定时任务执行于 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "上次定时任务执行于 %s。这是在一个小时之前执行的，可能出了什么问题。",
+    "Cron was not executed yet!" : "定时任务还未被执行！",
+    "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 服务来通过 http 每 15 分钟执行 cron.php。",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
+    "Sharing" : "共享",
+    "Allow apps to use the Share API" : "允许应用软件使用共享API",
+    "Allow users to share via link" : "允许用户通过链接分享文件",
+    "Enforce password protection" : "强制密码保护",
+    "Allow public uploads" : "允许公开上传",
+    "Set default expiration date" : "设置默认过期日期",
+    "Expire after " : "过期于",
+    "days" : "天",
+    "Enforce expiration date" : "强制过期日期",
+    "Allow resharing" : "允许再次共享",
+    "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
+    "Exclude groups from sharing" : "在分享中排除组",
+    "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "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.",
+    "Email Server" : "电子邮件服务器",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "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>许可证下发布。",
+    "More apps" : "更多应用",
+    "by" : "被",
+    "Documentation:" : "文档：",
+    "User Documentation" : "用户文档",
+    "Admin Documentation" : "管理员文档",
+    "Enable only for specific groups" : "仅对特定的组开放",
+    "Uninstall App" : "下载应用",
+    "Administrator Documentation" : "管理员文档",
+    "Online Documentation" : "在线文档",
+    "Forum" : "论坛",
+    "Bugtracker" : "问题跟踪器",
+    "Commercial Support" : "商业支持",
+    "Get the apps to sync your files" : "安装应用进行文件同步",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
+    "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" : "当前密码",
+    "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" : "帮助翻译",
+    "Common Name" : "通用名称",
+    "Valid until" : "有效期至",
+    "Issued By" : "授权由",
+    "Valid until %s" : "有效期至 %s",
+    "Import Root Certificate" : "导入根证书",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
+    "Log-in password" : "登录密码",
+    "Decrypt all Files" : "解密所有文件",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
+    "Restore Encryption Keys" : "恢复加密密钥",
+    "Delete Encryption Keys" : "删除加密密钥",
+    "Show storage location" : "显示存储位置",
+    "Show last log in" : "显示最后登录",
+    "Login Name" : "登录名称",
+    "Create" : "创建",
+    "Admin Recovery Password" : "管理恢复密码",
+    "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
+    "Search Users and Groups" : "搜索用户和组",
+    "Add Group" : "增加组",
+    "Group" : "分组",
+    "Everyone" : "所有人",
+    "Admins" : "管理员",
+    "Default Quota" : "默认配额",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "无限",
+    "Other" : "其它",
+    "Username" : "用户名",
+    "Quota" : "配额",
+    "Storage Location" : "存储空间位置",
+    "Last Login" : "最后登录",
+    "change full name" : "更改全名",
+    "set new password" : "设置新密码",
+    "Default" : "默认"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
deleted file mode 100644
index 49c8021e2a5..00000000000
--- a/settings/l10n/zh_CN.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "开启",
-"Authentication error" => "认证错误",
-"Your full name has been changed." => "您的全名已修改。",
-"Unable to change full name" => "无法修改全名",
-"Group already exists" => "已存在该组",
-"Unable to add group" => "无法增加组",
-"Files decrypted successfully" => "文件解密成功",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
-"Couldn't decrypt your files, check your password and try again" => "无法解密您的文件，请检查密码并重试。",
-"Encryption keys deleted permanently" => "加密密钥已经永久删除",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
-"Couldn't remove app." => "无法删除应用。",
-"Email saved" => "电子邮件已保存",
-"Invalid email" => "无效的电子邮件",
-"Unable to delete group" => "无法删除组",
-"Unable to delete user" => "无法删除用户",
-"Backups restored successfully" => "恢复备份成功",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
-"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." => "无法更新 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" => "不能更改密码",
-"Saved" => "已保存",
-"test email settings" => "测试电子邮件设置",
-"If you received this email, the settings seem to be correct." => "如果您收到了这封邮件，看起来设置没有问题。",
-"Email sent" => "邮件已发送",
-"You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？",
-"Add trusted domain" => "添加信任域",
-"Sending..." => "正在发送...",
-"All" => "全部",
-"Please wait...." => "请稍等....",
-"Error while disabling app" => "禁用 app 时出错",
-"Disable" => "禁用",
-"Enable" => "开启",
-"Error while enabling app" => "启用 app 时出错",
-"Updating...." => "正在更新....",
-"Error while updating app" => "更新 app 时出错",
-"Updated" => "已更新",
-"Uninstalling ...." => "卸载中....",
-"Error while uninstalling app" => "卸载应用时发生了一个错误",
-"Uninstall" => "卸载",
-"Select a profile picture" => "选择头像",
-"Very weak password" => "非常弱的密码",
-"Weak password" => "弱密码",
-"So-so password" => "一般强度的密码",
-"Good password" => "较强的密码",
-"Strong password" => "强密码",
-"Valid until {date}" => "有效期至 {date}",
-"Delete" => "删除",
-"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
-"Delete encryption keys permanently." => "永久删除加密密钥。",
-"Restore encryption keys." => "恢复加密密钥。",
-"Groups" => "组",
-"Unable to delete {objName}" => "无法删除 {objName}",
-"Error creating group" => "创建组时出错",
-"A valid group name must be provided" => "请提供一个有效的组名称",
-"deleted {groupName}" => "已删除 {groupName}",
-"undo" => "撤销",
-"never" => "从不",
-"deleted {userName}" => "已删除 {userName}",
-"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__" => "简体中文",
-"SSL root certificates" => "SSL根证书",
-"Encryption" => "加密",
-"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" => "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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
-"Setup Warning" => "设置警告",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
-"Database Performance Info" => "数据库性能信息",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
-"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 版本不是最新版",
-"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 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
-"PHP charset is not set to UTF-8" => "PHP字符集没有设置为UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-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。",
-"URL generation in notification emails" => "在通知邮件里生成URL",
-"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
-"Connectivity checks" => "网络连接检查",
-"No problems found" => "未发现问题",
-"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
-"Cron" => "计划任务",
-"Last cron was executed at %s." => "上次定时任务执行于 %s。",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "上次定时任务执行于 %s。这是在一个小时之前执行的，可能出了什么问题。",
-"Cron was not executed yet!" => "定时任务还未被执行！",
-"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 服务来通过 http 每 15 分钟执行 cron.php。",
-"Use system's cron service to call the cron.php file every 15 minutes." => "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
-"Sharing" => "共享",
-"Allow apps to use the Share API" => "允许应用软件使用共享API",
-"Allow users to share via link" => "允许用户通过链接分享文件",
-"Enforce password protection" => "强制密码保护",
-"Allow public uploads" => "允许公开上传",
-"Set default expiration date" => "设置默认过期日期",
-"Expire after " => "过期于",
-"days" => "天",
-"Enforce expiration date" => "强制过期日期",
-"Allow resharing" => "允许再次共享",
-"Restrict users to only share with users in their groups" => "限制仅与组内用户分享",
-"Allow users to send mail notification for shared files" => "允许用户发送共享文件的邮件通知",
-"Exclude groups from sharing" => "在分享中排除组",
-"These groups will still be able to receive shares, but not to initiate them." => "这些组将仍可以获取分享，但无法向他人分享。",
-"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.",
-"Email Server" => "电子邮件服务器",
-"This is used for sending out notifications." => "这被用于发送通知。",
-"Send mode" => "发送模式",
-"From address" => "来自地址",
-"mail" => "邮件",
-"Authentication method" => "认证方法",
-"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>许可证下发布。",
-"More apps" => "更多应用",
-"by" => "被",
-"Documentation:" => "文档：",
-"User Documentation" => "用户文档",
-"Admin Documentation" => "管理员文档",
-"Enable only for specific groups" => "仅对特定的组开放",
-"Uninstall App" => "下载应用",
-"Administrator Documentation" => "管理员文档",
-"Online Documentation" => "在线文档",
-"Forum" => "论坛",
-"Bugtracker" => "问题跟踪器",
-"Commercial Support" => "商业支持",
-"Get the apps to sync your files" => "安装应用进行文件同步",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
-"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" => "当前密码",
-"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" => "帮助翻译",
-"Common Name" => "通用名称",
-"Valid until" => "有效期至",
-"Issued By" => "授权由",
-"Valid until %s" => "有效期至 %s",
-"Import Root Certificate" => "导入根证书",
-"The encryption app is no longer enabled, please decrypt all your files" => "加密 app 不再被启用，请解密您所有的文件",
-"Log-in password" => "登录密码",
-"Decrypt all Files" => "解密所有文件",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
-"Restore Encryption Keys" => "恢复加密密钥",
-"Delete Encryption Keys" => "删除加密密钥",
-"Show storage location" => "显示存储位置",
-"Show last log in" => "显示最后登录",
-"Login Name" => "登录名称",
-"Create" => "创建",
-"Admin Recovery Password" => "管理恢复密码",
-"Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
-"Search Users and Groups" => "搜索用户和组",
-"Add Group" => "增加组",
-"Group" => "分组",
-"Everyone" => "所有人",
-"Admins" => "管理员",
-"Default Quota" => "默认配额",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
-"Unlimited" => "无限",
-"Other" => "其它",
-"Username" => "用户名",
-"Quota" => "配额",
-"Storage Location" => "存储空间位置",
-"Last Login" => "最后登录",
-"change full name" => "更改全名",
-"set new password" => "设置新密码",
-"Default" => "默认"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
new file mode 100644
index 00000000000..135c31cfb7a
--- /dev/null
+++ b/settings/l10n/zh_HK.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "啟用",
+    "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
+    "Email sent" : "郵件已傳",
+    "Sending..." : "發送中...",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Updating...." : "更新中....",
+    "Updated" : "已更新",
+    "Delete" : "刪除",
+    "Groups" : "群組",
+    "Encryption" : "加密",
+    "None" : "空",
+    "Login" : "登入",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Port" : "連接埠",
+    "More" : "更多",
+    "Password" : "密碼",
+    "New password" : "新密碼",
+    "Change password" : "更改密碼",
+    "Email" : "電郵",
+    "Cancel" : "取消",
+    "Create" : "新增",
+    "Username" : "用戶名稱"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
new file mode 100644
index 00000000000..648713d6835
--- /dev/null
+++ b/settings/l10n/zh_HK.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Enabled" : "啟用",
+    "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
+    "Email sent" : "郵件已傳",
+    "Sending..." : "發送中...",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Updating...." : "更新中....",
+    "Updated" : "已更新",
+    "Delete" : "刪除",
+    "Groups" : "群組",
+    "Encryption" : "加密",
+    "None" : "空",
+    "Login" : "登入",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Port" : "連接埠",
+    "More" : "更多",
+    "Password" : "密碼",
+    "New password" : "新密碼",
+    "Change password" : "更改密碼",
+    "Email" : "電郵",
+    "Cancel" : "取消",
+    "Create" : "新增",
+    "Username" : "用戶名稱"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
deleted file mode 100644
index c969e884037..00000000000
--- a/settings/l10n/zh_HK.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "啟用",
-"Wrong password" => "密碼錯誤",
-"Saved" => "已儲存",
-"Email sent" => "郵件已傳",
-"Sending..." => "發送中...",
-"Disable" => "停用",
-"Enable" => "啟用",
-"Updating...." => "更新中....",
-"Updated" => "已更新",
-"Delete" => "刪除",
-"Groups" => "群組",
-"Encryption" => "加密",
-"None" => "空",
-"Login" => "登入",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Port" => "連接埠",
-"More" => "更多",
-"Password" => "密碼",
-"New password" => "新密碼",
-"Change password" => "更改密碼",
-"Email" => "電郵",
-"Cancel" => "取消",
-"Create" => "新增",
-"Username" => "用戶名稱"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
new file mode 100644
index 00000000000..7085ec1b685
--- /dev/null
+++ b/settings/l10n/zh_TW.js
@@ -0,0 +1,173 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "已啓用",
+    "Authentication error" : "認證錯誤",
+    "Your full name has been changed." : "您的全名已變更。",
+    "Unable to change full name" : "無法變更全名",
+    "Group already exists" : "群組已存在",
+    "Unable to add group" : "群組增加失敗",
+    "Files decrypted successfully" : "檔案解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
+    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
+    "Email saved" : "Email已儲存",
+    "Invalid email" : "無效的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" : "無法修改密碼",
+    "Saved" : "已儲存",
+    "test email settings" : "測試郵件設定",
+    "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
+    "Email sent" : "Email 已寄出",
+    "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
+    "Sending..." : "寄送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候...",
+    "Error while disabling app" : "停用應用程式錯誤",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Error while enabling app" : "啓用應用程式錯誤",
+    "Updating...." : "更新中...",
+    "Error while updating app" : "更新應用程式錯誤",
+    "Updated" : "已更新",
+    "Select a profile picture" : "選擇大頭貼",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Delete" : "刪除",
+    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
+    "Groups" : "群組",
+    "undo" : "復原",
+    "never" : "永不",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL 根憑證",
+    "Encryption" : "加密",
+    "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 Manager",
+    "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。我們強烈建議您設定您的主機必須使用加密網頁。",
+    "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" : "設定警告",
+    "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-type 支援。",
+    "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",
+    "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "最後的排程已執行於 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "最後的排程已執行於 %s。現在過了好幾個小時，看起來是有錯誤。",
+    "Cron was not executed yet!" : "排程沒有執行!",
+    "Execute one task with each page loaded" : "當頁面載入時，執行",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Sharing" : "分享",
+    "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Allow public uploads" : "允許任何人上傳",
+    "Allow resharing" : "允許轉貼分享",
+    "Allow users 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 加密。",
+    "Email Server" : "郵件伺服器",
+    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "Send mode" : "寄送模式",
+    "From address" : "寄件地址",
+    "Authentication method" : "驗證方式",
+    "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> 授權許可下發布。",
+    "More apps" : "更多 Apps",
+    "by" : "由",
+    "Documentation:" : "文件:",
+    "User Documentation" : "用戶說明文件",
+    "Admin Documentation" : "管理者文件",
+    "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>",
+    "Password" : "密碼",
+    "Your password was changed" : "你的密碼已更改",
+    "Unable to change your 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" : "幫助翻譯",
+    "Import Root Certificate" : "匯入根憑證",
+    "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" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Group" : "群組",
+    "Default Quota" : "預設容量限制",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
+    "Unlimited" : "無限制",
+    "Other" : "其他",
+    "Username" : "使用者名稱",
+    "Quota" : "容量限制",
+    "change full name" : "變更全名",
+    "set new password" : "設定新密碼",
+    "Default" : "預設"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
new file mode 100644
index 00000000000..178778efeed
--- /dev/null
+++ b/settings/l10n/zh_TW.json
@@ -0,0 +1,171 @@
+{ "translations": {
+    "Enabled" : "已啓用",
+    "Authentication error" : "認證錯誤",
+    "Your full name has been changed." : "您的全名已變更。",
+    "Unable to change full name" : "無法變更全名",
+    "Group already exists" : "群組已存在",
+    "Unable to add group" : "群組增加失敗",
+    "Files decrypted successfully" : "檔案解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
+    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
+    "Email saved" : "Email已儲存",
+    "Invalid email" : "無效的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" : "無法修改密碼",
+    "Saved" : "已儲存",
+    "test email settings" : "測試郵件設定",
+    "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
+    "Email sent" : "Email 已寄出",
+    "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
+    "Sending..." : "寄送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候...",
+    "Error while disabling app" : "停用應用程式錯誤",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Error while enabling app" : "啓用應用程式錯誤",
+    "Updating...." : "更新中...",
+    "Error while updating app" : "更新應用程式錯誤",
+    "Updated" : "已更新",
+    "Select a profile picture" : "選擇大頭貼",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Delete" : "刪除",
+    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
+    "Groups" : "群組",
+    "undo" : "復原",
+    "never" : "永不",
+    "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__" : "__language_name__",
+    "SSL root certificates" : "SSL 根憑證",
+    "Encryption" : "加密",
+    "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 Manager",
+    "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。我們強烈建議您設定您的主機必須使用加密網頁。",
+    "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" : "設定警告",
+    "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-type 支援。",
+    "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",
+    "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "最後的排程已執行於 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "最後的排程已執行於 %s。現在過了好幾個小時，看起來是有錯誤。",
+    "Cron was not executed yet!" : "排程沒有執行!",
+    "Execute one task with each page loaded" : "當頁面載入時，執行",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Sharing" : "分享",
+    "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Allow public uploads" : "允許任何人上傳",
+    "Allow resharing" : "允許轉貼分享",
+    "Allow users 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 加密。",
+    "Email Server" : "郵件伺服器",
+    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "Send mode" : "寄送模式",
+    "From address" : "寄件地址",
+    "Authentication method" : "驗證方式",
+    "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> 授權許可下發布。",
+    "More apps" : "更多 Apps",
+    "by" : "由",
+    "Documentation:" : "文件:",
+    "User Documentation" : "用戶說明文件",
+    "Admin Documentation" : "管理者文件",
+    "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>",
+    "Password" : "密碼",
+    "Your password was changed" : "你的密碼已更改",
+    "Unable to change your 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" : "幫助翻譯",
+    "Import Root Certificate" : "匯入根憑證",
+    "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" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Group" : "群組",
+    "Default Quota" : "預設容量限制",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
+    "Unlimited" : "無限制",
+    "Other" : "其他",
+    "Username" : "使用者名稱",
+    "Quota" : "容量限制",
+    "change full name" : "變更全名",
+    "set new password" : "設定新密碼",
+    "Default" : "預設"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
deleted file mode 100644
index 20a10a926ac..00000000000
--- a/settings/l10n/zh_TW.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "已啓用",
-"Authentication error" => "認證錯誤",
-"Your full name has been changed." => "您的全名已變更。",
-"Unable to change full name" => "無法變更全名",
-"Group already exists" => "群組已存在",
-"Unable to add group" => "群組增加失敗",
-"Files decrypted successfully" => "檔案解密成功",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
-"Couldn't decrypt your files, check your password and try again" => "無法解密您的檔案，確認您的密碼並再重試一次",
-"Email saved" => "Email已儲存",
-"Invalid email" => "無效的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" => "無法修改密碼",
-"Saved" => "已儲存",
-"test email settings" => "測試郵件設定",
-"If you received this email, the settings seem to be correct." => "假如您收到這個郵件，此設定看起來是正確的。",
-"Email sent" => "Email 已寄出",
-"You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-"Sending..." => "寄送中...",
-"All" => "所有",
-"Please wait...." => "請稍候...",
-"Error while disabling app" => "停用應用程式錯誤",
-"Disable" => "停用",
-"Enable" => "啟用",
-"Error while enabling app" => "啓用應用程式錯誤",
-"Updating...." => "更新中...",
-"Error while updating app" => "更新應用程式錯誤",
-"Updated" => "已更新",
-"Select a profile picture" => "選擇大頭貼",
-"Very weak password" => "非常弱的密碼",
-"Weak password" => "弱的密碼",
-"So-so password" => "普通的密碼",
-"Good password" => "好的密碼",
-"Strong password" => "很強的密碼",
-"Delete" => "刪除",
-"Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
-"Groups" => "群組",
-"undo" => "復原",
-"never" => "永不",
-"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__" => "__language_name__",
-"SSL root certificates" => "SSL 根憑證",
-"Encryption" => "加密",
-"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 Manager",
-"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。我們強烈建議您設定您的主機必須使用加密網頁。",
-"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" => "設定警告",
-"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-type 支援。",
-"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",
-"Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "最後的排程已執行於 %s。",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "最後的排程已執行於 %s。現在過了好幾個小時，看起來是有錯誤。",
-"Cron was not executed yet!" => "排程沒有執行!",
-"Execute one task with each page loaded" => "當頁面載入時，執行",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-"Sharing" => "分享",
-"Allow apps to use the Share API" => "允許 apps 使用分享 API",
-"Allow public uploads" => "允許任何人上傳",
-"Allow resharing" => "允許轉貼分享",
-"Allow users 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 加密。",
-"Email Server" => "郵件伺服器",
-"This is used for sending out notifications." => "這是使用於寄送通知。",
-"Send mode" => "寄送模式",
-"From address" => "寄件地址",
-"Authentication method" => "驗證方式",
-"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> 授權許可下發布。",
-"More apps" => "更多 Apps",
-"by" => "由",
-"Documentation:" => "文件:",
-"User Documentation" => "用戶說明文件",
-"Admin Documentation" => "管理者文件",
-"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>",
-"Password" => "密碼",
-"Your password was changed" => "你的密碼已更改",
-"Unable to change your 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" => "幫助翻譯",
-"Import Root Certificate" => "匯入根憑證",
-"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" => "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
-"Group" => "群組",
-"Default Quota" => "預設容量限制",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
-"Unlimited" => "無限制",
-"Other" => "其他",
-"Username" => "使用者名稱",
-"Quota" => "容量限制",
-"change full name" => "變更全名",
-"set new password" => "設定新密碼",
-"Default" => "預設"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";