From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 10 Jan 2013 17:38:41 +0000 (+0100)
Subject: Translations update
X-Git-Tag: oc-android-1.4.3~68^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7239b9eb9dd2a4fd9d254f3ea7aad181f86ced37?ds=inline;hp=--cc

Translations update
---

7239b9eb9dd2a4fd9d254f3ea7aad181f86ced37
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c757504a..6f0d5099 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,2 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_button_login">تسجيل الدخول</string>
+  <string name="main_files">الملفات</string>
+  <string name="main_music">الموسيقى</string>
+  <string name="main_contacts">المعارف</string>
+  <string name="main_settings">تعديلات</string>
+  <string name="actionbar_upload">إرفع</string>
+  <string name="actionbar_upload_files">الملفات</string>
+  <string name="actionbar_settings">تعديلات</string>
+  <string name="prefs_category_general">عام</string>
+  <string name="auth_host_url">عنوان الموقع</string>
+  <string name="auth_username">إسم المستخدم</string>
+  <string name="auth_password">كلمات السر</string>
+  <string name="sync_string_files">الملفات</string>
+  <string name="setup_hint_username">إسم المستخدم</string>
+  <string name="setup_hint_password">كلمات السر</string>
+  <string name="uploader_btn_upload_text">إرفع</string>
+  <string name="filedetails_download">انزال</string>
+  <string name="filedetails_open">افتح</string>
+  <string name="common_yes">نعم</string>
+  <string name="common_no">لا</string>
+  <string name="common_cancel">الغاء</string>
+  <string name="common_error">خطأ</string>
+  <string name="sync_string_contacts">المعارف</string>
+  <string name="common_share">شارك</string>
+  <string name="common_remove">الغى</string>
+</resources>
diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index c757504a..bca2aef2 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -1,2 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Парола:</string>
+  <string name="main_login">Потребител:</string>
+  <string name="main_button_login">Вход</string>
+  <string name="main_welcome">Добре дошли</string>
+  <string name="main_files">Файлове</string>
+  <string name="main_music">Музика</string>
+  <string name="main_contacts">Контакти</string>
+  <string name="main_calendar">Календар</string>
+  <string name="main_bookmarks">Предпочитани</string>
+  <string name="main_settings">Настройки</string>
+  <string name="actionbar_upload">Качване</string>
+  <string name="actionbar_upload_files">Файлове</string>
+  <string name="actionbar_settings">Настройки</string>
+  <string name="auth_host_url">Уеб адрес</string>
+  <string name="auth_password">Парола</string>
+  <string name="sync_string_files">Файлове</string>
+  <string name="setup_hint_password">Парола</string>
+  <string name="uploader_btn_upload_text">Качване</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Изход</string>
+  <string name="filedetails_download">Изтегляне</string>
+  <string name="sync_string_contacts">Контакти</string>
+  <string name="common_rename">Преименуване</string>
+  <string name="common_remove">Премахване</string>
+</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
new file mode 100644
index 00000000..2eac06ee
--- /dev/null
+++ b/res/values-bn-rBD/strings.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_button_login">প্রবেশ</string>
+  <string name="main_welcome">সুস্বাগতম</string>
+  <string name="main_files">ফাইল</string>
+  <string name="main_music">গানবাজনা</string>
+  <string name="main_contacts">ঠিকানাপঞ্জী</string>
+  <string name="main_calendar">দিনপঞ্জী</string>
+  <string name="main_bookmarks">ঠিকা</string>
+  <string name="main_settings">নিয়ামকসমূহ</string>
+  <string name="main_tit_accsetup">একাউন্ট সেটআপ</string>
+  <string name="actionbar_sync">নবোদ্যম</string>
+  <string name="actionbar_upload">আপলোড</string>
+  <string name="actionbar_upload_files">ফাইল</string>
+  <string name="actionbar_mkdir">ডিরেক্টরি তৈরী কর</string>
+  <string name="actionbar_search">অনুসন্ধান</string>
+  <string name="actionbar_settings">নিয়ামকসমূহ</string>
+  <string name="prefs_category_general">সাধারণ</string>
+  <string name="prefs_category_trackmydevice">ডিভাইস ট্র্যাকিং</string>
+  <string name="prefs_add_session">নতুন সেসন যোগ কর</string>
+  <string name="prefs_create_img_thumbnails">ছবির অঙ্গুলিবীক্ষণ তৈরী কর</string>
+  <string name="prefs_select_oc_account">একাউন্ট নির্বাচন কর</string>
+  <string name="prefs_trackmydevice">ডিভাইস ট্র্যাকিং</string>
+  <string name="prefs_trackmydevice_interval">পরিবর্ধনের মধ্যবিরতি</string>
+  <string name="prefs_accounts">একাউন্ট</string>
+  <string name="auth_host_url">URL</string>
+  <string name="auth_username">ব্যবহারকারি</string>
+  <string name="auth_password">কূটশব্দ</string>
+  <string name="new_session_uri_error">ভুল ঠিকানা প্রদান করা হয়েছে</string>
+  <string name="new_session_session_name_error">সেসনের নামটি ভুল</string>
+  <string name="sync_string_files">ফাইল</string>
+  <string name="uploader_no_file_selected">আপলোড করার জন্য কোন ফাইল নির্বাচন করা হয় নি</string>
+  <string name="setup_hint_username">ব্যবহারকারি</string>
+  <string name="setup_hint_password">কূটশব্দ</string>
+  <string name="setup_hint_address">ওয়েব ঠিকানা</string>
+  <string name="setup_hint_show_password">কূটশব্দ প্রদর্শন করবে ?</string>
+  <string name="setup_btn_connect">সংযুক্ত হও</string>
+  <string name="uploader_btn_upload_text">আপলোড</string>
+  <string name="uploader_wrn_no_account_title">কোন একাউন্ট খুঁজে পাওয়া গেল না</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">সেট-আপ</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">বন্ধ</string>
+  <string name="uploader_info_uploading">আপলোড করা হচ্ছে</string>
+  <string name="filedetails_size">আয়তনঃ</string>
+  <string name="filedetails_type">ধরণঃ</string>
+  <string name="filedetails_created">তৈরীর নির্ঘন্টঃ</string>
+  <string name="filedetails_modified">পরিবর্তিতঃ</string>
+  <string name="filedetails_download">ডাউনলোড</string>
+  <string name="filedetails_open">খোল</string>
+  <string name="common_yes">হ্যাঁ</string>
+  <string name="common_no">না</string>
+  <string name="common_ok">তথাস্তু</string>
+  <string name="common_cancel_upload">আপলোড বাতিল কর</string>
+  <string name="common_cancel">বাতিল</string>
+  <string name="common_save_exit">সংরক্ষণ কর এবং &amp;প্রস্থান</string>
+  <string name="common_error">সমস্যা</string>
+  <string name="uploader_info_dirname">ডিরেক্টরির নাম</string>
+  <string name="common_choose_account">একাউন্ট নির্বাচন</string>
+  <string name="common_rename">পূনঃনামকরণ</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b01f632f..a566cd67 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hola, pantalla principal OwnCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Contrasenya:</string>
   <string name="main_login">Nom d\'usuari:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Configuració</string>
   <string name="main_tit_accsetup">Configuració de comptes</string>
   <string name="main_wrn_accsetup">No hi ha comptes d\'ownCloud en el dispositiu. Per usar l\'aplicació, n\'heu de crear un.</string>
+  <string name="about_message">Client ownCloud per Android\n\nversió: %1$s</string>
   <string name="actionbar_sync">Sincronitza el compte</string>
   <string name="actionbar_upload">Puja un fitxer</string>
   <string name="actionbar_upload_from_apps">Contingut d\'altres aplicacions</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud no pot accedir al contingut compartit</string>
   <string name="uploader_info_uploading">S\'està pujant</string>
   <string name="uploader_btn_create_dir_text">Crea una carpeta per les pujades</string>
+  <string name="file_list_empty">No hi ha fitxers en aquesta carpeta.\nPodeu afegir fitxers a través de l\'opció \"Puja\"  del menú.</string>
   <string name="filedetails_select_file">Feu clic en un fitxer per mostrar informació addicional.</string>
   <string name="filedetails_size">Mida:</string>
   <string name="filedetails_type">Tipus:</string>
   <string name="filedetails_created">Creat:</string>
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Baixa</string>
+  <string name="filedetails_sync_file">Refrescar</string>
   <string name="filedetails_redownload">Baixa de nou</string>
   <string name="filedetails_open">Obre</string>
+  <string name="filedetails_renamed_in_upload_msg">L\'arxiu s\'ha canviat de nom a %1$s durant la càrrega</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">D\'acord</string>
+  <string name="common_cancel_download">Cancelar la descàrrega</string>
+  <string name="common_cancel_upload">Cancel·la la pujada</string>
   <string name="common_cancel">Cancel·la</string>
   <string name="common_save_exit">Desa &amp; Surt</string>
   <string name="common_exit">Surt de ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Contactes</string>
   <string name="sync_fail_ticker">La sincronització ha fallat</string>
   <string name="sync_fail_content">La sincronització de %1$s no s\'ha pogut acabar</string>
+  <string name="sync_conflicts_in_favourites_ticker">S\'han trobat conflictes</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d mantinguts els arxius que no podien ser sincronitzats</string>
+  <string name="sync_fail_in_favourites_ticker">Es mantenent els arxius a sincronitzar erronis</string>
+  <string name="sync_fail_in_favourites_content">El contingut de %1$d arxius no es va poder sincronitzar (%2$d conflictes)</string>
   <string name="use_ssl">Usa connexió segura</string>
   <string name="location_no_provider">ownCloud no pot fer el seguiment de l\'equip. Comproveu la configuració d\'ubicuació</string>
   <string name="pincode_enter_pin_code">Escriviu el PIN de l\'aplicació</string>
   <string name="pincode_enter_new_pin_code">Escriviu el nou PIN de l\'aplicació</string>
   <string name="pincode_configure_your_pin">Escriviu el PIN de l\'aplicació ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">es requerirà el PIN cada vegada que s\'iniciï l\'aplicació</string>
   <string name="pincode_reenter_your_pincode">Torneu a escriure el PIN de l\'aplicació ownCloud</string>
   <string name="pincode_remove_your_pincode">Elimina el PIN de l\'aplicació ownCloud</string>
   <string name="pincode_mismatch">Els PINs de l\'aplicació no coincideixen</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">No s\'ha pogut establir la connexió</string>
   <string name="auth_secure_connection">S\'ha establert la connexió segura</string>
   <string name="auth_login_details">Detalls de connexió</string>
+  <string name="auth_unauthorized">Login / contrasenya incorrectes</string>
+  <string name="auth_not_found">Camí equivocat</string>
+  <string name="auth_internal">Error intern del servidor, codi %1$d</string>
   <string name="crashlog_message">L\'aplicació s\'ha aturat de manera no prevista. Voleu enviar el registre d\'errors?</string>
   <string name="crashlog_send_report">Envia el registre d\'errors</string>
   <string name="crashlog_dont_send_report">No envïis el registre d\'errors</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Reanomena</string>
   <string name="common_remove">Elimina</string>
   <string name="confirmation_remove_alert">Esteu segur que voleu eliminar %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Estàs segur que vols esborrar %1$s i els seus continguts?</string>
   <string name="confirmation_remove_local">Només local</string>
+  <string name="confirmation_remove_folder_local">Només contiguts locals</string>
   <string name="confirmation_remove_remote">Elimina del servidor</string>
   <string name="confirmation_remove_remote_and_local">Tant el remot com el local</string>
   <string name="remove_success_msg">L\'eliminació ha tingut èxit</string>
   <string name="remove_fail_msg">No s\'ha pogut completar l\'eliminació</string>
+  <string name="rename_dialog_title">Introdueix un nom nou</string>
   <string name="rename_local_fail_msg">La copia local no s\'ha pogut reanomenar; proveu-ho amb un altre nom</string>
   <string name="rename_server_fail_msg">El canvi de nom no s\'ha pogut completar</string>
+  <string name="sync_file_fail_msg">L\'arxiu remot no ha pogut ser comprovat</string>
+  <string name="sync_file_nothing_to_do_msg">Contingut de l\'arxiu ja sincronitzat</string>
   <string name="create_dir_fail_msg">La carpeta no s\'ha pogut crear</string>
   <string name="wait_a_moment">Espereu</string>
   <string name="filedisplay_unexpected_bad_get_content">S\'ha produït un problema inesperat; proveu una altra aplicació per seleccionar el fitxer</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">No s\'ha pogut obtenir el certificat del servidor</string>
   <string name="ssl_validator_question">Voleu confiar en aquest certificat igualment?</string>
   <string name="ssl_validator_not_saved">El certificat no s\'ha pogu desar</string>
+  <string name="ssl_validator_btn_details_see">Detalls</string>
+  <string name="ssl_validator_btn_details_hide">Amaga</string>
+  <string name="ssl_validator_label_subject">Enviat a:</string>
+  <string name="ssl_validator_label_issuer">Enviat per:</string>
+  <string name="ssl_validator_label_CN">Nom comú:</string>
+  <string name="ssl_validator_label_O">Organització:</string>
+  <string name="ssl_validator_label_OU">Unitat organitzativa:</string>
+  <string name="ssl_validator_label_C">País:</string>
+  <string name="ssl_validator_label_ST">Estat:</string>
+  <string name="ssl_validator_label_L">Ubicació:</string>
+  <string name="ssl_validator_label_validity">Validesa:</string>
+  <string name="ssl_validator_label_validity_from">Des de:</string>
+  <string name="ssl_validator_label_validity_to">A:</string>
+  <string name="ssl_validator_label_signature">Signatura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
   <string name="text_placeholder">Això és un text variable</string>
   <string name="instant_upload_on_wifi">Puja les fotos només via WiFi</string>
+  <string name="instant_upload_path">/CarregaInstantània</string>
+  <string name="conflict_title">Conflicte d\'actualització</string>
+  <string name="conflict_message">El fitxer remot %s no està sincronitzat amb el fitxer local. Si continueu es substituirà el contingut del fitxer en el servidor.</string>
+  <string name="conflict_keep_both">Mantén-los ambdós</string>
+  <string name="conflict_overwrite">Sobrescriu</string>
+  <string name="conflict_dont_upload">No el pugis</string>
 </resources>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 43559632..c6adef82 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Ahoj světe, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Heslo:</string>
   <string name="main_login">Uživatelské jméno:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Nastavení</string>
   <string name="main_tit_accsetup">Nastavit účet</string>
   <string name="main_wrn_accsetup">Nemáte nastavené žádné účty ownCloud. Aby bylo možné tuto aplikaci používat, musíte si nějaký vytvořit.</string>
+  <string name="about_message">klient ownCloud pro Android\n\nverze: %1$s</string>
   <string name="actionbar_sync">Obnovit</string>
   <string name="actionbar_upload">Odeslat</string>
   <string name="actionbar_upload_from_apps">Obsah z ostatních aplikací</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud nemá právo přistupovat ke sdílenému obsahu</string>
   <string name="uploader_info_uploading">Odesílání</string>
   <string name="uploader_btn_create_dir_text">Vytvořit adresář pro odesílání</string>
+  <string name="file_list_empty">Ve složce nejsou žádné soubory.\nNové soubory mohou být přidány pomocí volby \"Odeslat\".</string>
   <string name="filedetails_select_file">Více informací získáte klepnutím na soubor.</string>
   <string name="filedetails_size">Velikost:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Vytvořen:</string>
   <string name="filedetails_modified">Upraven:</string>
   <string name="filedetails_download">Stáhnout</string>
+  <string name="filedetails_sync_file">Obnovit</string>
   <string name="filedetails_redownload">Znovu stáhnout</string>
   <string name="filedetails_open">Otevřít</string>
+  <string name="filedetails_renamed_in_upload_msg">Soubor byl v průběhu odesílání přejmenován na %1$s</string>
   <string name="common_yes">Ano</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Zrušit stahování</string>
+  <string name="common_cancel_upload">Zrušit odesílání</string>
   <string name="common_cancel">Zrušit</string>
   <string name="common_save_exit">Uložit a ukončit</string>
   <string name="common_exit">Opustit ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Synchronizace selhala</string>
   <string name="sync_fail_content">Synchronizaci %1$s nelze dokončit</string>
+  <string name="sync_conflicts_in_favourites_ticker">Nalezeny konflikty</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d souborů z automatické synchronizace nelze synchronizovat</string>
+  <string name="sync_fail_in_favourites_ticker">Automatická synchronizace souborů selhala</string>
+  <string name="sync_fail_in_favourites_content">Obsah %1$d souborů nemohl být synchronizován (počet konfliktů: %2$d)</string>
   <string name="use_ssl">Použít zabezpečené spojení</string>
   <string name="location_no_provider">ownCloud nemůže sledovat vaše zařízení. Zkontroluje nastavení zjišťování polohy.</string>
   <string name="pincode_enter_pin_code">Zadejte PIN aplikace</string>
   <string name="pincode_enter_new_pin_code">Zadejte nový PIN aplikace</string>
   <string name="pincode_configure_your_pin">Zadat PIN ownCloud aplikace</string>
+  <string name="pincode_configure_your_pin_explanation">Při každém spuštění aplikace bude vyžadováno zadání PIN</string>
   <string name="pincode_reenter_your_pincode">Zopakovat PIN ownCloud aplikace</string>
   <string name="pincode_remove_your_pincode">Odstranit PIN ownCloud aplikace</string>
   <string name="pincode_mismatch">PINy se neshodují</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Nemohu navázat spojení</string>
   <string name="auth_secure_connection">Zabezpečené spojení navázáno</string>
   <string name="auth_login_details">Podrobnosti přihlášení</string>
+  <string name="auth_unauthorized">Neplatné přihlašovací údaje</string>
+  <string name="auth_not_found">Zadána neplatná cesta</string>
+  <string name="auth_internal">Interní chyba serveru, kód %1$d</string>
   <string name="crashlog_message">Aplikace neočekávaně skončila. Chcete odeslat zprávu o chybě?</string>
   <string name="crashlog_send_report">Odeslat zprávu</string>
   <string name="crashlog_dont_send_report">Neodesílat zprávu</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Přejmenovat</string>
   <string name="common_remove">Odstranit</string>
   <string name="confirmation_remove_alert">opravdu si přejete odstranit %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Opravdu si přejete odstranit %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Pouze místní</string>
+  <string name="confirmation_remove_folder_local">Pouze místní obsah</string>
   <string name="confirmation_remove_remote">Odstranit ze serveru</string>
   <string name="confirmation_remove_remote_and_local">Oboje, místní i vzdálené</string>
   <string name="remove_success_msg">Úspěšně odstraněno</string>
   <string name="remove_fail_msg">Odstranění nelze dokončit</string>
+  <string name="rename_dialog_title">Zadejte nový název</string>
   <string name="rename_local_fail_msg">Místní kopii nelze přejmenovat, zkuste jiný nový název</string>
   <string name="rename_server_fail_msg">Přejmenování nelze dokončit</string>
+  <string name="sync_file_fail_msg">Vzdálený soubor nemohl být zkontrolován</string>
+  <string name="sync_file_nothing_to_do_msg">Obsah souboru je již synchronizován</string>
   <string name="create_dir_fail_msg">Adresář nelze vytvořit</string>
   <string name="wait_a_moment">Počkejte chvíli</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočekávaný problém - zkuste zvolit soubor jinou aplikací</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Nelze získat certifikát serveru</string>
   <string name="ssl_validator_question">Přejete si přesto tomuto certifikátu důvěřovat?</string>
   <string name="ssl_validator_not_saved">Certifikát nelze uložit</string>
+  <string name="ssl_validator_btn_details_see">Detaily</string>
+  <string name="ssl_validator_btn_details_hide">Skrýt</string>
+  <string name="ssl_validator_label_subject">Vydáno pro:</string>
+  <string name="ssl_validator_label_issuer">Vydal:</string>
+  <string name="ssl_validator_label_CN">Běžný název:</string>
+  <string name="ssl_validator_label_O">Organizace:</string>
+  <string name="ssl_validator_label_OU">Organizační jednotka:</string>
+  <string name="ssl_validator_label_C">Země:</string>
+  <string name="ssl_validator_label_ST">Stát:</string>
+  <string name="ssl_validator_label_L">Umístění:</string>
+  <string name="ssl_validator_label_validity">Platnost:</string>
+  <string name="ssl_validator_label_validity_from">Od:</string>
+  <string name="ssl_validator_label_validity_to">Pro:</string>
+  <string name="ssl_validator_label_signature">Podpis:</string>
+  <string name="ssl_validator_label_signature_algorithm">Alogritmus:</string>
   <string name="text_placeholder">Zástupný text</string>
   <string name="instant_upload_on_wifi">Odesílat obrázky pouze skrze WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Konflikt při aktualizaci</string>
+  <string name="conflict_message">Vzdálený soubor %s není synchronizován s místním souborem. Pokračování přepíše obsah souboru na serveru.</string>
+  <string name="conflict_keep_both">Ponechat oba</string>
+  <string name="conflict_overwrite">Přepsat</string>
+  <string name="conflict_dont_upload">Nenahrávat</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1f2e1bbd..d68e05f2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hej Verden, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Kodeord:</string>
   <string name="main_login">Brugernavn:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Indstillinger</string>
   <string name="main_tit_accsetup">Opsæt konto</string>
   <string name="main_wrn_accsetup">Der er ingen ownCloud konti på enheden. For at bruge denne App, skal du oprette en.</string>
+  <string name="about_message">ownCloud Android klient\n\nversion: %1$s</string>
   <string name="actionbar_sync">Opdater</string>
   <string name="actionbar_upload">Upload</string>
   <string name="actionbar_upload_from_apps">Indhold fra andre apps</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud er ikke tilladt adgang til delt indhold</string>
   <string name="uploader_info_uploading">Uploader</string>
   <string name="uploader_btn_create_dir_text">Opret mappe til uploads</string>
+  <string name="file_list_empty">Der er ingen filer i denne mappe.\nNye filer kan tilføjes med menu valgmuligheden \"Upload\".</string>
   <string name="filedetails_select_file">Tryk på en fil for at vise yderligere information.</string>
   <string name="filedetails_size">Størelse:</string>
   <string name="filedetails_type">Type:</string>
   <string name="filedetails_created">Oprettet:</string>
   <string name="filedetails_modified">Ændret:</string>
   <string name="filedetails_download">Hent</string>
+  <string name="filedetails_sync_file">Opdater</string>
   <string name="filedetails_redownload">Download igen</string>
   <string name="filedetails_open">Åben</string>
+  <string name="filedetails_renamed_in_upload_msg">Filen blev omdøbt til %1$s under upload</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nej</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Afbryd download</string>
+  <string name="common_cancel_upload">Fortryd upload</string>
   <string name="common_cancel">Annuller</string>
   <string name="common_save_exit">Gem &amp; Afslut</string>
   <string name="common_exit">Forlad ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Kontakter</string>
   <string name="sync_fail_ticker">Synkronisering fejlede</string>
   <string name="sync_fail_content">Synkronisering af %1$s kunne ikke gennemføres</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konflikter fundet</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d hold-synkroniseret filer kunne ikke synkroniseres</string>
+  <string name="sync_fail_in_favourites_ticker">Hold-synkroniseret filer mislykkedes</string>
+  <string name="sync_fail_in_favourites_content">Indholdet af %1$d filer ikke kunne synkroniseres (%2$d konflikter)</string>
   <string name="use_ssl">Brug sikker forbindelse</string>
   <string name="location_no_provider">ownCloud kan ikke spore din enhed. Tjek venligst dine indstillinger for brug af GPS</string>
   <string name="pincode_enter_pin_code">Indsæt venligst din App PIN</string>
   <string name="pincode_enter_new_pin_code">Indsæt venligst din nye App PIN</string>
   <string name="pincode_configure_your_pin">Indtast ownCloud App PIN</string>
+  <string name="pincode_configure_your_pin_explanation">PIN koden vil blive anmodet om hver gang applikationen bliver startet</string>
   <string name="pincode_reenter_your_pincode">Indtast venligst ownCloud App PIN igen</string>
   <string name="pincode_remove_your_pincode">Fjern din ownCloud App PIN</string>
   <string name="pincode_mismatch">ownCloud App PIN er ikke ens</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Ikke ikke oprette forbindelse</string>
   <string name="auth_secure_connection">Sikker forbindelse oprettet</string>
   <string name="auth_login_details">Login detaljer</string>
+  <string name="auth_unauthorized">Ugyldig login / password</string>
+  <string name="auth_not_found">Forkert sti angivet</string>
+  <string name="auth_internal">Intern serverfejl, kode %1$d</string>
   <string name="crashlog_message">Applikation afsluttede mod forventning. Vil du indsende en fejl rapport?</string>
   <string name="crashlog_send_report">Send rapport</string>
   <string name="crashlog_dont_send_report">Send ikke rapport</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Omdøb</string>
   <string name="common_remove">Fjern</string>
   <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Ønsker du virkelig at %1$s og dets indhold skal fjernes</string>
   <string name="confirmation_remove_local">Kun lokal</string>
+  <string name="confirmation_remove_folder_local">Lokalt indhold kun</string>
   <string name="confirmation_remove_remote">Fjern fra server</string>
   <string name="confirmation_remove_remote_and_local">BÃ¥de fjernt og lokalt</string>
   <string name="remove_success_msg">Vellykket fjernelse</string>
   <string name="remove_fail_msg">Fjernelse kunne ikke fuldføres</string>
+  <string name="rename_dialog_title">Indtast et nyt navn</string>
   <string name="rename_local_fail_msg">Lokal kopi kunne ikke omdøbes; prøv et andet nyt navn</string>
   <string name="rename_server_fail_msg">Omdøbning kunne ikke gennemføres</string>
+  <string name="sync_file_fail_msg">Ekstern fil kunne ikke kontrolleres</string>
+  <string name="sync_file_nothing_to_do_msg">Filindholdet allerede synkroniseret</string>
   <string name="create_dir_fail_msg">Mappe kunne ikke oprettes</string>
   <string name="wait_a_moment">Vent et øjeblik</string>
   <string name="filedisplay_unexpected_bad_get_content">Uforventet problem; prøv venligst anden applikation til at vælge filen</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Serverens certifikat kunne ikke hentes</string>
   <string name="ssl_validator_question">Stoler du på certifikatet alligevel?</string>
   <string name="ssl_validator_not_saved">Certifikatet kunne ikke gemmes</string>
+  <string name="ssl_validator_btn_details_see">Detaljer</string>
+  <string name="ssl_validator_btn_details_hide">Gem</string>
+  <string name="ssl_validator_label_subject">Udstedt til:</string>
+  <string name="ssl_validator_label_issuer">Udstedt af:</string>
+  <string name="ssl_validator_label_CN">Almindeligt navn:</string>
+  <string name="ssl_validator_label_O">Organisation:</string>
+  <string name="ssl_validator_label_OU">Organisatorisk enhed:</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_ST">Stat:</string>
+  <string name="ssl_validator_label_L">Sted:</string>
+  <string name="ssl_validator_label_validity">Gyldighed:</string>
+  <string name="ssl_validator_label_validity_from">Fra:</string>
+  <string name="ssl_validator_label_validity_to">Til:</string>
+  <string name="ssl_validator_label_signature">Signatur:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
   <string name="text_placeholder">Dette er en pladsholder</string>
   <string name="instant_upload_on_wifi">Upload billeder kun via WiFi </string>
+  <string name="instant_upload_path">/Øjeblikkelig upload</string>
+  <string name="conflict_title">Opdaterings konflikt</string>
+  <string name="conflict_message">Ekstern fil %s er ikke synkroniseret med lokal fil. At fortsætte vil erstatte indholdet af filen på serveren.</string>
+  <string name="conflict_keep_both">Behold begge</string>
+  <string name="conflict_overwrite">Overskriv</string>
+  <string name="conflict_dont_upload">Upload ikke</string>
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index b528f1ae..ba1c2a3c 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -28,7 +28,7 @@
   <string name="prefs_select_oc_account">Account auswählen</string>
   <string name="prefs_summary_select_oc_account">Bitte wählen Sie, welches Konto von der App verwendet werden soll.</string>
   <string name="prefs_trackmydevice">Gerät verfolgen</string>
-  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in aktivieren</string>
+  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in dieser App aktivieren</string>
   <string name="prefs_trackmydevice_summary_on">Ihre App verfolgt dieses Gerät</string>
   <string name="prefs_trackmydevice_interval">Aktualisierungsintervall</string>
   <string name="prefs_trackmydevice_interval_summary">Alle %1$s Minuten aktualisieren</string>
@@ -36,8 +36,8 @@
   <string name="prefs_manage_accounts">Konten verwalten</string>
   <string name="prefs_pincode">App-PIN</string>
   <string name="prefs_pincode_summary">Schützen Sie Ihren Client</string>
-  <string name="prefs_instant_upload">Aktiviere Sie den sofortigen Upload</string>
-  <string name="prefs_instant_upload_summary">Laden Sie Fotos von der Kamera sofort hoch</string>
+  <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
+  <string name="prefs_instant_upload_summary">Laden Sie Ihre Fotos von der Kamera sofort hoch</string>
   <string name="auth_host_url">URL</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
@@ -62,7 +62,7 @@
   <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
   <string name="uploader_info_uploading">Lade hoch</string>
   <string name="uploader_btn_create_dir_text">Verzeichnis für hochzuladene Dateien erstellen</string>
-  <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien  können mit der Menüfunktion \"Hochladen\" hinzugefügt werden.</string>
+  <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der Menüfunktion \"Hochladen\" hinzugefügt werden.</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
   <string name="filedetails_type">Art:</string>
@@ -72,9 +72,11 @@
   <string name="filedetails_sync_file">Aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
   <string name="filedetails_open">Öffnen</string>
+  <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Download abbrechen</string>
   <string name="common_cancel_upload">Upload abbrechen</string>
   <string name="common_cancel">Abbrechen</string>
   <string name="common_save_exit">Speichern &amp; Schließen</string>
@@ -103,13 +105,17 @@
   <string name="sync_string_contacts">Kontakte</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d Synchronisationsdateien konnten nicht synchronisiert werden.</string>
+  <string name="sync_fail_in_favourites_ticker">Synchronisationsdateien konnten nicht synchronisiert werden.</string>
+  <string name="sync_fail_in_favourites_content">Inhalte von %1$d konnte nicht synchronisiert werden (%2$d Konflikte)</string>
   <string name="use_ssl">Sichere Verbindung benutzen</string>
   <string name="location_no_provider">%1$s kann Ihr Gerät nicht verfolgen. Bitte überprüfen Sie Ihre Standorteinstellungen.</string>
-  <string name="pincode_enter_pin_code">Bitte geben Sie Ihren App-PIN ein</string>
-  <string name="pincode_enter_new_pin_code">Bitte geben Sie Ihren neue App-PIN ein</string>
-  <string name="pincode_configure_your_pin">Bitte geben Sie Ihren App-PIN ein</string>
+  <string name="pincode_enter_pin_code">Bitte geben Sie Ihre App-PIN ein</string>
+  <string name="pincode_enter_new_pin_code">Bitte geben Sie Ihre neue App-PIN ein</string>
+  <string name="pincode_configure_your_pin">Bitte geben Sie Ihre App-PIN ein</string>
   <string name="pincode_configure_your_pin_explanation">PIN-Abfrage erfolgt nach Starten der App.</string>
-  <string name="pincode_reenter_your_pincode">Bitte geben Sie Ihren App-PIN erneut ein.</string>
+  <string name="pincode_reenter_your_pincode">Bitte geben Sie Ihre App-PIN erneut ein.</string>
   <string name="pincode_remove_your_pincode">App-PIN entfernen</string>
   <string name="pincode_mismatch">Die App-PINs stimmen nicht überein</string>
   <string name="pincode_wrong">Falsche App-PIN</string>
@@ -140,7 +146,7 @@
   <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
   <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen es erneut.</string>
   <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
-  <string name="auth_incorrect_path_message">Die App konnte die server unter dem angegebenen Pfad nicht finden. Bitte überprüfen Sie den Pfad und versuchen es erneut.</string>
+  <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfen Sie den Pfad und versuchen es erneut.</string>
   <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
   <string name="auth_incorrect_address_title">Fehlerhafte URL</string>
   <string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
@@ -149,23 +155,30 @@
   <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
   <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
   <string name="auth_login_details">Anmeldedetails</string>
+  <string name="auth_unauthorized">Benutzername oder Passwort ungültig</string>
+  <string name="auth_not_found">Falsche Pfadangabe</string>
+  <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
   <string name="crashlog_message">Die Anwendung ist abgestürzt. Möchten Sie einen Bericht senden?</string>
   <string name="crashlog_send_report">Bericht senden</string>
   <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
   <string name="extensions_avail_title">Erweiterung verfügbar!</string>
-  <string name="extensions_avail_message">Scheinbar unterstützt Ihre server weitere Erweiterungen. Möchten Sie die verfügbaren Erweiterungen für Android sehen?</string>
+  <string name="extensions_avail_message">Scheinbar unterstützt Ihr Server weitere Erweiterungen. Möchten Sie die verfügbaren Erweiterungen für Android sehen?</string>
   <string name="fd_keep_in_sync">Datei aktuell halten</string>
   <string name="common_share">Freigeben</string>
   <string name="common_rename">Umbenennen</string>
   <string name="common_remove">Löschen</string>
   <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
+  <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
+  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
   <string name="confirmation_remove_remote">Vom Server entfernen</string>
   <string name="confirmation_remove_remote_and_local">Lokal und auf dem Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
+  <string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string>
   <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuchen Sie es mit einem anderen neuen Namen.</string>
   <string name="rename_server_fail_msg">Die Umbenennung konnte nicht abgeschlossen werden.</string>
+  <string name="sync_file_fail_msg">Die entfernte Datei konnte nicht überprüft werden</string>
   <string name="sync_file_nothing_to_do_msg">Dateiinhalte bereits synchronisiert</string>
   <string name="create_dir_fail_msg">Das Verzeichnis konnte nicht erstellt werden.</string>
   <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
@@ -175,7 +188,7 @@
   <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
   <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid">- Das Zertifikat des Servers ist zu neu</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Das Gültigkeitsdatum des Serverzertifikats liegt in der Zukunft</string>
   <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen überein</string>
   <string name="ssl_validator_certificate_not_available">Das Zertifikat des Servers konnte nicht abgerufen werden</string>
   <string name="ssl_validator_question">Möchten Sie diesem Zertifikat trotzdem vertrauen?</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bca7c96b..3f557c97 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -26,9 +26,9 @@
   <string name="prefs_add_session">Neue Sitzung hinzufügen</string>
   <string name="prefs_create_img_thumbnails">Bildvorschau erstellen</string>
   <string name="prefs_select_oc_account">Account auswählen</string>
-  <string name="prefs_summary_select_oc_account">Bitte wähle, welches Accounts von der App verwendet werden soll.</string>
+  <string name="prefs_summary_select_oc_account">Bitte wähle, welches Konto von der App verwendet werden soll.</string>
   <string name="prefs_trackmydevice">Gerät verfolgen</string>
-  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in App aktivieren</string>
+  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in dieser App aktivieren</string>
   <string name="prefs_trackmydevice_summary_on">Deine App verfolgt dieses Gerät</string>
   <string name="prefs_trackmydevice_interval">Aktualisierungsintervall</string>
   <string name="prefs_trackmydevice_interval_summary">Alle %1$s Minuten aktualisieren</string>
@@ -36,8 +36,8 @@
   <string name="prefs_manage_accounts">Konten verwalten</string>
   <string name="prefs_pincode">App-PIN</string>
   <string name="prefs_pincode_summary">Schütze Deinen Client</string>
-  <string name="prefs_instant_upload">Aktiviere Sie den sofortigen Upload</string>
-  <string name="prefs_instant_upload_summary">Laden Sie Fotos von der Kamera sofort hoch</string>
+  <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
+  <string name="prefs_instant_upload_summary">Lade Deine Fotos von der Kamera sofort hoch</string>
   <string name="auth_host_url">URL</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
@@ -59,22 +59,24 @@
   <string name="uploader_wrn_no_account_quit_btn_text">Beenden</string>
   <string name="uploader_wrn_no_content_title">Keine Inhalte zum Hochladen vorhanden</string>
   <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
-  <string name="uploader_error_forbidden_content">%1$s darf den geteilten Inhalt nicht nutzen.</string>
+  <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
   <string name="uploader_info_uploading">Lade hoch</string>
   <string name="uploader_btn_create_dir_text">Ordner für hochzuladene Dateien erstellen</string>
-  <string name="file_list_empty">In diesem Ordner befinden sich keine Dateien.\nNeue Dateien können mit der \"Hochladen\" Menüfunktion hinzugefügt werden.</string>
+  <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der \"Hochladen\" Menüfunktion hinzugefügt werden.</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
   <string name="filedetails_type">Art:</string>
   <string name="filedetails_created">Erstellt:</string>
   <string name="filedetails_modified">Geändert:</string>
   <string name="filedetails_download">Herunterladen</string>
-  <string name="filedetails_sync_file">Neu laden</string>
+  <string name="filedetails_sync_file">Aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
   <string name="filedetails_open">Öffnen</string>
+  <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Download abbrechen</string>
   <string name="common_cancel_upload">Upload abbrechen</string>
   <string name="common_cancel">Abbrechen</string>
   <string name="common_save_exit">Speichern &amp; schließen</string>
@@ -103,6 +105,10 @@
   <string name="sync_string_contacts">Kontakte</string>
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d synchrongehaltene Dateien konnte nicht synchronisiert werden.</string>
+  <string name="sync_fail_in_favourites_ticker">Synchronhalten schlug fehl.</string>
+  <string name="sync_fail_in_favourites_content">Inhalte von %1$d konnte nicht synchronisiert werden (%2$d Konflikte)</string>
   <string name="use_ssl">Sichere Verbindung benutzen</string>
   <string name="location_no_provider">%1$s kann Dein Gerät nicht verfolgen. Bitte überprüfe Deine Standorteinstellungen</string>
   <string name="pincode_enter_pin_code">Bitte gib Deine App-PIN ein</string>
@@ -133,14 +139,14 @@
   <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine nicht sichere Verbindung ist nichtsdestotrotz verfügbar. Möchtest Du fortfahren oder abbrechen?</string>
   <string name="auth_connection_established">Verbindung hergestellt</string>
   <string name="auth_testing_connection">Verbindung testen...</string>
-  <string name="auth_not_configured_title">Falsch konfigurierte Server</string>
-  <string name="auth_not_configured_message">Es scheint, als wäre Deine server-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
+  <string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
+  <string name="auth_not_configured_message">Es scheint, als wäre Deine Server-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
   <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
   <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktiere Deinen Administrator unter Zu­hil­fe­nah­me der Log-Dateien Deines Gerätes.</string>
   <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
   <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfe den Hostnamen und die Verfügbarkeit des Servers und versuche es erneut.</string>
   <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
-  <string name="auth_incorrect_path_message">Die App konnte die server unter dem angegebenen Pfad nicht finden. Bitte überprüfe den Pfad und versuche es erneut.</string>
+  <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfe den Pfad und versuche es erneut.</string>
   <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
   <string name="auth_incorrect_address_title">Fehlerhafte URL</string>
   <string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
@@ -149,25 +155,32 @@
   <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
   <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
   <string name="auth_login_details">Anmeldedetails</string>
+  <string name="auth_unauthorized">Benutzername oder Passwort ungültig</string>
+  <string name="auth_not_found">Falsche Pfadangabe</string>
+  <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
   <string name="crashlog_message">Die Andwendung ist abgestürzt. Möchtest Du einen Bericht senden?</string>
   <string name="crashlog_send_report">Bericht senden</string>
   <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
   <string name="extensions_avail_title">Erweiterung verfügbar!</string>
-  <string name="extensions_avail_message">Scheinbar unterstützt Deine server weitere Erweiterungen. Möchtest Du die verfügbaren Erweiterungen für Android sehen?</string>
+  <string name="extensions_avail_message">Scheinbar unterstützt Dein Server weitere Erweiterungen. Möchtest Du die verfügbaren Erweiterungen für Android sehen?</string>
   <string name="fd_keep_in_sync">Datei aktuell halten</string>
   <string name="common_share">Teilen</string>
   <string name="common_rename">Umbenennen</string>
   <string name="common_remove">Löschen</string>
   <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
+  <string name="confirmation_remove_folder_alert">Möchtest Du wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
+  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
   <string name="confirmation_remove_remote">Vom Server entfernen</string>
   <string name="confirmation_remove_remote_and_local">Lokal und auf dem Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
-  <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuchen Sie es mit einem anderen neuen Namen.</string>
+  <string name="rename_dialog_title">Gib einen neuen Namen ein</string>
+  <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuche es mit einem anderen neuen Namen.</string>
   <string name="rename_server_fail_msg">Die Umbenennung konnte nicht abgeschlossen werden.</string>
+  <string name="sync_file_fail_msg">Die entfernte Datei konnte nicht überprüft werden</string>
   <string name="sync_file_nothing_to_do_msg">Dateiinhalte bereits synchronisiert</string>
-  <string name="create_dir_fail_msg">Das Ordner konnte nicht erstellt werden.</string>
+  <string name="create_dir_fail_msg">Das Verzeichnis konnte nicht erstellt werden.</string>
   <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
   <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
   <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
@@ -175,7 +188,7 @@
   <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
   <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid">- Das Zertifikat des Servers ist zu neu</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Das Gültigkeitsdatum des Serverzertifikats liegt in der Zukunft</string>
   <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen  überein</string>
   <string name="ssl_validator_certificate_not_available">Das Zertifikat des Servers konnte nicht abgerufen werden</string>
   <string name="ssl_validator_question">Möchtest Du diesem Zertifikat trotzdem vertrauen?</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3c432180..faac70df 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Καλώς Ήλθατε, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Συνθηματικό:</string>
   <string name="main_login">Όνομα Χρήστη:</string>
@@ -14,8 +13,9 @@
   <string name="main_settings">Ρυθμίσεις</string>
   <string name="main_tit_accsetup">Ρύθμιση Λογαριασμού</string>
   <string name="main_wrn_accsetup">Δεν υπάρχουν λογαριασμοί ownCloud στη συσκευή σας. Για να χρησιμοποιήσετε την εφαρμογή, πρέπει να δημιουργήσετε ένα.</string>
+  <string name="about_message">ownCloud εφαρμογή για Android\n\nέκδοση: %1$s</string>
   <string name="actionbar_sync">Ανανέωση </string>
-  <string name="actionbar_upload">Αποστολή αρχείου</string>
+  <string name="actionbar_upload">Μεταφόρτωση</string>
   <string name="actionbar_upload_from_apps">Περιεχόμενο από άλλες εφαρμογές</string>
   <string name="actionbar_upload_files">Αρχεία</string>
   <string name="actionbar_mkdir">Δημιουργία καταλόγου</string>
@@ -35,7 +35,7 @@
   <string name="prefs_accounts">Λογαριασμοί</string>
   <string name="prefs_manage_accounts">Διαχείριση λογαριασμών</string>
   <string name="prefs_pincode">PIN της εφαρμογής ownCloud</string>
-  <string name="prefs_pincode_summary">Προστατέψτε τους ownCloud πελάτες σας</string>
+  <string name="prefs_pincode_summary">Προστατέψτε την ownCloud εφαρμογή</string>
   <string name="prefs_instant_upload">Ενεργοποιήστε την άμεση μεταφόρτωση</string>
   <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση των φωτογραφιών που τραβάει η φωτογρ. μηχανή</string>
   <string name="auth_host_url">ownCloud URL</string>
@@ -45,34 +45,39 @@
   <string name="new_session_uri_error">Εσφαλμένη διεύθυνση URL</string>
   <string name="new_session_session_name_error">Εσφαλμένο όνομα συνεδρίας</string>
   <string name="sync_string_files">Αρχεία</string>
-  <string name="uploader_no_file_selected">Δεν επιλέχθηκε αρχείο προς αποστολή</string>
+  <string name="uploader_no_file_selected">Δεν επιλέχθηκε αρχείο για μεταφόρτωση</string>
   <string name="setup_hint_username">Όνομα χρήστη</string>
   <string name="setup_hint_password">Συνθηματικό</string>
   <string name="setup_hint_address">Διεύθυνση ιστοσελίδας</string>
   <string name="setup_hint_show_password">Προβολή κωδικού;</string>
   <string name="setup_title">Σύνδεση στο ownCloud σας</string>
   <string name="setup_btn_connect">Σύνδεση</string>
-  <string name="uploader_btn_upload_text">Αποστολή</string>
+  <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
   <string name="uploader_wrn_no_account_title">Δεν βρέθηκε λογαριασμός</string>
   <string name="uploader_wrn_no_account_text">Δεν υπάρχουν λογαριασμοί ownCloud στη συσκευή σας. Παρακαλώ ρυθμίστε πρώτα ένα λογαριασμό.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ρύθμιση</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Κλείσιμο</string>
-  <string name="uploader_wrn_no_content_title">Δεν υπάρχει περιεχόμενο για να ανεβάσετε</string>
-  <string name="uploader_wrn_no_content_text">Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να ανεβάσετε.</string>
+  <string name="uploader_wrn_no_content_title">Δεν υπάρχει περιεχόμενο για να μεταφορτώσετε</string>
+  <string name="uploader_wrn_no_content_text">Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να μεταφορτώσετε.</string>
   <string name="uploader_error_forbidden_content">Το ownCloud δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
-  <string name="uploader_info_uploading">Αποστολή</string>
-  <string name="uploader_btn_create_dir_text">Δημιουργία καταλόγου για αποστολή</string>
+  <string name="uploader_info_uploading">Μεταφόρτωση</string>
+  <string name="uploader_btn_create_dir_text">Δημιουργία καταλόγου για μεταφόρτωση</string>
+  <string name="file_list_empty">Δεν υπάρχουν αρχεία σε αυτόν τον φάκελο.\nΝέα αρχεία μπορούν να προστεθούν με την επιλογή \"Μεταφόρτωση\" του μενού.</string>
   <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
   <string name="filedetails_size">Μέγεθος:</string>
   <string name="filedetails_type">Τύπος:</string>
   <string name="filedetails_created">Δημιουργήθηκε:</string>
   <string name="filedetails_modified">Τροποποιήθηκε:</string>
   <string name="filedetails_download">Λήψη</string>
+  <string name="filedetails_sync_file">Ανανέωση </string>
   <string name="filedetails_redownload">Κατέβασμα ξανά</string>
   <string name="filedetails_open">Άνοιγμα</string>
+  <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά την μεταφόρτωση</string>
   <string name="common_yes">Ναι</string>
   <string name="common_no">Όχι</string>
   <string name="common_ok">ΟΚ</string>
+  <string name="common_cancel_download">Ακύρωση λήψης</string>
+  <string name="common_cancel_upload">Ακύρωση αποστολής</string>
   <string name="common_cancel">Άκυρο</string>
   <string name="common_save_exit">Αποθήκευση &amp; Έξοδος</string>
   <string name="common_exit">Κλείσιμο</string>
@@ -80,14 +85,14 @@
   <string name="about_title">Σχετικά</string>
   <string name="delete_account">Διαγραφή λογαριασμού</string>
   <string name="create_account">Δημιουργία λογαριασμού</string>
-  <string name="upload_chooser_title">Ανεβάστε από ...</string>
+  <string name="upload_chooser_title">Μεταφόρτωση από ...</string>
   <string name="uploader_info_dirname">Όνομα καταλόγου</string>
-  <string name="uploader_upload_in_progress_ticker">Ανεβαίνει ...</string>
+  <string name="uploader_upload_in_progress_ticker">Μεταφορτώνεται ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Μεταφορτώνονται %2$s</string>
-  <string name="uploader_upload_succeeded_ticker">Το ανέβασμα ολοκληρώθηκε επιτυχώς</string>
+  <string name="uploader_upload_succeeded_ticker">Η μεταφόρτωση ολοκληρώθηκε επιτυχώς</string>
   <string name="uploader_upload_succeeded_content_single">Το %1$s μεταφορτώθηκε με επιτυχία</string>
   <string name="uploader_upload_succeeded_content_multiple">%1$d αρχεία μεταφορτώθηκαν με επιτυχία</string>
-  <string name="uploader_upload_failed_ticker">Το ανέβασμα απέτυχε</string>
+  <string name="uploader_upload_failed_ticker">Η μεταφόρτωση απέτυχε</string>
   <string name="uploader_upload_failed_content_single">Η μεταφόρτωση του %1$s δεν ήταν δυνατόν να ολοκληρωθεί</string>
   <string name="uploader_upload_failed_content_multiple">Αποτυχία μεταφόρτωσης: %1$d/%2$d αρχεία μεταφορτώθηκαν</string>
   <string name="downloader_download_in_progress_ticker">Κατέβασμα ...</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Επαφές</string>
   <string name="sync_fail_ticker">Ο συγχρονισμός απέτυχε</string>
   <string name="sync_fail_content">Ο συγχρονισμός του %1$s  δεν μπόρεσε να ολοκληρωθεί</string>
+  <string name="sync_conflicts_in_favourites_ticker">Βρέθηκαν διενέξεις</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d αρχεία σε αναμονή συγχρονισμού, δεν μπόρεσαν να συγχρονιστούν</string>
+  <string name="sync_fail_in_favourites_ticker">Τα αρχεία σε αναμονή συγχρονισμού απέτυχαν</string>
+  <string name="sync_fail_in_favourites_content">Τα περιεχόμενα των %1$d αρχείων δεν μπόρεσαν να συγχρονιστούν (%2$d διενέξεις)</string>
   <string name="use_ssl">Χρήση ασφαλούς σύνδεσης</string>
   <string name="location_no_provider">Το ownCloud δεν μπορεί να ανιχνεύσει την τοποθεσία της συσκευής. Παρακαλώ ελέγξτε τις ρυθμίσεις σύνδεσης. </string>
   <string name="pincode_enter_pin_code">Παρακαλώ, εισάγετε το PIN σας</string>
   <string name="pincode_enter_new_pin_code">Παρακαλώ, εισάγετε το νέο PIN σας</string>
   <string name="pincode_configure_your_pin">Εισάγετε το PIN της εφαρμογής ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Το PIN θα ζητείται κάθε φορά στην εκκίνηση </string>
   <string name="pincode_reenter_your_pincode">Παρακαλώ επαναεισάγετε το PIN της εφαρμογής ownCloud</string>
   <string name="pincode_remove_your_pincode">Αφαιρέστε τον PIN της εφαρμογής ownCloud</string>
   <string name="pincode_mismatch">Δεν ταιριάζουν τα PIN της εφαρμογής ownCloud</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Δεν ήταν δυνατή η σύνδεση</string>
   <string name="auth_secure_connection">Επιτεύχθηκε ασφαλής σύνδεση</string>
   <string name="auth_login_details">Λεπτομέρειες σύνδεσης</string>
+  <string name="auth_unauthorized">Μη έγκυρο συνθηματικό εισόδου</string>
+  <string name="auth_not_found">Δόθηκε εσφαλμένη διαδρομή</string>
+  <string name="auth_internal">Εσωτερικό σφάλμα διακομιστή, κωδικός %1$d</string>
   <string name="crashlog_message">Η εφαρμογή τερματίστηκε ξαφνικά. Θα θέλατε να υποβάλετε αναφορά σφάλματος;</string>
   <string name="crashlog_send_report">Αποστολή αναφοράς</string>
   <string name="crashlog_dont_send_report">Να μην αποσταλεί αναφορά</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Μετονομασία</string>
   <string name="common_remove">Αφαίρεση</string>
   <string name="confirmation_remove_alert">Θέλετε να αφαιρέσετε το  %1$s ;</string>
+  <string name="confirmation_remove_folder_alert">Θέλετε στ\'αλήθεια να διαγράψετε το %1$s και τα περιεχόμενά του;</string>
   <string name="confirmation_remove_local">Μόνο τοπικά</string>
+  <string name="confirmation_remove_folder_local">Μόνο τοπικοί φάκελοι</string>
   <string name="confirmation_remove_remote">Αφαίρεση από το εξυπηρέτη</string>
   <string name="confirmation_remove_remote_and_local">Και απομακρυσμένα και τοπικά</string>
   <string name="remove_success_msg">Επιτυχημένη αφαίρεση</string>
   <string name="remove_fail_msg">Η αφαίρεση δεν μπορεί να ολοκληρωθεί</string>
+  <string name="rename_dialog_title">Εισάγετε νέο όνομα</string>
   <string name="rename_local_fail_msg">Το τοπικό αντίγραφο δεν ήταν δυνατόν να μετονομαστεί. Παρακαλώ επιλέξτε νέο όνομα. </string>
   <string name="rename_server_fail_msg">Η μετονομασία δεν ήταν επιτυχής</string>
+  <string name="sync_file_fail_msg">Αδυναμία ελέγχου του απομακρυσμένου αρχείου</string>
+  <string name="sync_file_nothing_to_do_msg">Τα περιεχόμενα του αρχείου έχουν ήδη συγχρονιστεί</string>
   <string name="create_dir_fail_msg">Ο κατάλογος δεν ήταν δυνατόν να δημιουργηθεί</string>
   <string name="wait_a_moment">Παρακαλούμε περιμένετε</string>
   <string name="filedisplay_unexpected_bad_get_content">Απροσδόκητο σφάλμα, δοκιμάστε με άλλη εφαρμογή</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Το πιστοποιητικό του διακομιστή δεν μπόρεσε να ανακτηθεί</string>
   <string name="ssl_validator_question">Θέλετε να θεωρείται έμπιστο το πιστοποιητικό αυτό ούτως ή άλλως;</string>
   <string name="ssl_validator_not_saved">Το πιστοποιητικό δεν ήταν δυνατόν να αποθηκευτεί</string>
+  <string name="ssl_validator_btn_details_see">Λεπτομέρειες</string>
+  <string name="ssl_validator_btn_details_hide">Απόκρυψη</string>
+  <string name="ssl_validator_label_subject">Εκδόθηκε σε:</string>
+  <string name="ssl_validator_label_issuer">Εκδόθηκε από:</string>
+  <string name="ssl_validator_label_CN">Κοινό όνομα:</string>
+  <string name="ssl_validator_label_O">Οργανισμός:</string>
+  <string name="ssl_validator_label_OU">Μονάδα Οργανισμού:</string>
+  <string name="ssl_validator_label_C">Χώρα:</string>
+  <string name="ssl_validator_label_ST">Πολιτεία</string>
+  <string name="ssl_validator_label_L">Τοποθεσία:</string>
+  <string name="ssl_validator_label_validity">Εγκυρότητα:</string>
+  <string name="ssl_validator_label_validity_from">Από:</string>
+  <string name="ssl_validator_label_validity_to">Μέχρι</string>
+  <string name="ssl_validator_label_signature">Υπογραφή:</string>
+  <string name="ssl_validator_label_signature_algorithm">Αλγόριθμος:</string>
   <string name="text_placeholder">Αυτό είναι ένα σημείο κράτησης θέσης</string>
-  <string name="instant_upload_on_wifi">Αποστολή εικόνων μόνο μέσω WiFi</string>
+  <string name="instant_upload_on_wifi">Μεταφόρτωση εικόνων μόνο μέσω WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Ενημέρωση σύγκρουσης</string>
+  <string name="conflict_message">Το απομακρυσμένο αρχείο %s δεν είναι συγχρονισμένο με το τοπικό. Η συνέχεια θα αντικαταστήσει το περιεχόμενο του αρχείου στον εξυπηρέτη. </string>
+  <string name="conflict_keep_both">Διατήρηση και των δύο</string>
+  <string name="conflict_overwrite">Αντικατάσταση</string>
+  <string name="conflict_dont_upload">Δεν μεταφορτώθηκε</string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 831dd896..adac8674 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Saluton, mondo, ĈefekranoDeOwnCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Pasvorto:</string>
   <string name="main_login">Uzantonomo:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Agordo</string>
   <string name="main_tit_accsetup">Agordi konton</string>
   <string name="main_wrn_accsetup">Estas neniu konto de ownCloud en via aparato. Por povi uzi ĉi tiun aplikaĵon, vi devas krei iun.</string>
+  <string name="about_message">Android-aplikaĵo %1$s\n\neldono: %2$s</string>
   <string name="actionbar_sync">Refreŝigi</string>
   <string name="actionbar_upload">Alŝuti dosieron</string>
   <string name="actionbar_upload_from_apps">Enhavo el aliaj aplikaĵoj</string>
@@ -61,16 +61,21 @@
   <string name="uploader_error_forbidden_content">ownCloud ne estas permesata aliri la kunhavigitan enhavon</string>
   <string name="uploader_info_uploading">Alŝutante</string>
   <string name="uploader_btn_create_dir_text">Krei dosierujon por alŝuto</string>
+  <string name="file_list_empty">Neniu dosiero estas en ĉi tiu dosierujo.\nNovajn dosierojn vi povas aldoni per la menuero “Alŝuti”.</string>
   <string name="filedetails_size">Grando:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Kreita je:</string>
   <string name="filedetails_modified">Modifita je:</string>
   <string name="filedetails_download">Elŝuti</string>
+  <string name="filedetails_sync_file">Refreŝigi</string>
   <string name="filedetails_redownload">Reelŝuti</string>
   <string name="filedetails_open">Malfermi</string>
+  <string name="filedetails_renamed_in_upload_msg">La dosiero alinomiĝis al %1$s dum alŝuto</string>
   <string name="common_yes">Jes</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">Akcepti</string>
+  <string name="common_cancel_download">Nuligi elŝuton</string>
+  <string name="common_cancel_upload">Nuligi alŝuton</string>
   <string name="common_cancel">Nuligi</string>
   <string name="common_save_exit">Konservi kaj forlasi</string>
   <string name="common_exit">Forlasi ownCloud-on</string>
@@ -98,6 +103,10 @@
   <string name="sync_string_contacts">Kontaktoj</string>
   <string name="sync_fail_ticker">Sinkronigo malsukcesis</string>
   <string name="sync_fail_content">Sinkronigo de %1$s ne povis plenumiĝi</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konfliktoj troviĝis</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d ade sinkronigataj dosieroj ne povis sinkroniĝi</string>
+  <string name="sync_fail_in_favourites_ticker">Malsukcesis ada sinkronigo de dosieroj</string>
+  <string name="sync_fail_in_favourites_content">Enhavoj de %1$d dosieroj ne povis sinkroniĝi (%2$d konfliktas)</string>
   <string name="use_ssl">Uzi sekuran konekton</string>
   <string name="location_no_provider">ownCloud ne povas spuri vian aparaton. Bonvolu kontroli vian lokagordon.</string>
   <string name="pincode_enter_pin_code">Bonvolu enigi vian PIN-on de aplikaĵo</string>
@@ -140,6 +149,9 @@
   <string name="auth_wrong_connection_title">Ne eblis starigi konekton</string>
   <string name="auth_secure_connection">Sekura konekto stariĝis</string>
   <string name="auth_login_details">Ensalutaj detaloj</string>
+  <string name="auth_unauthorized">Nevalida ensalutonomo/pasvorto</string>
+  <string name="auth_not_found">Malĝusta vojo doniĝis</string>
+  <string name="auth_internal">Ena servila eraro: kodo %1$d</string>
   <string name="crashlog_message">Aplikaĵo finis neatendite. Ĉu vi volus sendi paneoraporton?</string>
   <string name="crashlog_send_report">Sendi raporton</string>
   <string name="crashlog_dont_send_report">Ne sendi raporton</string>
@@ -149,18 +161,24 @@
   <string name="common_rename">Alinomigi</string>
   <string name="common_remove">Forigi</string>
   <string name="confirmation_remove_alert">Ĉu vi vere volas forigi %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Ĉu vi vere volas forigi %1$s kaj sian enhavon?</string>
   <string name="confirmation_remove_local">Nur loka</string>
+  <string name="confirmation_remove_folder_local">Nur lokaj enhavoj</string>
   <string name="confirmation_remove_remote">Forigi el la servilo</string>
   <string name="confirmation_remove_remote_and_local">Kaj malloka kaj loka</string>
   <string name="remove_success_msg">Forigo sukcesis</string>
   <string name="remove_fail_msg">Forigo ne eblis plenumiĝi</string>
+  <string name="rename_dialog_title">Enigu novan nomon</string>
   <string name="rename_local_fail_msg">Loka kopio ne povis alinomiĝi; provu malsaman novan nomon</string>
   <string name="rename_server_fail_msg">Alinomigo ne povis plenumiĝi</string>
+  <string name="sync_file_fail_msg">Malloka dosiero ne povis kontroliĝi</string>
+  <string name="sync_file_nothing_to_do_msg">Dosierenhavoj jam sinkroniĝis</string>
   <string name="create_dir_fail_msg">Dosierujo ne povis kreiĝi</string>
   <string name="wait_a_moment">Atendu momenton</string>
   <string name="filedisplay_unexpected_bad_get_content">Neatendita problemo; bonvolu provi alian aplikaĵon por elekti la dosieron</string>
   <string name="filedisplay_no_file_selected">Neniu dosiero elektiĝis</string>
   <string name="ssl_validator_title">Averto</string>
+  <string name="ssl_validator_header">La idento de la ejo ne povis kontroliĝi</string>
   <string name="ssl_validator_reason_cert_not_trusted">- La servila atestilo ne fidindas</string>
   <string name="ssl_validator_reason_cert_expired">- La servila atestilo eksvalidiĝis</string>
   <string name="ssl_validator_reason_cert_not_yet_valid">- La servila atestilo tro junas</string>
@@ -168,4 +186,24 @@
   <string name="ssl_validator_certificate_not_available">La servila atestilo ne povis ekhaviĝi</string>
   <string name="ssl_validator_question">Ĉu vi volas fidi ĉi tiun atestilon ĉiuokaze?</string>
   <string name="ssl_validator_not_saved">La atestino ne povis konserviĝi</string>
+  <string name="ssl_validator_btn_details_see">Detaloj</string>
+  <string name="ssl_validator_btn_details_hide">Malmontri</string>
+  <string name="ssl_validator_label_CN">Komuna nomo:</string>
+  <string name="ssl_validator_label_O">Organizaĵo:</string>
+  <string name="ssl_validator_label_OU">Organiza ero:</string>
+  <string name="ssl_validator_label_C">Lando:</string>
+  <string name="ssl_validator_label_ST">Ŝtato:</string>
+  <string name="ssl_validator_label_L">Loko:</string>
+  <string name="ssl_validator_label_validity">Valideco:</string>
+  <string name="ssl_validator_label_validity_from">El:</string>
+  <string name="ssl_validator_label_validity_to">Al:</string>
+  <string name="ssl_validator_label_signature">Subskribo:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
+  <string name="text_placeholder">Ĉi tio estas lokokupilo</string>
+  <string name="instant_upload_on_wifi">Alŝuti bildojn nur per WiFi</string>
+  <string name="conflict_title">Alŝuta konflikto</string>
+  <string name="conflict_message">La malloka dosiero %s estas ne sinkronigita kun loka dosiero. Se la ago daŭrus, enhavo de la dosiero en la servilo anstataŭiĝus.</string>
+  <string name="conflict_keep_both">Konservi ambaÅ­</string>
+  <string name="conflict_overwrite">AnstataÅ­igi</string>
+  <string name="conflict_dont_upload">Ne alŝuti</string>
 </resources>
diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index 0248ea2e..b3df23d8 100644
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">¡Bienvenido a la pantalla principal de OwnCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Password:</string>
   <string name="main_login">Nombre de usuario:</string>
   <string name="main_button_login">Entrar</string>
-  <string name="main_welcome">Bienvenido a tu ownCloud</string>
+  <string name="main_welcome">Bienvenido</string>
   <string name="main_files">Archivos</string>
   <string name="main_music">Música</string>
   <string name="main_contacts">Contactos</string>
@@ -13,7 +12,8 @@
   <string name="main_bookmarks">Marcadores</string>
   <string name="main_settings">Configuración</string>
   <string name="main_tit_accsetup">Configurar cuenta</string>
-  <string name="main_wrn_accsetup">No hay cuentas ownCloud en tu dispositivo. Para usar esta aplicación, tenés que crear una.</string>
+  <string name="main_wrn_accsetup">No hay cuentas en tu dispositivo. Para usar esta aplicación, tenés que crear una.</string>
+  <string name="about_message">%1$s para Android\n\nversión: %2$s</string>
   <string name="actionbar_sync">Recargar</string>
   <string name="actionbar_upload">Subir</string>
   <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
@@ -28,20 +28,20 @@
   <string name="prefs_select_oc_account">Elegir una cuenta</string>
   <string name="prefs_summary_select_oc_account">Elegí cual de tus cuentas esta aplicación debería usar.</string>
   <string name="prefs_trackmydevice">Rastreo de dispositivo</string>
-  <string name="prefs_trackmydevice_summary_off">Habilitar ownCloud para rastrear la localización de tu dispositivo</string>
-  <string name="prefs_trackmydevice_summary_on">Tu ownCloud está haciendo un seguimiento de este dispositivo</string>
+  <string name="prefs_trackmydevice_summary_off">Habilitar la localización de tu dispositivo</string>
+  <string name="prefs_trackmydevice_summary_on">La aplicación está haciendo un seguimiento de este dispositivo</string>
   <string name="prefs_trackmydevice_interval">Intervalo de actualización</string>
   <string name="prefs_trackmydevice_interval_summary">Actualizar cada %1$s minutos</string>
   <string name="prefs_accounts">Cuentas</string>
   <string name="prefs_manage_accounts">Gestionar cuentas</string>
-  <string name="prefs_pincode">PIN de la ownCloud App </string>
-  <string name="prefs_pincode_summary">Protejé tu cliente ownCloud</string>
+  <string name="prefs_pincode">PIN de aplicación</string>
+  <string name="prefs_pincode_summary">Protejé tu cliente</string>
   <string name="prefs_instant_upload">Habilitar la subida inmediata</string>
   <string name="prefs_instant_upload_summary">Subir inmediatamente las fotos sacadas con la cámara</string>
-  <string name="auth_host_url">URL de tu ownCloud</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Nombre de usuario</string>
   <string name="auth_password">Contraseña</string>
-  <string name="auth_register">Soy nuevo en ownCloud</string>
+  <string name="auth_register">Soy nuevo en %1$s</string>
   <string name="new_session_uri_error">La URL es incorrecta</string>
   <string name="new_session_session_name_error">Nombre de sesión equivocado</string>
   <string name="sync_string_files">Archivos</string>
@@ -50,40 +50,44 @@
   <string name="setup_hint_password">Contraseña</string>
   <string name="setup_hint_address">Dirección web</string>
   <string name="setup_hint_show_password">Mostrar contraseña?</string>
-  <string name="setup_title">Conectate a tu ownCloud</string>
+  <string name="setup_title">Conectate a tu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
-  <string name="uploader_wrn_no_account_text">No hay cuentas ownCloud en tu dispositivo. Creá una cuenta primero.</string>
+  <string name="uploader_wrn_no_account_text">No hay cuentas de %1$s en tu dispositivo. Creá una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
   <string name="uploader_wrn_no_content_title">No hay contenido para subir</string>
   <string name="uploader_wrn_no_content_text">No se recibió ningún contenido. No hay nada para subir.</string>
-  <string name="uploader_error_forbidden_content">ownCloud no está autorizado para acceder al contenido compartido</string>
+  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
   <string name="uploader_info_uploading">Subiendo</string>
   <string name="uploader_btn_create_dir_text">Crear directorio para subir</string>
-  <string name="file_list_empty">La carpeta seleccionada no contiene ningún archivo.\nPuede añadir ficheros con la opción de menú \"Subir\".</string>
+  <string name="file_list_empty">No hay archivos en este directorio.\nPodés agregar archivos a través de la opción del menú \"Subir\".</string>
   <string name="filedetails_select_file">Pulsá sobre un archivo para mostrar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Creado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
+  <string name="filedetails_sync_file">Recargar</string>
   <string name="filedetails_redownload">Volver a descargar</string>
   <string name="filedetails_open">Abrir</string>
+  <string name="filedetails_renamed_in_upload_msg">El archivo fue renombrado como %1$s durante la subida</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">Aceptar</string>
+  <string name="common_cancel_download">Cancelar descarga</string>
+  <string name="common_cancel_upload">Cancelar subida</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar y salir</string>
-  <string name="common_exit">Salir de ownCloud</string>
+  <string name="common_exit">Salir de %1$s</string>
   <string name="common_error">Error</string>
   <string name="about_title">Acerca de</string>
   <string name="delete_account">Eliminar cuenta</string>
   <string name="create_account">Crear cuenta</string>
-  <string name="upload_chooser_title">Subir desde &#8230;</string>
+  <string name="upload_chooser_title">Subir desde ...</string>
   <string name="uploader_info_dirname">Nombre del directorio</string>
-  <string name="uploader_upload_in_progress_ticker">Subiendo&#8230;</string>
+  <string name="uploader_upload_in_progress_ticker">Subiendo...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Subiendo %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Subido con éxito</string>
   <string name="uploader_upload_succeeded_content_single">%1$s se ha subido con éxito</string>
@@ -91,28 +95,32 @@
   <string name="uploader_upload_failed_ticker">Error al subir el archivo</string>
   <string name="uploader_upload_failed_content_single">No se pudo completar la subida de %1$s </string>
   <string name="uploader_upload_failed_content_multiple">Error al subir: %1$d/%2$d archivos fueron subidos</string>
-  <string name="downloader_download_in_progress_ticker">Descargando &#8230;</string>
+  <string name="downloader_download_in_progress_ticker">Descargando ...</string>
   <string name="downloader_download_in_progress_content">%1$d%%  descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completa</string>
   <string name="downloader_download_succeeded_content">%1$s fue descargado con éxito</string>
   <string name="downloader_download_failed_ticker">Error al descargar</string>
-  <string name="downloader_download_failed_content">La descarga de %1$s no se pudo completar</string>
+  <string name="downloader_download_failed_content">No fue posible completar la descarga de %1$s</string>
   <string name="common_choose_account">Elegí una cuenta</string>
   <string name="sync_string_contacts">Contactos</string>
   <string name="sync_fail_ticker">Error en la sincronización</string>
   <string name="sync_fail_content">No se pudo completar la sincronización de %1$s </string>
+  <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
+  <string name="sync_conflicts_in_favourites_content">No se pudieron sincronizar %1$d archivos</string>
+  <string name="sync_fail_in_favourites_ticker">Fallo la sincronización de archivos</string>
+  <string name="sync_fail_in_favourites_content">%1$d archivos no pudieron ser sincronizados (%2$d conflictos)</string>
   <string name="use_ssl">Usar conexión segura</string>
-  <string name="location_no_provider">ownCloud no puede rastear tu dispositivo. Verificá la configuración de localización</string>
+  <string name="location_no_provider">%1$s no puede rastear tu dispositivo. Verificá la configuración de localización</string>
   <string name="pincode_enter_pin_code">Por favor, escribí el PIN de la aplicación</string>
   <string name="pincode_enter_new_pin_code">Por favor, escribí el nuevo PIN de la aplicación</string>
-  <string name="pincode_configure_your_pin">Ingresá el PIN de la aplicación ownCloud</string>
-  <string name="pincode_configure_your_pin_explanation">El PIN se solicitará cada vez que se inicie la aplicación</string> 
-  <string name="pincode_reenter_your_pincode">Por favor, ingresá nuevamente el PIN de la aplicación ownCloud</string>
-  <string name="pincode_remove_your_pincode">Borrar tu PIN de la aplicación ownCloud</string>
-  <string name="pincode_mismatch">Los PIN de la aplicación ownCloud no son iguales</string>
-  <string name="pincode_wrong">El PIN de la aplicación ownCloud es incorrecto</string>
-  <string name="pincode_removed">El PIN de la aplicación ownCloud fue borrado</string>
-  <string name="pincode_stored">El PIN de la aplicación ownCloud fue almacenado</string>
+  <string name="pincode_configure_your_pin">Ingresá el PIN de la aplicación</string>
+  <string name="pincode_configure_your_pin_explanation">Se te pedirá el PIN cada vez que esta app sea iniciada.</string>
+  <string name="pincode_reenter_your_pincode">Por favor, ingresá nuevamente el PIN de la aplicación</string>
+  <string name="pincode_remove_your_pincode">Borrar tu PIN de la aplicación</string>
+  <string name="pincode_mismatch">Los PIN no son iguales</string>
+  <string name="pincode_wrong">El PIN de la aplicación es incorrecto</string>
+  <string name="pincode_removed">El PIN de la aplicación fue borrado</string>
+  <string name="pincode_stored">El PIN de la aplicación fue almacenado</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutos</item>
     <item>30 minutos</item>
@@ -123,60 +131,89 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Intentado iniciar sesión&#8230;</string>
+  <string name="auth_trying_to_login">Intentado iniciar sesión...</string>
   <string name="auth_no_net_conn_title">Sin conexión de red</string>
   <string name="auth_no_net_conn_message">No se ha detectado una conexión de red, revisá tu conexión a internet e intentá nuevamente.</string>
   <string name="auth_connect_anyway">Conectar de todos modos</string>
   <string name="auth_nossl_plain_ok_title">Conexión segura no disponible.</string>
   <string name="auth_nossl_plain_ok_message">La aplicación no pudo establecer una conexión segura al servidor. Aunque no haya una conexión segura disponible, podés continuar o cancelar.</string>
   <string name="auth_connection_established">Conexión establecida</string>
-  <string name="auth_testing_connection">Probando conexión&#8230;</string>
-  <string name="auth_not_configured_title">Configuración de ownCloud en formato incorrecto</string>
-  <string name="auth_not_configured_message">Parece ser que la instancia de ownCloud no está configurada correctamente. Comunicate con el administrador para más detalles.</string>
+  <string name="auth_testing_connection">Probando conexión...</string>
+  <string name="auth_not_configured_title">Configuración de servidor en formato incorrecto</string>
+  <string name="auth_not_configured_message">Parece ser que la instancia de tu servidor no está configurada correctamente. Comunicate con el administrador para más detalles.</string>
   <string name="auth_unknown_error_title">¡Ocurrió un error desconocido!</string>
   <string name="auth_unknown_error_message">Ocurrió un error desconocido. Por favor, comunicate con los autores e incluí los registros de tu dispositivo.</string>
   <string name="auth_unknown_host_title">No fue posible encontrar la dirección</string>
-  <string name="auth_unknown_host_message">No se pudo encontrar el servidor. Consultá si el servidor está disponible y su dirección e intentalo nuevamete.</string>
-  <string name="auth_incorrect_path_title">Instancia de ownCloud no encontrada</string>
-  <string name="auth_incorrect_path_message">La aplicación no pudo encontrar la instancia de ownCloud en la ruta de acceso dada. Por favor verificá la ruta de acceso e intentalo nuevamente.</string>
+  <string name="auth_unknown_host_message">No se pudo encontrar el servidor. Consultá si el servidor está disponible, su dirección, e intentalo nuevamete.</string>
+  <string name="auth_incorrect_path_title">Instancia de servidor no encontrada</string>
+  <string name="auth_incorrect_path_message">La aplicación no pudo encontrar la instancia del servidor en la ruta de acceso dada. Por favor verificá la ruta de acceso e intentalo nuevamente.</string>
   <string name="auth_timeout_title">El servidor tardó demasiado en responder</string>
   <string name="auth_incorrect_address_title">URL no válida</string>
   <string name="auth_ssl_general_error_title">Error al inicializar el SSL</string>
   <string name="auth_ssl_unverified_server_title">No se puede verificar la Identidad del servidor SSL</string>
-  <string name="auth_bad_oc_version_title">No es posible reconocer la versión del servidor ownCloud </string>
+  <string name="auth_bad_oc_version_title">No es posible reconocer la versión del servidor</string>
   <string name="auth_wrong_connection_title">No fue posible establecer la conexión</string>
   <string name="auth_secure_connection">Conexión segura establecida</string>
   <string name="auth_login_details">Detalles de inicio de sesión</string>
+  <string name="auth_unauthorized">Nombre / contraseña incorrectos</string>
+  <string name="auth_not_found">Ruta incorrecta</string>
+  <string name="auth_internal">Error interno en el servidor, código %1$d</string>
   <string name="crashlog_message">La aplicación finalizó inesperadamente. ¿Querés mandar un reporte de error?</string>
   <string name="crashlog_send_report">Enviar reporte</string>
   <string name="crashlog_dont_send_report">No enviar reporte</string>
   <string name="extensions_avail_title">¡Hay extensiones disponibles!</string>
-  <string name="extensions_avail_message">Parece que tu instancia de ownCloud soporta extensiones avanzadas. ¿Querés ver las extensiones disponibles para Android?</string>
+  <string name="extensions_avail_message">Parece que tu instancia de servidor soporta extensiones avanzadas. ¿Querés ver las extensiones disponibles para Android?</string>
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_share">Compartir</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Estás seguro que querés borrar %1$s ?</string>
+  <string name="confirmation_remove_alert">¿Estás seguro que querés borrar %1$s?</string>
+  <string name="confirmation_remove_folder_alert">¿Realmente quieres borrar %1$s y todos sus contenidos ?</string>
   <string name="confirmation_remove_local">Sólo local</string>
+  <string name="confirmation_remove_folder_local">Solo archivos locales</string>
   <string name="confirmation_remove_remote">Borrar del servidor</string>
-  <string name="confirmation_remove_remote_and_local">Remoto y local</string>
+  <string name="confirmation_remove_remote_and_local">Ambos: remoto y local</string>
   <string name="remove_success_msg">Borrado correctamente</string>
   <string name="remove_fail_msg">El borrado no pudo ser completado</string>
-  <string name="rename_local_fail_msg">No fue posible cambiar el nombre de la copia local, intentalo con un nombre differente</string>
+  <string name="rename_dialog_title">Ingrese un nombre</string>
+  <string name="rename_local_fail_msg">No fue posible cambiar el nombre de la copia local, intentalo con un nombre diferente</string>
   <string name="rename_server_fail_msg">No se pudo cambiar el nombre</string>
+  <string name="sync_file_fail_msg">No pudo comprobarse el archivo remoto</string>
+  <string name="sync_file_nothing_to_do_msg">Ya está sincronizado</string>
   <string name="create_dir_fail_msg">No fue posible crear el directorio</string>
   <string name="wait_a_moment">Esperá un momento</string>
-  <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, intentá otra aplicación para abrir el archivo</string>
+  <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, intentá con otra aplicación para abrir el archivo</string>
   <string name="filedisplay_no_file_selected">No se seleccionó ningún archivo</string>
   <string name="ssl_validator_title">Alerta</string>
   <string name="ssl_validator_header">La identidad del sitio no pudo ser verificada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es confiable</string>
   <string name="ssl_validator_reason_cert_expired">- El certificado del servidor caducó</string>
   <string name="ssl_validator_reason_cert_not_yet_valid">- El certificado del servidor es demasiado nuevo</string>
-  <string name="ssl_validator_reason_hostname_not_verified">- La URL no se condice con el nomber del servidor en el certificado</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- La URL no se condice con el nombre del servidor en el certificado</string>
   <string name="ssl_validator_certificate_not_available">No se pudo obtener el certificado del servidor </string>
-  <string name="ssl_validator_question">Confiás en el certificado de todos modos?</string>
+  <string name="ssl_validator_question">¿Confiás en el certificado de todos modos?</string>
   <string name="ssl_validator_not_saved">No fue posible guardar el certificado</string>
+  <string name="ssl_validator_btn_details_see">Detalles</string>
+  <string name="ssl_validator_btn_details_hide">Ocultar</string>
+  <string name="ssl_validator_label_subject">Generado para:</string>
+  <string name="ssl_validator_label_issuer">Generado por:</string>
+  <string name="ssl_validator_label_CN">Nombre común:</string>
+  <string name="ssl_validator_label_O">Organización:</string>
+  <string name="ssl_validator_label_OU">Unidad de la organización:</string>
+  <string name="ssl_validator_label_C">Pais:</string>
+  <string name="ssl_validator_label_ST">Provincia:</string>
+  <string name="ssl_validator_label_L">Ubicación:</string>
+  <string name="ssl_validator_label_validity">Validez:</string>
+  <string name="ssl_validator_label_validity_from">De:</string>
+  <string name="ssl_validator_label_validity_to">Para:</string>
+  <string name="ssl_validator_label_signature">Firma:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
   <string name="text_placeholder">Este es un texto temporario</string>
   <string name="instant_upload_on_wifi">Subir imágenes solamente a través de WiFi</string>
+  <string name="instant_upload_path">/SubidasInstantáneas</string>
+  <string name="conflict_title">Conflicto en la actualización</string>
+  <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si seguís adelante, vas a reemplazar el contenido del archivo en el servidor.</string>
+  <string name="conflict_keep_both">Mantener ambas</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">No subir</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 5f39ef48..400aeb4f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Tere maailm, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Parool:</string>
   <string name="main_login">Kasutajanimi:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Seaded</string>
   <string name="main_tit_accsetup">Konto seadistamine</string>
   <string name="main_wrn_accsetup">Sinu seadmes pole ühtegi ownCloudi kontot. Selle rakenduse kasutamiseks pead sa ühe looma.</string>
+  <string name="about_message">ownCloud Androidi klient\n\nversioon: %1$s</string>
   <string name="actionbar_sync">Värskenda</string>
   <string name="actionbar_upload">Lae fail üles</string>
   <string name="actionbar_upload_from_apps">Sisu teistest rakendustest</string>
@@ -62,17 +62,21 @@
   <string name="uploader_error_forbidden_content">ownCloudile pole lubatud ligipääs jagatud sisule</string>
   <string name="uploader_info_uploading">Üleslaadimine</string>
   <string name="uploader_btn_create_dir_text">Loo üleslaadimise jaoks kaust</string>
+  <string name="file_list_empty">Selles kaustas pole ühtegi faili.\nUusi faile saab lisada kasutades menüü valikut \"Lae üles\".</string>
   <string name="filedetails_select_file">Lisainfo vaatamiseks vajuta failile.</string>
   <string name="filedetails_size">Suurus:</string>
   <string name="filedetails_type">Tüüp:</string>
   <string name="filedetails_created">Loodud:</string>
   <string name="filedetails_modified">Muudetud:</string>
   <string name="filedetails_download">Lae alla</string>
+  <string name="filedetails_sync_file">Värskenda</string>
   <string name="filedetails_redownload">Lae uuesti alla</string>
   <string name="filedetails_open">Ava</string>
   <string name="common_yes">Jah</string>
   <string name="common_no">Ei</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Tühista allalaadimine</string>
+  <string name="common_cancel_upload">Tühista üleslaadimine</string>
   <string name="common_cancel">Loobu</string>
   <string name="common_save_exit">Salvesta &amp; Välju</string>
   <string name="common_exit">Lahku ownCloudist</string>
@@ -100,11 +104,13 @@
   <string name="sync_string_contacts">Kontaktid</string>
   <string name="sync_fail_ticker">Sünkroniseerimine ebaõnnestus</string>
   <string name="sync_fail_content">%1$s sünkroniseerimise lõpetamine ebaõnnestus</string>
+  <string name="sync_conflicts_in_favourites_ticker">Leite konflikte</string>
   <string name="use_ssl">Kasuta turvalist ühendust</string>
   <string name="location_no_provider">ownCloud ei saa sinu seadet jälgida. Palun kontrolli oma asukoha seadeid</string>
   <string name="pincode_enter_pin_code">Palun sisesta oma rakenduse PIN</string>
   <string name="pincode_enter_new_pin_code">Palun sisesta oma rakenduse uus PIN</string>
   <string name="pincode_configure_your_pin">Palun ownCloudi rakenduse PIN</string>
+  <string name="pincode_configure_your_pin_explanation">PIN-i nõutakse iga kord, kui rakendus käivitatakse</string>
   <string name="pincode_reenter_your_pincode">Palun sisesta oma ownCloudi rakenduse PIN uuesti</string>
   <string name="pincode_remove_your_pincode">Eemalda oma ownCloud rakenduse PIN</string>
   <string name="pincode_mismatch">Mõlemad ownCloudi rakenduse PIN-id pole samad</string>
@@ -145,6 +151,9 @@
   <string name="auth_wrong_connection_title">Ühenduse loomine ebaõnnestus</string>
   <string name="auth_secure_connection">Saavutati turvaline ühendus</string>
   <string name="auth_login_details">Sisselogimise andmed</string>
+  <string name="auth_unauthorized">Vigane kasutajanimi /parool</string>
+  <string name="auth_not_found">Sisestati vale asukoht</string>
+  <string name="auth_internal">Sisemine serveri viga, kood %1$d</string>
   <string name="crashlog_message">Rakdnus suleti ootamatult. Kas sa sooviksid saata kokkujooksmise kohta teavitust arendajale?</string>
   <string name="crashlog_send_report">Saada veateade</string>
   <string name="crashlog_dont_send_report">Ära saada veateadet</string>
@@ -155,13 +164,18 @@
   <string name="common_rename">Nimeta ümber</string>
   <string name="common_remove">Eemalda</string>
   <string name="confirmation_remove_alert">Oled sa kindel, et soovid %1$s eemaldada ?</string>
+  <string name="confirmation_remove_folder_alert">Kas sa tõesti soovid eemaldada %1$s ja selle sisu ?</string>
   <string name="confirmation_remove_local">Ainult kohalik</string>
+  <string name="confirmation_remove_folder_local">Ainult kohalik sisu</string>
   <string name="confirmation_remove_remote">Eemalda serverist</string>
   <string name="confirmation_remove_remote_and_local">Mõlemad nii eemalolev kui ka kohalik</string>
   <string name="remove_success_msg">Eemaldamine oli edukas</string>
   <string name="remove_fail_msg">Eemaldamist ei suudetud lõpetada</string>
+  <string name="rename_dialog_title">Sisesta uus nimi</string>
   <string name="rename_local_fail_msg">Kohalikku faili ei saa ümber nimetada; proovi teist uut nime</string>
   <string name="rename_server_fail_msg">Ümbernimetamine ebaõnnestus</string>
+  <string name="sync_file_fail_msg">Mujaloleva faili kontrollimine ebaõnnestus</string>
+  <string name="sync_file_nothing_to_do_msg">Faili sisu on juba sünkroniseeritud</string>
   <string name="create_dir_fail_msg">Kausta loomine ebaõnnestus</string>
   <string name="wait_a_moment">Oota hetk</string>
   <string name="filedisplay_unexpected_bad_get_content">Ootamatu tõrge ; palun kasuta faili valimiseks mõnda teist rakendust</string>
@@ -175,6 +189,21 @@
   <string name="ssl_validator_certificate_not_available">Serveri sertifikaati ei õnnestunud hankida</string>
   <string name="ssl_validator_question">Kas sa soovid siiski seda sertifikaati usaldada?</string>
   <string name="ssl_validator_not_saved">Sertifikaadi salvestamine ebaõnnestus</string>
+  <string name="ssl_validator_btn_details_see">Üksikasjad</string>
+  <string name="ssl_validator_btn_details_hide">Peida</string>
+  <string name="ssl_validator_label_O">Organisatsioon:</string>
+  <string name="ssl_validator_label_OU">Organisatsiooni üksus:</string>
+  <string name="ssl_validator_label_C">Riik:</string>
+  <string name="ssl_validator_label_ST">Maakond:</string>
+  <string name="ssl_validator_label_L">Asukoht:</string>
+  <string name="ssl_validator_label_validity">Kehtivus:</string>
+  <string name="ssl_validator_label_signature">Allkiri:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritm:</string>
   <string name="text_placeholder">See on kohahoidja</string>
   <string name="instant_upload_on_wifi">Lae pilte üles ainult läbi WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Uuenduse konflikt</string>
+  <string name="conflict_keep_both">Säilita mõlemad</string>
+  <string name="conflict_overwrite">Kirjuta üle</string>
+  <string name="conflict_dont_upload">Ära uuenda</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d23b8ca2..fc31ce0f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Kaixo Mundua, OwnClouden Pantaila Nagusia!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Pasahitza:</string>
   <string name="main_login">Erabiltzaile izena:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Ezarpenak</string>
   <string name="main_tit_accsetup">Konfiguratu kontua</string>
   <string name="main_wrn_accsetup"> Ez dago ownCloud konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
+  <string name="about_message">ownCloud Android bezeroa\n\nBertsioa: %1$s</string>
   <string name="actionbar_sync">Birkargatu</string>
   <string name="actionbar_upload">Igo fitxategia</string>
   <string name="actionbar_upload_from_apps">Beste app-en edukia</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloudek ez du baimenik partekatutako edukian sartzeko</string>
   <string name="uploader_info_uploading">Igotzen</string>
   <string name="uploader_btn_create_dir_text">Sortu igotzeko karpeta bat</string>
+  <string name="file_list_empty">Ez dago fitxategirik karpeta honetan.\nFitxategi berriak \"Igo\" menu aukerarekin gehi daitezke.</string>
   <string name="filedetails_select_file">Sakatu fitxategi baten gainean informazio gehiago lortzeko</string>
   <string name="filedetails_size">Tamaina:</string>
   <string name="filedetails_type">Mota:</string>
   <string name="filedetails_created">Sortuta:</string>
   <string name="filedetails_modified">Aldatuta:</string>
   <string name="filedetails_download">Deskargatu</string>
+  <string name="filedetails_sync_file">Birkargatu</string>
   <string name="filedetails_redownload">Birdeskargatzen</string>
   <string name="filedetails_open">Ireki</string>
+  <string name="filedetails_renamed_in_upload_msg">Fitxategiaren izena %1$sra aldatu da igotzean</string>
   <string name="common_yes">Bai</string>
   <string name="common_no">Ez</string>
   <string name="common_ok">Ados</string>
+  <string name="common_cancel_download">Utzi deskarga bertan behera </string>
+  <string name="common_cancel_upload">Ezeztatu igoera</string>
   <string name="common_cancel">Ezeztatu</string>
   <string name="common_save_exit">Gorde eta Irten</string>
   <string name="common_exit">Utzi ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Kontaktuak</string>
   <string name="sync_fail_ticker">Sinkronizazioak huts egin du</string>
   <string name="sync_fail_content">%1$s fitxategiaren sinkronizazioa ezin da burutu</string>
+  <string name="sync_conflicts_in_favourites_ticker">Gatazkak aurkituak </string>
+  <string name="sync_conflicts_in_favourites_content">sinkronizatu beharreko %1$d fitxategiak ezin dira sinkronizatu</string>
+  <string name="sync_fail_in_favourites_ticker">edukien sinkronizazioak huts egin du</string>
+  <string name="sync_fail_in_favourites_content">%1$d fitxategien edukiak ezin dira sinkronizatu (%2$d gatazka)</string>
   <string name="use_ssl">Erabili konexio segurua</string>
   <string name="location_no_provider">ownCloudek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
   <string name="pincode_enter_pin_code">Mesedez, sartu zure aplikazioaren PINa</string>
   <string name="pincode_enter_new_pin_code">Mesedez, sartu zure aplikazioaren PIN berria</string>
   <string name="pincode_configure_your_pin">Sartu ownCloud aplikazioaren PINa</string>
+  <string name="pincode_configure_your_pin_explanation">PINa aplikazioa abiarazten den bakoitzean eskatuko da</string>
   <string name="pincode_reenter_your_pincode">Sartu berriz ownCloud aplikazioarenPINa, mesedez</string>
   <string name="pincode_remove_your_pincode">Ezabatu zure ownCloud aplikazioaren PINa</string>
   <string name="pincode_mismatch">ownCloud aplikazioko bi PINak ez dira berdinak</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Ezin izan da konexioa egin</string>
   <string name="auth_secure_connection">Konexio segurua ezarri da</string>
   <string name="auth_login_details">Saio hasierako ezarpenak</string>
+  <string name="auth_unauthorized">Erabiltzaile / pasahitz baliogabea</string>
+  <string name="auth_not_found">Okerreko bidea emanda</string>
+  <string name="auth_internal">Barne zerbitzari errorea, kodea: %1$d</string>
   <string name="crashlog_message">Programa ezustekoan bukatu da. Nahiko zenuke huts egitearen berri eman?</string>
   <string name="crashlog_send_report">Bidali txostena</string>
   <string name="crashlog_dont_send_report">Ez bidali txostena</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Berrizendatu</string>
   <string name="common_remove">Ezabatu</string>
   <string name="confirmation_remove_alert">Nahi duzu %1$s ezabatu?</string>
+  <string name="confirmation_remove_folder_alert">Benetan %1$s eta bere eduki guztiak ezabatu nahi dituzu?</string>
   <string name="confirmation_remove_local">Bertakoa bakarrik</string>
+  <string name="confirmation_remove_folder_local">Eduki lokalak bakarrik</string>
   <string name="confirmation_remove_remote">Zerbitzaritik ezabatu</string>
   <string name="confirmation_remove_remote_and_local">Biak urrunekoa eta bertakoa</string>
   <string name="remove_success_msg">Ongi ezabatu da</string>
   <string name="remove_fail_msg">Ezin izan da ezabaketa burutu</string>
+  <string name="rename_dialog_title">Idatzi izen berri bat</string>
   <string name="rename_local_fail_msg">Bertako kopia ezin da izenez aldatu, saiatu beste izen batekin</string>
   <string name="rename_server_fail_msg">Izen aldaketa ezin izan da burutu</string>
+  <string name="sync_file_fail_msg">Urruneko fitxategia ezin izan da arakatu</string>
+  <string name="sync_file_nothing_to_do_msg">Fitxategi edukiak dagoeneko sinkronizaturik</string>
   <string name="create_dir_fail_msg">Karpeta ezin da sortu</string>
   <string name="wait_a_moment">Itxaron momentu bat</string>
   <string name="filedisplay_unexpected_bad_get_content">Ezusteko arazoa; mesedez, saiatu beste app batekin fitxategia hautatzeko</string>
@@ -175,6 +193,21 @@
   <string name="ssl_validator_certificate_not_available">Zerbitzariaren ziurtagiria ezin da lortu</string>
   <string name="ssl_validator_question">Nahi duzu, hala ere, ziurtagiriaz fidatu?</string>
   <string name="ssl_validator_not_saved">Ziurtagiria ezin da gorde</string>
+  <string name="ssl_validator_btn_details_see">Xehetasunak</string>
+  <string name="ssl_validator_btn_details_hide">Ezkutatu</string>
+  <string name="ssl_validator_label_CN">Izen arrunta:</string>
+  <string name="ssl_validator_label_O">Erakundea:</string>
+  <string name="ssl_validator_label_C">Herrialdea:</string>
+  <string name="ssl_validator_label_ST">Estatua:</string>
+  <string name="ssl_validator_label_L">Kokapena:</string>
+  <string name="ssl_validator_label_signature">Sinadura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmoa:</string>
   <string name="text_placeholder">Hau leku-marka da</string>
   <string name="instant_upload_on_wifi">Igo irudiak bakarrik WIFIren bidez</string>
+  <string name="instant_upload_path">/BerehalakoIgoerak</string>
+  <string name="conflict_title">Igoera konfliktoa</string>
+  <string name="conflict_message">Urruneko %s fitxategia ez dago bertako fitxategiarekin sinkronizatuta. Jarraituz gero zerbitzariko fitxategiaren edukia ordeztuko da.</string>
+  <string name="conflict_keep_both">Mantendu biak</string>
+  <string name="conflict_overwrite">Gainidatzi</string>
+  <string name="conflict_dont_upload">Ez igo</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6b723747..e51845ba 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,7 +36,13 @@
   <string name="uploader_wrn_no_content_title">هیچ مطلبی بارگزاری نشده‌ است</string>
   <string name="uploader_wrn_no_content_text">هیچ مطلبی دریافت نشده است. هیچ‌‌چیزی بارگزاری نشده.</string>
   <string name="uploader_info_uploading">در حال بارگزاری</string>
+  <string name="filedetails_download">بارگیری</string>
   <string name="filedetails_redownload">بارگزاری دوباره</string>
+  <string name="common_yes">بله</string>
+  <string name="common_ok">باشه</string>
+  <string name="common_cancel_upload">متوقف کردن بار گذاری</string>
+  <string name="common_cancel">منصرف شدن</string>
+  <string name="common_error">خطا</string>
   <string name="about_title">درباره</string>
   <string name="delete_account">حذف حساب</string>
   <string name="create_account">ساخت حساب</string>
@@ -47,6 +53,7 @@
   <string name="downloader_download_in_progress_ticker">در حال بارگیری ...</string>
   <string name="downloader_download_succeeded_ticker">بارگیری موفقیت‌آمیز بود</string>
   <string name="downloader_download_failed_ticker">بارگیری ناموفق بود</string>
+  <string name="sync_string_contacts">ارتباط‌ها</string>
   <string name="auth_testing_connection">آزمایش اتصال...</string>
   <string name="auth_login_details">جزئیات ورود</string>
   <string name="crashlog_send_report">ارسال گزارش</string>
@@ -56,4 +63,5 @@
   <string name="common_remove">حذف</string>
   <string name="wait_a_moment">لحظه‌ای صبر کنید</string>
   <string name="filedisplay_no_file_selected">هیچ پرونده‌ای انتخاب نشده است</string>
+  <string name="ssl_validator_title">اخطار</string>
 </resources>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index ca7a7add..11a2e690 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hei maailma! ownCloudPääIkkuna</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Salasana:</string>
   <string name="main_login">Käyttäjätunnus:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Asetukset</string>
   <string name="main_tit_accsetup">Aseta tili</string>
   <string name="main_wrn_accsetup">Laitteessasi ei ole ownCloud-tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
+  <string name="about_message">ownCloudin Android-sovellus\n\nversio: %1$s</string>
   <string name="actionbar_sync">Päivitä</string>
   <string name="actionbar_upload">Lähetä tiedosto</string>
   <string name="actionbar_upload_from_apps">Sisältö toisista sovelluksista</string>
@@ -62,17 +62,20 @@
   <string name="uploader_error_forbidden_content">ownCloudilla ei ole oikeuksia jaettuun sisältöön</string>
   <string name="uploader_info_uploading">Lähetetään</string>
   <string name="uploader_btn_create_dir_text">Luo kansio latausta varten</string>
+  <string name="file_list_empty">Tässä kansiossa ei ole tiedostoja.\nUusia tiedostoja voi lisätä käyttäen valikon \"Lähetä\"-toimintoa.</string>
   <string name="filedetails_select_file">Napauta tiedostoa nähdäksesi lisätietoja.</string>
   <string name="filedetails_size">Koko:</string>
   <string name="filedetails_type">Tyyppi:</string>
   <string name="filedetails_created">Luotu:</string>
   <string name="filedetails_modified">Muokattu:</string>
   <string name="filedetails_download">Lataa</string>
+  <string name="filedetails_sync_file">Päivitä</string>
   <string name="filedetails_redownload">Lataa uudelleen</string>
   <string name="filedetails_open">Avaa</string>
   <string name="common_yes">Kyllä</string>
   <string name="common_no">Ei</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_upload">Peru lähetys</string>
   <string name="common_cancel">Peru</string>
   <string name="common_save_exit">Tallenna ja poistu</string>
   <string name="common_exit">Jätä ownCloud</string>
@@ -100,11 +103,13 @@
   <string name="sync_string_contacts">Yhteystiedot</string>
   <string name="sync_fail_ticker">Synkronointi epäonnistui</string>
   <string name="sync_fail_content">Kohteen %1$s synkronointia ei voitu suorittaa loppuun</string>
+  <string name="sync_conflicts_in_favourites_ticker">Ristiriitoja löytynyt</string>
   <string name="use_ssl">Käytä salattua yhteyttä</string>
   <string name="location_no_provider">ownCloud ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
   <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
   <string name="pincode_enter_new_pin_code">Anna uuden sovelluksesi PIN-koodi</string>
   <string name="pincode_configure_your_pin">Anna ownCloud-sovelluksen PIN</string>
+  <string name="pincode_configure_your_pin_explanation">PIN kysytään joka kerta, kun sovellus käynnistetään</string>
   <string name="pincode_reenter_your_pincode">Anna ownCloud-sovelluksen PIN uudestaan</string>
   <string name="pincode_remove_your_pincode">Poista ownCloud-sovelluksen PIN</string>
   <string name="pincode_mismatch">ownCloud-sovelluksen PIN-koodit eivät täsmää</string>
@@ -145,6 +150,9 @@
   <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
   <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
   <string name="auth_login_details">Kirjautumistiedot</string>
+  <string name="auth_unauthorized">Virheellinen tunnus tai salasana</string>
+  <string name="auth_not_found">Väärä polku</string>
+  <string name="auth_internal">Sisäinen palvelinvirhe, koodi %1$d</string>
   <string name="crashlog_message">Sovellus sulkeutui yllättäen. Haluatko lähettää vikailmoituksen?</string>
   <string name="crashlog_send_report">Lähetä ilmoitus</string>
   <string name="crashlog_dont_send_report">Älä lähetä ilmoitusta</string>
@@ -160,6 +168,7 @@
   <string name="confirmation_remove_remote_and_local">Sekä etä- että paikallinen</string>
   <string name="remove_success_msg">Poistettu onnistuneesti</string>
   <string name="remove_fail_msg">Poistamista ei voitu suorittaa loppuun asti</string>
+  <string name="rename_dialog_title">Anna uusi nimi</string>
   <string name="rename_local_fail_msg">Paikallista kopiota ei voitu uudelleennimetä; yritä eri nimellä</string>
   <string name="rename_server_fail_msg">Nimen muutos epäonnistui</string>
   <string name="create_dir_fail_msg">Kansion luonti epäonnistui</string>
@@ -172,5 +181,25 @@
   <string name="ssl_validator_certificate_not_available">Palvelimen varmenteen noutaminen epäonnistui</string>
   <string name="ssl_validator_question">Haluatko silti luottaa tähän varmenteeseen?</string>
   <string name="ssl_validator_not_saved">Varmenteen tallennus epäonnistui</string>
+  <string name="ssl_validator_btn_details_see">Tiedot</string>
+  <string name="ssl_validator_btn_details_hide">Piilota</string>
+  <string name="ssl_validator_label_subject">Myönnetty kohteelle:</string>
+  <string name="ssl_validator_label_issuer">Myöntäjä:</string>
+  <string name="ssl_validator_label_CN">Yleinen nimi:</string>
+  <string name="ssl_validator_label_O">Organisaatio:</string>
+  <string name="ssl_validator_label_OU">Organisaatioyksikkö:</string>
+  <string name="ssl_validator_label_C">Maa:</string>
+  <string name="ssl_validator_label_ST">Osavaltio:</string>
+  <string name="ssl_validator_label_L">Sijainti:</string>
+  <string name="ssl_validator_label_validity">Voimassaoloaika:</string>
+  <string name="ssl_validator_label_validity_from">Alkaen:</string>
+  <string name="ssl_validator_label_validity_to">Päättyen:</string>
+  <string name="ssl_validator_label_signature">Allekirjoitus:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmi:</string>
   <string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
+  <string name="conflict_title">Päivitysristiriita</string>
+  <string name="conflict_message">Etätiedostoa %s ei ole synkronoitu paikallisen tiedoston kanssa. Jatkaminen korvaa palvelimella olevan tiedoston sisällön.</string>
+  <string name="conflict_keep_both">Säilytä molemmat</string>
+  <string name="conflict_overwrite">Korvaa</string>
+  <string name="conflict_dont_upload">Älä lähetä</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c757504a..7e10d0fe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1,2 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_settings">asetukset</string>
+  <string name="actionbar_settings">asetukset</string>
+  <string name="auth_username">Käyttäjätunnus</string>
+  <string name="setup_hint_username">Käyttäjätunnus</string>
+  <string name="filedetails_open">avata</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1908f2c0..9a0eaad4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hello World, Écran d\'accueil ownCloud !</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Mot de passe : </string>
   <string name="main_login">Utilisateur : </string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Paramètres</string>
   <string name="main_tit_accsetup">Paramètres du compte</string>
   <string name="main_wrn_accsetup">Aucun compte ownCloud n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
+  <string name="about_message">client ownCloud pour Android\n\nversion : %1$s</string>
   <string name="actionbar_sync">Synchronisation du compte</string>
   <string name="actionbar_upload">Téléverser un fichier</string>
   <string name="actionbar_upload_from_apps">Contenu d\'une autre application</string>
@@ -34,8 +34,8 @@
   <string name="prefs_trackmydevice_interval_summary">Mettre à jour toutes les %1$s minutes</string>
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Gestion des comptes utilisateur</string>
-  <string name="prefs_pincode">code de sécurité ownCloud</string>
-  <string name="prefs_pincode_summary">Sécurisez votre client ownCloud</string>
+  <string name="prefs_pincode">Utilisation d\'un code de sécurité ownCloud</string>
+  <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client ownCloud</string>
   <string name="prefs_instant_upload">Activer le téléversement instantané</string>
   <string name="prefs_instant_upload_summary">Import instantané des photos prises par la caméra</string>
   <string name="auth_host_url">URL ownCloud</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud n\'est pas autorisé à accéder au contenu partagé</string>
   <string name="uploader_info_uploading">Téléversement</string>
   <string name="uploader_btn_create_dir_text">Créer un répertoire pour le téléversement</string>
+  <string name="file_list_empty">Ce répertoire ne contient aucun fichier.\nDe nouveaux fichiers peuvent être importés en cliquant sur le bouton « Téléverser un fichier » du menu des options</string>
   <string name="filedetails_select_file">Effleurez un fichier pour afficher les informations complémentaires</string>
   <string name="filedetails_size">Taille :</string>
   <string name="filedetails_type">Type :</string>
   <string name="filedetails_created">Créé le :</string>
   <string name="filedetails_modified">Modifié le :</string>
   <string name="filedetails_download">Télécharger</string>
+  <string name="filedetails_sync_file">Rafraîchir</string>
   <string name="filedetails_redownload">Télécharger à nouveau</string>
   <string name="filedetails_open">Ouvrir</string>
+  <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
   <string name="common_yes">Oui</string>
   <string name="common_no">Non</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Annuler le téléchargement</string>
+  <string name="common_cancel_upload">Annuler l\'envoi</string>
   <string name="common_cancel">Annuler</string>
   <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
   <string name="common_exit">Quitter ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Contacts</string>
   <string name="sync_fail_ticker">La synchronisation a échoué</string>
   <string name="sync_fail_content">La synchronisation de %1$s ne peut pas être complétée</string>
+  <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d fichiers à garder synchronisés n\'ont put être synchronisé</string>
+  <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
+  <string name="sync_fail_in_favourites_content">Le contenu de %1$d fichiers n\'a put être synchronisé (%2$d conflits)</string>
   <string name="use_ssl">Utiliser une connexion sécurisée</string>
   <string name="location_no_provider">ownCloud ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
   <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
   <string name="pincode_enter_new_pin_code">Veuillez saisir votre nouveau code de sécurité</string>
   <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Le code PIN vous sera demandé à chaque lancement de l\'application</string>
   <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité ownCloud</string>
   <string name="pincode_remove_your_pincode">Retirer le code de sécurité ownCloud</string>
   <string name="pincode_mismatch">Les deux codes saisis ne concordent pas</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
   <string name="auth_secure_connection">Connexion sécurisée établie</string>
   <string name="auth_login_details">Détails des informations de connexion</string>
+  <string name="auth_unauthorized">Login / mot de passe invalides</string>
+  <string name="auth_not_found">Le chemin fourni est erroné</string>
+  <string name="auth_internal">Erreur interne du serveur, code %1$d</string>
   <string name="crashlog_message">L\'application s\'est fermée de façon inattendue, voulez-vous envoyer un rapport d\'erreur ?</string>
   <string name="crashlog_send_report">Envoyer un rapport</string>
   <string name="crashlog_dont_send_report">Ne rien envoyer</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Renommer</string>
   <string name="common_remove">Supprimer</string>
   <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
   <string name="confirmation_remove_local">Local seulement</string>
+  <string name="confirmation_remove_folder_local">Le contenu local uniquement</string>
   <string name="confirmation_remove_remote">Effacer du serveur</string>
   <string name="confirmation_remove_remote_and_local">Les deux distant et local</string>
   <string name="remove_success_msg">Suppression effectuée avec succès</string>
   <string name="remove_fail_msg">Suppression impossible</string>
+  <string name="rename_dialog_title">Entrez un nouveau nom</string>
   <string name="rename_local_fail_msg">La version locale ne peut être renommée, veuillez réessayer avec un nom différent</string>
   <string name="rename_server_fail_msg">Renommage impossible</string>
+  <string name="sync_file_fail_msg">Le fichier distant n\'a pu être vérifié</string>
+  <string name="sync_file_nothing_to_do_msg">Le contenu des fichiers est déjà synchronisé</string>
   <string name="create_dir_fail_msg">Création du répertoire impossible</string>
   <string name="wait_a_moment">Veuillez patienter</string>
   <string name="filedisplay_unexpected_bad_get_content">Problème inattendu ; veuillez essayer une autre app pour la sélection du fichier</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Impossible d\'obtenir le certificat du serveur</string>
   <string name="ssl_validator_question">Voulez-vous tout de même faire confiance à ce certificat ?</string>
   <string name="ssl_validator_not_saved">Impossible de sauvegarder le certificat</string>
+  <string name="ssl_validator_btn_details_see">Détails</string>
+  <string name="ssl_validator_btn_details_hide">Masquer</string>
+  <string name="ssl_validator_label_subject">Délivré à :</string>
+  <string name="ssl_validator_label_issuer">Délivré par :</string>
+  <string name="ssl_validator_label_CN">Nom d\'usage :</string>
+  <string name="ssl_validator_label_O">Organisation :</string>
+  <string name="ssl_validator_label_OU">Unité organisationnelle :</string>
+  <string name="ssl_validator_label_C">Pays :</string>
+  <string name="ssl_validator_label_ST">Région :</string>
+  <string name="ssl_validator_label_L">Localisation :</string>
+  <string name="ssl_validator_label_validity">Validité :</string>
+  <string name="ssl_validator_label_validity_from">De :</string>
+  <string name="ssl_validator_label_validity_to">À :</string>
+  <string name="ssl_validator_label_signature">Signature :</string>
+  <string name="ssl_validator_label_signature_algorithm">Algorithme :</string>
   <string name="text_placeholder">Ceci est un espace réservé</string>
   <string name="instant_upload_on_wifi">Ne téléverser les images que via une connexion WiFi</string>
+  <string name="instant_upload_path">/TéléversementInstantané</string>
+  <string name="conflict_title">Conflit de mise à jour</string>
+  <string name="conflict_message">Le fichier distant %s n\'est pas synchronisé avec le fichier local. En choisissant de continuer, vous remplacerez le contenu de fichier sur le serveur.</string>
+  <string name="conflict_keep_both">Garder les deux versions</string>
+  <string name="conflict_overwrite">Écraser</string>
+  <string name="conflict_dont_upload">Ne pas téléverser</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c757504a..9ede58b9 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1,2 +1,217 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Contrasinal:</string>
+  <string name="main_login">Nome de usuario:</string>
+  <string name="main_button_login">Acceso</string>
+  <string name="main_welcome">Benvido/a a ownCloud</string>
+  <string name="main_files">Ficheiros</string>
+  <string name="main_music">Música</string>
+  <string name="main_contacts">Contactos</string>
+  <string name="main_calendar">Calendario</string>
+  <string name="main_bookmarks">Marcadores</string>
+  <string name="main_settings">Preferencias</string>
+  <string name="main_tit_accsetup">Activar a conta</string>
+  <string name="main_wrn_accsetup">Non hai contas de ownCloud no teu dispositivo. Para empregar o aplicativos necesitas crear unha.</string>
+  <string name="about_message">O cliente de ownCloud para Android\n\nversion: %1$s</string>
+  <string name="actionbar_sync">Actualizar</string>
+  <string name="actionbar_upload">Subir</string>
+  <string name="actionbar_upload_from_apps">Contido doutros aplicativos</string>
+  <string name="actionbar_upload_files">Ficheiros</string>
+  <string name="actionbar_mkdir">Crear un directorio</string>
+  <string name="actionbar_search">Buscar</string>
+  <string name="actionbar_settings">Preferencias</string>
+  <string name="prefs_category_general">Xeral</string>
+  <string name="prefs_category_trackmydevice">Seguimento do dispositivo</string>
+  <string name="prefs_add_session">Engadir unha nova sesión</string>
+  <string name="prefs_create_img_thumbnails">Crear miniaturas das imaxes</string>
+  <string name="prefs_select_oc_account">Escoller unha conta</string>
+  <string name="prefs_summary_select_oc_account">Escolle cal das túas contas ten que usar o aplicativo.</string>
+  <string name="prefs_trackmydevice">Rastrexamento do dispositivo</string>
+  <string name="prefs_trackmydevice_summary_off">Permitir que ownCloud rexistre as posicións do teu dispositivo</string>
+  <string name="prefs_trackmydevice_summary_on">O teu ownCloud mantén o rexistro de posicións do teu dispositivo</string>
+  <string name="prefs_trackmydevice_interval">Intervalo de actualizacións</string>
+  <string name="prefs_trackmydevice_interval_summary">Actualizar cada %1$s minutos</string>
+  <string name="prefs_accounts">Contas</string>
+  <string name="prefs_manage_accounts">Xestionar as contas</string>
+  <string name="prefs_pincode">PIN do aplicativo ownCloud</string>
+  <string name="prefs_pincode_summary">Protexe o teu cliente de ownCloud</string>
+  <string name="prefs_instant_upload">Activar a subida instantánea</string>
+  <string name="prefs_instant_upload_summary">Subir instantaneamente as fotos sacadas coa cámara</string>
+  <string name="auth_host_url">URL de ownCloud</string>
+  <string name="auth_username">Nome de usuario</string>
+  <string name="auth_password">Contrasinal</string>
+  <string name="auth_register">Son novo en ownCloud</string>
+  <string name="new_session_uri_error">Deuse unha URL errada</string>
+  <string name="new_session_session_name_error">Usuario de sesión errado</string>
+  <string name="sync_string_files">Ficheiros</string>
+  <string name="uploader_no_file_selected">Non se escolleron ficheiros para subir</string>
+  <string name="setup_hint_username">Nome de usuario</string>
+  <string name="setup_hint_password">Contrasinal</string>
+  <string name="setup_hint_address">Dirección web</string>
+  <string name="setup_hint_show_password">Mostrar o contrasinal?</string>
+  <string name="setup_title">Conectar co teu ownCloud</string>
+  <string name="setup_btn_connect">Conectar</string>
+  <string name="uploader_btn_upload_text">Subir</string>
+  <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
+  <string name="uploader_wrn_no_account_text">Non hai contas de ownCloud no teu dispositivo. Crea unha nova conta primeiro.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Saír</string>
+  <string name="uploader_wrn_no_content_title">Non hai contido para subir</string>
+  <string name="uploader_wrn_no_content_text">Non se recibiu contido. Non hai nada para enviar.</string>
+  <string name="uploader_error_forbidden_content">Non se lle permite a ownCloud a que acceda ao contido compartido</string>
+  <string name="uploader_info_uploading">Enviando</string>
+  <string name="uploader_btn_create_dir_text">Crear un directorio para os envíos</string>
+  <string name="file_list_empty">Non hai ficheiros neste cartafol.\nOs novos ficheiros pódense engadir ca opción do menú «Subir»</string>
+  <string name="filedetails_select_file">Déalle a un ficheiro para que mostre a información adicional</string>
+  <string name="filedetails_size">Tamaño:</string>
+  <string name="filedetails_type">Tipo:</string>
+  <string name="filedetails_created">Creado:</string>
+  <string name="filedetails_modified">Modificado:</string>
+  <string name="filedetails_download">Baixar</string>
+  <string name="filedetails_sync_file">Actualizar</string>
+  <string name="filedetails_redownload">Actualizar</string>
+  <string name="filedetails_open">Abrir</string>
+  <string name="filedetails_renamed_in_upload_msg">O ficheiroi renomeouse a %1$s durante a subida</string>
+  <string name="common_yes">Si</string>
+  <string name="common_no">Non</string>
+  <string name="common_ok">Aceptar</string>
+  <string name="common_cancel_download">Cancelar a descarga</string>
+  <string name="common_cancel_upload">Cancelar a subida</string>
+  <string name="common_cancel">Cancelar</string>
+  <string name="common_save_exit">Gardar &amp; Saír</string>
+  <string name="common_exit">Saír de ownCloud</string>
+  <string name="common_error">Erro</string>
+  <string name="about_title">Acerca de</string>
+  <string name="delete_account">Eliminar a conta</string>
+  <string name="create_account">Crear a conta</string>
+  <string name="upload_chooser_title">Subir desde...</string>
+  <string name="uploader_info_dirname">Nome do directorio</string>
+  <string name="uploader_upload_in_progress_ticker">Subindo...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Subindo %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Subiuse correctamente</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s subiuse correctamente</string>
+  <string name="uploader_upload_succeeded_content_multiple">Os ficheiros %1$d subíronse correctamente</string>
+  <string name="uploader_upload_failed_ticker">Fallou o envío</string>
+  <string name="uploader_upload_failed_content_single">O envío de %1$s non se puido completar</string>
+  <string name="uploader_upload_failed_content_multiple">Fallou o envío: subíronse %1$d/%2$d ficheiros</string>
+  <string name="downloader_download_in_progress_ticker">Descargando...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Descargando %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Completouse a descarga</string>
+  <string name="downloader_download_succeeded_content">%1$s descargouse correctamente</string>
+  <string name="downloader_download_failed_ticker">Fallou a descarga</string>
+  <string name="downloader_download_failed_content">Non se puido completar a descarga de %1$s</string>
+  <string name="common_choose_account">Escoller unha conta</string>
+  <string name="sync_string_contacts">Contactos</string>
+  <string name="sync_fail_ticker">Fallou a sincronización</string>
+  <string name="sync_fail_content">Non se puido rematar a sincronización de %1$s</string>
+  <string name="sync_conflicts_in_favourites_ticker">Atopáronse conflictos</string>
+  <string name="sync_fail_in_favourites_content">Os contidos dos ficheiros %1$d non se puideron sincronizar (%1$d conflictos)</string>
+  <string name="use_ssl">Empregar a conexión segura</string>
+  <string name="location_no_provider">ownCloud non pode seguir o teu dispositivo. Comproba as configuracións de de localización.</string>
+  <string name="pincode_enter_pin_code">Introduce o teu PIN de aplicación</string>
+  <string name="pincode_enter_new_pin_code">Introduce o teu PIN da app</string>
+  <string name="pincode_configure_your_pin">Introduce o PIN da app ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Pedirase o PIN cada vez que se inicie o aplicativo</string>
+  <string name="pincode_reenter_your_pincode">Volve a introducir o PIN da app ownCloud</string>
+  <string name="pincode_remove_your_pincode">Elimina o PIN da app ownCloud</string>
+  <string name="pincode_mismatch">Os dous PIN da app ownCloud non son iguais</string>
+  <string name="pincode_wrong">PIN incorrecto da app ownCloud</string>
+  <string name="pincode_removed">Eliminouse o PIN da app ownCloud</string>
+  <string name="pincode_stored">Almacenouse o PIN da app ownCloud</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>60 minutos</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Intentando acceder...</string>
+  <string name="auth_no_net_conn_title">Sen conexión de rede</string>
+  <string name="auth_no_net_conn_message">Non se detectaron conexións a rede. Comproba a conexión a internet e proba de novo.</string>
+  <string name="auth_connect_anyway">Conectar igualmente</string>
+  <string name="auth_nossl_plain_ok_title">Non hai conexión seguras dispoñíbeis.</string>
+  <string name="auth_nossl_plain_ok_message">O aplicativo non puido facer unha conexión segura co servidor. Inda que non é segura, hai unha conexión posíbel. Podes continuar ou cancelala.</string>
+  <string name="auth_connection_established">Estabeleceuse a conexión</string>
+  <string name="auth_testing_connection">Comprobando a conexión...</string>
+  <string name="auth_not_configured_title">Configuración errada de ownCloud</string>
+  <string name="auth_not_configured_message">Semella que a túa instancia de ownCloud non está configurada correctamente. Contacta co teu administrador para máis detalles.</string>
+  <string name="auth_unknown_error_title">Ocorreu un erro descoñecido!</string>
+  <string name="auth_unknown_error_message">Ocorreu un erro descoñecido. Contacta cos autores e infórmaos do fallo cos rexistros de erro do teu dispositivo.</string>
+  <string name="auth_unknown_host_title">Non atopou o servidor</string>
+  <string name="auth_unknown_host_message">Non se puido atopar o servidor que se indicou. Comproba o nome do host e proba de novo.</string>
+  <string name="auth_incorrect_path_title">Non se atopa unha instancia de ownCloud</string>
+  <string name="auth_incorrect_path_message">O aplicativo non atopou instancias de ownCloud na rua que se indicou. Comproba a ruta e proba de novo.</string>
+  <string name="auth_timeout_title">O servidor tardou en responder</string>
+  <string name="auth_incorrect_address_title">URL mal formada</string>
+  <string name="auth_ssl_general_error_title">Fallou a inicialización de SSL</string>
+  <string name="auth_ssl_unverified_server_title">Non se verificou a identidade do servidor SSL</string>
+  <string name="auth_bad_oc_version_title">Versión do servidor de ownCloud non recoñecida</string>
+  <string name="auth_wrong_connection_title">Non se pode establecer a conexión</string>
+  <string name="auth_secure_connection">Fíxose unha conexión segura</string>
+  <string name="auth_login_details">Detalles do acceso</string>
+  <string name="auth_unauthorized">Usuario ou contrasinal incorrectos</string>
+  <string name="auth_not_found">Deuse unha ruta errada</string>
+  <string name="auth_internal">Erro interno do servidor, código %1$d</string>
+  <string name="crashlog_message">O aplicativo deixou de funcionar de xeito inesperado. Queres enviar un informe desta quebra?</string>
+  <string name="crashlog_send_report">Envíar un informe</string>
+  <string name="crashlog_dont_send_report">Non envíar un informe</string>
+  <string name="extensions_avail_title">Engadido dispoñíbel!</string>
+  <string name="extensions_avail_message">Semella que a túa instancia de ownCloud non soporta engadidos avanzados. Queres ver se hai engadidos dispoñíbeis para Android?</string>
+  <string name="fd_keep_in_sync">Manter o ficheiro ao día</string>
+  <string name="common_share">Compartir</string>
+  <string name="common_rename">Renomear</string>
+  <string name="common_remove">Eliminar</string>
+  <string name="confirmation_remove_alert">Queres eliminar %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Seguro que queres eliminar %1$s e o seu contido?</string>
+  <string name="confirmation_remove_local">Só local</string>
+  <string name="confirmation_remove_folder_local">Só contidos locais</string>
+  <string name="confirmation_remove_remote">Eliminar do servidor</string>
+  <string name="confirmation_remove_remote_and_local">Remoto e local</string>
+  <string name="remove_success_msg">Eliminouse correctamente</string>
+  <string name="remove_fail_msg">Non se puido eliminar completamente</string>
+  <string name="rename_dialog_title">Inrtoducir un novo nome</string>
+  <string name="rename_local_fail_msg">Non se lle puido cambiar o nome a copia local. Proba con outro nome diferente.</string>
+  <string name="rename_server_fail_msg">Non se rematou o cambio de nome</string>
+  <string name="sync_file_fail_msg">Non se puido comprobar o ficheiro remoto</string>
+  <string name="sync_file_nothing_to_do_msg">Os contidos do ficheiro xa están sincronizados</string>
+  <string name="create_dir_fail_msg">Non se puido crear o directorio</string>
+  <string name="wait_a_moment">Agarda un momento</string>
+  <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Escolle outro aplicativo para seleccionar o ficheiro.</string>
+  <string name="filedisplay_no_file_selected">Non se escolleu ningún ficheiro</string>
+  <string name="ssl_validator_title">Advertencia</string>
+  <string name="ssl_validator_header">A identidade do sitio non se puido verificar</string>
+  <string name="ssl_validator_reason_cert_not_trusted">Non se confía no certificado do servidor</string>
+  <string name="ssl_validator_reason_cert_expired">O certificado do servidor caducou</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">O certificado do servidor é moi novo</string>
+  <string name="ssl_validator_reason_hostname_not_verified">A URL non coincide co nome de host do certificado</string>
+  <string name="ssl_validator_certificate_not_available">Non se puido obter o certificado do servidor</string>
+  <string name="ssl_validator_question">Queres confiar neste certificado igualmente?</string>
+  <string name="ssl_validator_not_saved">Non se puido gardar o certificado</string>
+  <string name="ssl_validator_btn_details_see">Detalles</string>
+  <string name="ssl_validator_btn_details_hide">Agochar</string>
+  <string name="ssl_validator_label_subject">Emitido para:</string>
+  <string name="ssl_validator_label_issuer">Emitido por:</string>
+  <string name="ssl_validator_label_CN">Nome común:</string>
+  <string name="ssl_validator_label_O">Organización:</string>
+  <string name="ssl_validator_label_OU">Departamento da organización:</string>
+  <string name="ssl_validator_label_C">País</string>
+  <string name="ssl_validator_label_ST">Estado:</string>
+  <string name="ssl_validator_label_L">Lugar:</string>
+  <string name="ssl_validator_label_validity">Validez:</string>
+  <string name="ssl_validator_label_validity_from">De:</string>
+  <string name="ssl_validator_label_validity_to">A:</string>
+  <string name="ssl_validator_label_signature">Sinatura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
+  <string name="text_placeholder">Isto é unha marca de posición</string>
+  <string name="instant_upload_on_wifi">Subir imaxes só con WiFi</string>
+  <string name="instant_upload_path">/SubidaInstantánea</string>
+  <string name="conflict_title">Actualizar o conflito</string>
+  <string name="conflict_message">O ficheiro remoto %s non está sincronizado co ficheiro local. Continuando substituirase o contido do ficheiro no servidor.</string>
+  <string name="conflict_keep_both">Manter ambos</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">Non subir</string>
+</resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index c757504a..15a26118 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -1,2 +1,219 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">ססמה:</string>
+  <string name="main_login">שם משתמש:</string>
+  <string name="main_button_login">התחברות</string>
+  <string name="main_welcome">ברוך בואך</string>
+  <string name="main_files">קבצים</string>
+  <string name="main_music">מוזיקה</string>
+  <string name="main_contacts">אנשי קשר</string>
+  <string name="main_calendar">יומן</string>
+  <string name="main_bookmarks">סימניות</string>
+  <string name="main_settings">הגדרות</string>
+  <string name="main_tit_accsetup">הגדרת חשבון</string>
+  <string name="main_wrn_accsetup">לא הוגדר חשבון בהתקן שלך. כדי להשתמש ביישום זה עליך ליצור אחד.</string>
+  <string name="about_message">יישום האנדרויד של %1$s\n\nגרסה: %2$s</string>
+  <string name="actionbar_sync">רענון</string>
+  <string name="actionbar_upload">העלאה</string>
+  <string name="actionbar_upload_from_apps">תוכן מיישומים אחרים</string>
+  <string name="actionbar_upload_files">קבצים</string>
+  <string name="actionbar_mkdir">יצירת תיקייה</string>
+  <string name="actionbar_search">חיפוש</string>
+  <string name="actionbar_settings">הגדרות</string>
+  <string name="prefs_category_general">כללי</string>
+  <string name="prefs_category_trackmydevice">מעקב אחר מכשירים</string>
+  <string name="prefs_add_session">הוספת הפעלה חדשה</string>
+  <string name="prefs_create_img_thumbnails">יצירת תמונות ממוזערות</string>
+  <string name="prefs_select_oc_account">נא לבחור בחשבון</string>
+  <string name="prefs_summary_select_oc_account">נא לבחור באיזה מהחשבונות שלך היישום אמור להשתמש.</string>
+  <string name="prefs_trackmydevice">מעקב אחר מכשירים</string>
+  <string name="prefs_trackmydevice_summary_off">יש להפעיל יישום זה כדי לעקוב אחר מיקום ההתקן שלך</string>
+  <string name="prefs_trackmydevice_summary_on">יישום זה עוקב אחר ההתקן</string>
+  <string name="prefs_trackmydevice_interval">מרווח בין עדכונים</string>
+  <string name="prefs_trackmydevice_interval_summary">לעדכן בכל %1$s דקות</string>
+  <string name="prefs_accounts">חשבונות</string>
+  <string name="prefs_manage_accounts">ניהול חשבונות</string>
+  <string name="prefs_pincode">קוד יישום</string>
+  <string name="prefs_pincode_summary">הגנה על הלקוח שלך</string>
+  <string name="prefs_instant_upload">הפעלת העלאות מהירות</string>
+  <string name="prefs_instant_upload_summary">העלאה מהירה של תמונות שמצולמות במצלמה שלך</string>
+  <string name="auth_host_url">כתובת</string>
+  <string name="auth_username">שם משתמש</string>
+  <string name="auth_password">ססמה</string>
+  <string name="auth_register">%1$s חדש לי</string>
+  <string name="new_session_uri_error">הכתובת שצוינה שגויה</string>
+  <string name="new_session_session_name_error">שם ההפעלה שגוי</string>
+  <string name="sync_string_files">קבצים</string>
+  <string name="uploader_no_file_selected">לא נבחר שום קובץ להעלאה</string>
+  <string name="setup_hint_username">שם משתמש</string>
+  <string name="setup_hint_password">ססמה</string>
+  <string name="setup_hint_address">כתובת אתר</string>
+  <string name="setup_hint_show_password">האם להציג את הססמה?</string>
+  <string name="setup_title">התחברות ל־%1$s שלך</string>
+  <string name="setup_btn_connect">התחברות</string>
+  <string name="uploader_btn_upload_text">העלאה</string>
+  <string name="uploader_wrn_no_account_title">לא נמצא חשבון</string>
+  <string name="uploader_wrn_no_account_text">אין חשבונות %1$s בהתקן שלך. נא להגדיר חשבון תחילה.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">הגדרות</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">יציאה</string>
+  <string name="uploader_wrn_no_content_title">אין תוכן להעלאה</string>
+  <string name="uploader_wrn_no_content_text">לא התקבל תוכן. אין מה להעלות.</string>
+  <string name="uploader_error_forbidden_content">ל־%1$s אין הרשאה לגשת לתוכן המשותף שלך</string>
+  <string name="uploader_info_uploading">בהעלאה</string>
+  <string name="uploader_btn_create_dir_text">יצירת תיקייה להעלאה</string>
+  <string name="file_list_empty">אין קבצים בתיקייה זו.\nניתן להוסיף קבצים חדשים בעזרת האפשרות „העלאה“ מהתפריט.</string>
+  <string name="filedetails_select_file">יש לגעת בקובץ כדי להציג פרטים נוספים.</string>
+  <string name="filedetails_size">גודל:</string>
+  <string name="filedetails_type">סוג:</string>
+  <string name="filedetails_created">מועד היצירה:</string>
+  <string name="filedetails_modified">מועד השינוי:</string>
+  <string name="filedetails_download">הורדה</string>
+  <string name="filedetails_sync_file">רענון</string>
+  <string name="filedetails_redownload">הורדה מחדש</string>
+  <string name="filedetails_open">פתיחה</string>
+  <string name="filedetails_renamed_in_upload_msg">שם הקובץ השתנה ל־ %1$s במהלך ההעלאה</string>
+  <string name="common_yes">כן</string>
+  <string name="common_no">לא</string>
+  <string name="common_ok">אישור</string>
+  <string name="common_cancel_download">ביטול ההורדה</string>
+  <string name="common_cancel_upload">ביטול ההעלאה</string>
+  <string name="common_cancel">ביטול</string>
+  <string name="common_save_exit">לשמור ולצאת</string>
+  <string name="common_exit">לעזוב את %1$s</string>
+  <string name="common_error">שגיאה</string>
+  <string name="about_title">על אודות</string>
+  <string name="delete_account">מחיקת חשבון</string>
+  <string name="create_account">יצירת חשבון</string>
+  <string name="upload_chooser_title">העלאה מהמיקום …</string>
+  <string name="uploader_info_dirname">שם התיקייה</string>
+  <string name="uploader_upload_in_progress_ticker">מתבצעת העלאה …</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% בהעלאה %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">ההעלאה הצליחה</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s נשלח בהצלחה</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d קבצים נשלחו בהצלחה</string>
+  <string name="uploader_upload_failed_ticker">ההעלאה נכשלה</string>
+  <string name="uploader_upload_failed_content_single">אין אפשרות להשלים את ההעלאה של %1$s</string>
+  <string name="uploader_upload_failed_content_multiple">ההעלאה נכשלה: %1$d/%2$d קבצים נשלחו</string>
+  <string name="downloader_download_in_progress_ticker">בהורדה …</string>
+  <string name="downloader_download_in_progress_content">%1$d%% בהורדה %2$s</string>
+  <string name="downloader_download_succeeded_ticker">ההורדה הצליחה</string>
+  <string name="downloader_download_succeeded_content">%1$s התקבל בהצלחה</string>
+  <string name="downloader_download_failed_ticker">ההורדה נכשלה</string>
+  <string name="downloader_download_failed_content">לא ניתן להשלים את ההורדה של </string>
+  <string name="common_choose_account">נא לבחור בחשבון</string>
+  <string name="sync_string_contacts">אנשי קשר</string>
+  <string name="sync_fail_ticker">הסנכרון נכשל</string>
+  <string name="sync_fail_content">לא ניתן להשלים את הסנכרון של </string>
+  <string name="sync_conflicts_in_favourites_ticker">נמצאו התנגשויות</string>
+  <string name="sync_conflicts_in_favourites_content">לא ניתן לסנכרן %1$d קבצים שהוגדרו לסנכרון</string>
+  <string name="sync_fail_in_favourites_ticker">קבצים שהוגדרו לסנכרון נכשלו</string>
+  <string name="sync_fail_in_favourites_content">לא ניתן לסנכרם את תוכנם של %1$d מהקבצים (%2$d התנגשויות)</string>
+  <string name="use_ssl">להשתמש בחיבור מאובטח</string>
+  <string name="location_no_provider">ל־%1$s אין אפשרות לעקוב אחר ההתקן שלך. נא לבדוק את הגדרות המיקום שלך</string>
+  <string name="pincode_enter_pin_code">נא להזין את קוד היישום שלך</string>
+  <string name="pincode_enter_new_pin_code">נא להזין את הקוד החדש של היישום שלך</string>
+  <string name="pincode_configure_your_pin">נא להזין את קוד היישום שלך</string>
+  <string name="pincode_configure_your_pin_explanation">תופיע בקשה לקוד בכל פעם שהיישום מופעל</string>
+  <string name="pincode_reenter_your_pincode">נא להזין את קוד היישום שלך מחדש</string>
+  <string name="pincode_remove_your_pincode">הסרת קוד היישום שלך</string>
+  <string name="pincode_mismatch">הקודים של היישום שונים</string>
+  <string name="pincode_wrong">קוד היישום שגוי</string>
+  <string name="pincode_removed">קוד היישום הוסר</string>
+  <string name="pincode_stored">קוד היישום אוחסן</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>רבע שעה</item>
+    <item>חצי שעה</item>
+    <item>שעה</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">מתבצע ניסיון כניסה…</string>
+  <string name="auth_no_net_conn_title">אין חיבור לאינטרנט</string>
+  <string name="auth_no_net_conn_message">לא נבחר חיבור לאינטרנט, נא לבדוק את החיבור שלך לאינטרנט ולנסות שוב.</string>
+  <string name="auth_connect_anyway">להתחבר בכל זאת</string>
+  <string name="auth_nossl_plain_ok_title">אין חיבור מוצפן זמין.</string>
+  <string name="auth_nossl_plain_ok_message">היישום לא יכול לקיים חיבור מאובטח לשרת. עם זאת קיים חיבור שאינו מאובטח. ניתן להמשיך או לבטל.</string>
+  <string name="auth_connection_established">החיבור נוצר</string>
+  <string name="auth_testing_connection">החיבור נבדק…</string>
+  <string name="auth_not_configured_title">תצורת השרת פגומה</string>
+  <string name="auth_not_configured_message">מסתבר כי עותק השרת שלך אינו מוגדר נכון. נא ליצור קשר עם המנהל שלך לקבלת פרטים נוספים.</string>
+  <string name="auth_unknown_error_title">אירעה שגיאה בלתי ידועה!</string>
+  <string name="auth_unknown_error_message">אירעה שגיאה בלתי ידועה. נא ליצור קשר עם התמיכה ולכלול את קובצי הרישום (log) מההתקן שלך.</string>
+  <string name="auth_unknown_host_title">לא ניתן למצוא את המארח</string>
+  <string name="auth_unknown_host_message">לא ניתן למצוא את המארח שהוזן. נא לבדוק את שם המארח ואת זמינות השרת ולנסות שוב.</string>
+  <string name="auth_incorrect_path_title">לא נמצא מופע שרת</string>
+  <string name="auth_incorrect_path_message">היישום לא הצליח למצוא עותק שרת בנתיב שצוין. נא לבדוק את הנתיב שלך ולנסות שוב.</string>
+  <string name="auth_timeout_title">לשרת לקח יותר מדי זמן להגיב</string>
+  <string name="auth_incorrect_address_title">כתובת שגויה</string>
+  <string name="auth_ssl_general_error_title">הפעלת ה־SSL נכשלה</string>
+  <string name="auth_ssl_unverified_server_title">זהות ה־SSL של השרת לא מאומתת</string>
+  <string name="auth_bad_oc_version_title">גרסה השרת אינה מזוהה</string>
+  <string name="auth_wrong_connection_title">לא ניתן ליצור את החיבור</string>
+  <string name="auth_secure_connection">נוצר חיבור מאובטח</string>
+  <string name="auth_login_details">פרטי הכניסה</string>
+  <string name="auth_unauthorized">שם משתמש / ססמה שגויים</string>
+  <string name="auth_not_found">הנתיב שצוין שגוי</string>
+  <string name="auth_internal">שגיאת שרת פנימית, קוד </string>
+  <string name="crashlog_message">היישום הושבת באופן בלתי צפוי. האם לשלוח דוח קריסה?</string>
+  <string name="crashlog_send_report">שליחת דוח</string>
+  <string name="crashlog_dont_send_report">לא לשלוח דוח</string>
+  <string name="extensions_avail_title">יש הרחבות זמינות!</string>
+  <string name="extensions_avail_message">מסתבר כי השרת שלך תומך בהרחבות מתקדמות. האם ברצונך לצפות בהרחבות הזמינות לאנדרויד?</string>
+  <string name="fd_keep_in_sync">לשמור על קובץ עדכני</string>
+  <string name="common_share">שתף</string>
+  <string name="common_rename">שינוי שם</string>
+  <string name="common_remove">הסרה</string>
+  <string name="confirmation_remove_alert">האם אכן להסיר את </string>
+  <string name="confirmation_remove_folder_alert">האם אכן ברצונך להסיר את %1$s על כל תוכנו ?</string>
+  <string name="confirmation_remove_local">מקומי בלבד</string>
+  <string name="confirmation_remove_folder_local">תכנים מקומיים בלבד</string>
+  <string name="confirmation_remove_remote">הסרה מהשרת</string>
+  <string name="confirmation_remove_remote_and_local">מרוחק ומקומי</string>
+  <string name="remove_success_msg">ההסרה הצליחה</string>
+  <string name="remove_fail_msg">ההסרה נכשלה</string>
+  <string name="rename_dialog_title">נא להזין שם חדש</string>
+  <string name="rename_local_fail_msg">לא ניתן לשנות את שם העותק המקומי; נא לנסות שם אחר</string>
+  <string name="rename_server_fail_msg">לא ניתן להשלים את פעולת שינוי השם</string>
+  <string name="sync_file_fail_msg">לא ניתן לבדוק את הקובץ המרוחק </string>
+  <string name="sync_file_nothing_to_do_msg">תוכן הקובץ כבר מסונכרן</string>
+  <string name="create_dir_fail_msg">לא ניתן ליצור את התיקייה</string>
+  <string name="wait_a_moment">נא להמתין רגע</string>
+  <string name="filedisplay_unexpected_bad_get_content">תקלה בלתי צפויה ; נא לבחור בקובץ מיישום אחר</string>
+  <string name="filedisplay_no_file_selected">לא נבחרו קבצים</string>
+  <string name="ssl_validator_title">אזהרה</string>
+  <string name="ssl_validator_header">לא ניתן לאמת את זהות האתר</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- תעודת השרת אינה מהימנה</string>
+  <string name="ssl_validator_reason_cert_expired">- תוקף תעודת השרת פג</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- תוקף תעודת השרת מתייחס לתאריכים בעתיד</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- הכתובת אינה תואמת לשם המארח בתעודה</string>
+  <string name="ssl_validator_certificate_not_available">לא ניתן לקבל את תעודת השרת</string>
+  <string name="ssl_validator_question">האם לתת אמון בתעודה זו בכל אופן?</string>
+  <string name="ssl_validator_not_saved">לא ניתן לשמור את התעודה</string>
+  <string name="ssl_validator_btn_details_see">פרטים</string>
+  <string name="ssl_validator_btn_details_hide">הסתרה</string>
+  <string name="ssl_validator_label_subject">הונפק לטובת:</string>
+  <string name="ssl_validator_label_issuer">הונפק על ידי:</string>
+  <string name="ssl_validator_label_CN">שם נפוץ:</string>
+  <string name="ssl_validator_label_O">ארגון:</string>
+  <string name="ssl_validator_label_OU">יחידה ארגונית:</string>
+  <string name="ssl_validator_label_C">ארץ:</string>
+  <string name="ssl_validator_label_ST">מדינה:</string>
+  <string name="ssl_validator_label_L">מיקום:</string>
+  <string name="ssl_validator_label_validity">תוקף:</string>
+  <string name="ssl_validator_label_validity_from">התחלה:</string>
+  <string name="ssl_validator_label_validity_to">סיום:</string>
+  <string name="ssl_validator_label_signature">חתימה:</string>
+  <string name="ssl_validator_label_signature_algorithm">אלגוריתם:</string>
+  <string name="text_placeholder">זהו ממלא מקום</string>
+  <string name="instant_upload_on_wifi">העלאת תמונות דרך WiFi בלבד</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">התנגשות עדכון</string>
+  <string name="conflict_message">הקובץ המרוחק %s אינו מסונכרן עם הקובץ המקומי. בחירה בהמשך התהליך תחליף את תוכן הקובץ בשרת.</string>
+  <string name="conflict_keep_both">להשאיר את שניהם</string>
+  <string name="conflict_overwrite">לשכתב</string>
+  <string name="conflict_dont_upload">לא להעלות</string>
+</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c757504a..3daa83c0 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,2 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="auth_username">प्रयोक्ता का नाम</string>
+  <string name="auth_password">पासवर्ड</string>
+  <string name="setup_hint_username">प्रयोक्ता का नाम</string>
+  <string name="setup_hint_password">पासवर्ड</string>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 34223759..5db57d5b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -6,11 +6,13 @@
   <string name="main_button_login">Prijava</string>
   <string name="main_files">Datoteke</string>
   <string name="main_music">Muzika</string>
+  <string name="main_contacts">Kontakti</string>
   <string name="main_calendar">Kalendar</string>
   <string name="main_bookmarks">Zabilješke</string>
   <string name="main_settings">Postavke</string>
   <string name="actionbar_sync">Osvježi</string>
   <string name="actionbar_upload">Učitaj</string>
+  <string name="actionbar_upload_files">Datoteke</string>
   <string name="actionbar_mkdir">Kreiraj direktorij</string>
   <string name="actionbar_search">pretraži</string>
   <string name="actionbar_settings">Postavke</string>
@@ -29,6 +31,16 @@
   <string name="setup_btn_connect">Poveži</string>
   <string name="uploader_btn_upload_text">Učitaj</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Izlaz</string>
+  <string name="filedetails_download">Preuzimanje</string>
+  <string name="filedetails_sync_file">Osvježi</string>
+  <string name="filedetails_redownload">Osvježi</string>
+  <string name="common_yes">Da</string>
+  <string name="common_cancel_upload">Prekini upload</string>
+  <string name="common_cancel">Odustani</string>
+  <string name="common_error">Greška</string>
+  <string name="sync_string_contacts">Kontakti</string>
   <string name="auth_trying_to_login">Trying to login…</string>
+  <string name="common_share">Podijeli</string>
+  <string name="common_rename">Promjeni ime</string>
   <string name="common_remove">Makni</string>
 </resources>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index e32028cb..6cfa37fb 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Helló világ, OwnCloudKezdőképernyő!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Jelszó:</string>
   <string name="main_login">Felhasználói név:</string>
@@ -48,10 +47,13 @@
   <string name="filedetails_created">Készült:</string>
   <string name="filedetails_modified">Módosítva:</string>
   <string name="filedetails_download">Letöltés</string>
+  <string name="filedetails_sync_file">Frissítés</string>
+  <string name="filedetails_redownload">Frissítés</string>
   <string name="filedetails_open">Megnyitás</string>
   <string name="common_yes">Igen</string>
   <string name="common_no">Nem</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_upload">Feltöltés megszakítása</string>
   <string name="common_cancel">Mégsem</string>
   <string name="common_save_exit">Mentés &amp; Kilépés</string>
   <string name="common_error">Hiba</string>
@@ -73,8 +75,12 @@
   <string name="pincode_enter_pin_code">Kérlek add meg az App PIN kódját</string>
   <string name="pincode_enter_new_pin_code">Kérlek add meg az új APP PIN kódját</string>
   <string name="pincode_configure_your_pin">ownCloud App PIN kója</string>
+  <string name="common_share">Megosztás</string>
+  <string name="common_rename">Átnevezés</string>
+  <string name="common_remove">Eltávolítás</string>
   <string name="confirmation_remove_alert">Tényleg szeretnéd törölni  %1$s ?</string>
   <string name="confirmation_remove_local">Csak helyből</string>
   <string name="confirmation_remove_remote">Törlés a szerverről</string>
   <string name="confirmation_remove_remote_and_local">Törlés a szerverről és helyből</string>
+  <string name="ssl_validator_title">Figyelmeztetés</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-hu/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c757504a..35864beb 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="filedetails_download">Ô²Õ¥Õ¼Õ¶Õ¥Õ¬</string>
+</resources>
diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml
index c757504a..02512b92 100644
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@@ -1,2 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">Files</string>
+  <string name="main_music">Musica</string>
+  <string name="main_contacts">Contactos</string>
+  <string name="main_settings">Configurationes</string>
+  <string name="actionbar_upload">Incargar</string>
+  <string name="actionbar_upload_files">Files</string>
+  <string name="actionbar_settings">Configurationes</string>
+  <string name="auth_username">Nomine de usator</string>
+  <string name="auth_password">Contrasigno</string>
+  <string name="sync_string_files">Files</string>
+  <string name="setup_hint_username">Nomine de usator</string>
+  <string name="setup_hint_password">Contrasigno</string>
+  <string name="uploader_btn_upload_text">Incargar</string>
+  <string name="filedetails_download">Discargar</string>
+  <string name="common_cancel">Cancellar</string>
+  <string name="sync_string_contacts">Contactos</string>
+  <string name="common_share">Compartir</string>
+</resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index c757504a..1faad74b 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -1,2 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_button_login">login</string>
+  <string name="main_contacts">kontak</string>
+  <string name="main_settings">pengaturan</string>
+  <string name="actionbar_settings">pengaturan</string>
+  <string name="prefs_category_general">umum</string>
+  <string name="auth_host_url">tautan</string>
+  <string name="auth_username">nama pengguna</string>
+  <string name="auth_password">kata kunci</string>
+  <string name="setup_hint_username">nama pengguna</string>
+  <string name="setup_hint_password">kata kunci</string>
+  <string name="filedetails_download">unduh</string>
+  <string name="filedetails_open">buka</string>
+  <string name="common_yes">Ya</string>
+  <string name="common_cancel_upload">Batal mengunggah</string>
+  <string name="common_cancel">batal</string>
+  <string name="common_error">kesalahan</string>
+  <string name="sync_string_contacts">kontak</string>
+  <string name="common_share">berbagi</string>
+  <string name="common_remove">hilangkan</string>
+  <string name="ssl_validator_title">peringatan</string>
+  <string name="ssl_validator_btn_details_hide">sembunyikan</string>
+</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
new file mode 100644
index 00000000..7d27649c
--- /dev/null
+++ b/res/values-is/strings.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_files">Skrár</string>
+  <string name="main_music">Tónlist</string>
+  <string name="main_bookmarks">Bókamerki</string>
+  <string name="main_settings">Stillingar</string>
+  <string name="actionbar_upload">Senda inn</string>
+  <string name="actionbar_upload_files">Skrár</string>
+  <string name="actionbar_settings">Stillingar</string>
+  <string name="auth_host_url">URL</string>
+  <string name="auth_username">Notendanafn</string>
+  <string name="auth_password">Lykilorð</string>
+  <string name="sync_string_files">Skrár</string>
+  <string name="setup_hint_username">Notendanafn</string>
+  <string name="setup_hint_password">Lykilorð</string>
+  <string name="uploader_btn_upload_text">Senda inn</string>
+  <string name="filedetails_download">Niðurhal</string>
+  <string name="filedetails_open">Opna</string>
+  <string name="common_yes">Já</string>
+  <string name="common_no">Nei</string>
+  <string name="common_cancel_upload">Hætta við innsendingu</string>
+  <string name="common_cancel">Hætta við</string>
+  <string name="common_error"><strong>Villa</strong></string>
+  <string name="common_share">Deila</string>
+  <string name="common_rename">Endurskýra</string>
+  <string name="common_remove">Fjarlægja</string>
+  <string name="ssl_validator_title">Aðvörun</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0d3b90a2..c99b1c49 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Ciao mondo, schermata principale di ownCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Password:</string>
   <string name="main_login"> Nome utente:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Impostazioni</string>
   <string name="main_tit_accsetup">Configurazione account</string>
   <string name="main_wrn_accsetup">Non ci sono account ownCloud su questo dispositivo. Per utilizzare questa applicazione, devi crearne uno.</string>
+  <string name="about_message">Client ownCloud per Android\n\nversione: %1$s</string>
   <string name="actionbar_sync">Sincronizza account</string>
   <string name="actionbar_upload">Carica un file</string>
   <string name="actionbar_upload_from_apps">Contenuti da altre applicazioni</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud non è abilitato ad accedere al contenuto condiviso</string>
   <string name="uploader_info_uploading">Caricamento in corso</string>
   <string name="uploader_btn_create_dir_text">Crea cartella per il caricamento</string>
+  <string name="file_list_empty">Non ci sono file in questa cartella.\nNuovi file possono essere aggiunti con l\'opzione di menu \"Carica\".</string>
   <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
   <string name="filedetails_size">Dimensione:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Creato:</string>
   <string name="filedetails_modified">Modificato:</string>
   <string name="filedetails_download">Scarica</string>
+  <string name="filedetails_sync_file">Aggiorna</string>
   <string name="filedetails_redownload">Scarica nuovamente</string>
   <string name="filedetails_open">Apri</string>
+  <string name="filedetails_renamed_in_upload_msg">Il file è stato rinominato in %1$s durante il caricamento</string>
   <string name="common_yes">Sì</string>
   <string name="common_no">No</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Annulla lo scaricamento</string>
+  <string name="common_cancel_upload">Annulla invio</string>
   <string name="common_cancel">Annulla</string>
   <string name="common_save_exit">Salva ed esci</string>
   <string name="common_exit">Esci da ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Contatti</string>
   <string name="sync_fail_ticker">Sincronizzazione non riuscita</string>
   <string name="sync_fail_content">La sincronizzazione di %1$s non può essere completata</string>
+  <string name="sync_conflicts_in_favourites_ticker">Conflitti rilevati</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d file non possono essere sincronizzati</string>
+  <string name="sync_fail_in_favourites_ticker">Sincronizzazione dei file non riuscita</string>
+  <string name="sync_fail_in_favourites_content">I contenuti di %1$d file non possono essere sincronizzati (%2$d conflitti)</string>
   <string name="use_ssl">Usa connessione sicura</string>
   <string name="location_no_provider">ownCloud non può tracciare questo dispositivo. Controlla le impostazioni di posizionamento</string>
   <string name="pincode_enter_pin_code">Inserisci il PIN dell\'applicazione</string>
   <string name="pincode_enter_new_pin_code">Inserisci il nuovo PIN dell\'applicazione</string>
   <string name="pincode_configure_your_pin">Inserisci il PIN di ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Il PIN sarà richiesto ad ogni avvio dell\'applicazione</string>
   <string name="pincode_reenter_your_pincode">Inserisci nuovamente il PIN di ownCloud</string>
   <string name="pincode_remove_your_pincode">Rimuovi il PIN di ownCloud</string>
   <string name="pincode_mismatch">I PIN di ownCloud non corrispondono</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Impossibile stabilire la connessione</string>
   <string name="auth_secure_connection">Connessione sicura stabilita</string>
   <string name="auth_login_details">Dettagli di accesso</string>
+  <string name="auth_unauthorized">Credenziali di accesso non valide</string>
+  <string name="auth_not_found">Il percorso fornito non è valido</string>
+  <string name="auth_internal">Errore interno del server, codice %1$d</string>
   <string name="crashlog_message">Applicazione terminata in modo inatteso. Vuoi inviare una segnalazione del problema?</string>
   <string name="crashlog_send_report">Invia segnalazione</string>
   <string name="crashlog_dont_send_report">Non inviare la segnalazione</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Rinomina</string>
   <string name="common_remove">Rimuovi</string>
   <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Vuoi davvero rimuovere %1$s ed i suoi contenuti?</string>
   <string name="confirmation_remove_local">Solo localmente</string>
+  <string name="confirmation_remove_folder_local">Solo contenuti locali</string>
   <string name="confirmation_remove_remote">Rimuovi dal server</string>
   <string name="confirmation_remove_remote_and_local">Sia remoto che locale</string>
   <string name="remove_success_msg">Rimozione effettuata con successo</string>
   <string name="remove_fail_msg">La rimozione non può essere completata</string>
+  <string name="rename_dialog_title">Digita un nuovo nome</string>
   <string name="rename_local_fail_msg">La copia locale non può essere rinominata; prova un nome diverso</string>
   <string name="rename_server_fail_msg">La rinomina non può essere completata</string>
+  <string name="sync_file_fail_msg">Il file remoto non può essere controllato</string>
+  <string name="sync_file_nothing_to_do_msg">Contenuti del file già sincronizzati</string>
   <string name="create_dir_fail_msg">La cartella non può essere creata</string>
   <string name="wait_a_moment">Attendi</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inatteso; prova un\'altra applicazione per selezionare il file</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Impossibile ottenere il certificato del server</string>
   <string name="ssl_validator_question">Vuoi fidarti comunque di questo certificato?</string>
   <string name="ssl_validator_not_saved">Il certificato non può essere salvato</string>
+  <string name="ssl_validator_btn_details_see">Dettagli</string>
+  <string name="ssl_validator_btn_details_hide">Nascondi</string>
+  <string name="ssl_validator_label_subject">Emesso a:</string>
+  <string name="ssl_validator_label_issuer">Emesso da:</string>
+  <string name="ssl_validator_label_CN">Nome comune:</string>
+  <string name="ssl_validator_label_O">Organizzazione:</string>
+  <string name="ssl_validator_label_OU">Unità organizzativa:</string>
+  <string name="ssl_validator_label_C">Nazione:</string>
+  <string name="ssl_validator_label_ST">Stato:</string>
+  <string name="ssl_validator_label_L">Posizione:</string>
+  <string name="ssl_validator_label_validity">Validità:</string>
+  <string name="ssl_validator_label_validity_from">Da:</string>
+  <string name="ssl_validator_label_validity_to">A:</string>
+  <string name="ssl_validator_label_signature">Firma:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
   <string name="text_placeholder">Questo è un segnaposto</string>
   <string name="instant_upload_on_wifi">Carica le immagini solo tramite WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Conflitto di aggiornamento</string>
+  <string name="conflict_message">Il file remoto %s non è sincronizzato con il file locale. Se continui, il contenuto del file sarà sostituito sul server.</string>
+  <string name="conflict_keep_both">Mantieni entrambi</string>
+  <string name="conflict_overwrite">Sovrascrivi</string>
+  <string name="conflict_dont_upload">Non inviare</string>
 </resources>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 0532be9c..383f7eba 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">こんにちは、OwnCloudへようこそ！</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">パスワード:</string>
   <string name="main_login">ユーザー名:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">アカウントを設定</string>
   <string name="main_wrn_accsetup">このデバイスには、ownCloudのアカウントがありません。このアプリケーションを使用するにはアカウントを作成してください。</string>
+  <string name="about_message">ownCloud Android クライアント\n\nバージョン: %1$s</string>
   <string name="actionbar_sync">同期</string>
   <string name="actionbar_upload">ファイルをアップロード</string>
   <string name="actionbar_upload_from_apps">他アプリからのコンテンツ</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloudで共有コンテンツへのアクセスが許可されていません。</string>
   <string name="uploader_info_uploading">アップロード中</string>
   <string name="uploader_btn_create_dir_text">アップロード用のディレクトリを作成</string>
+  <string name="file_list_empty">このフォルダにはファイルがありません。\n\"アップロード\" メニューで新しいファイルを追加することができます。</string>
   <string name="filedetails_select_file">ファイルをタップすると追加情報が表示されます。</string>
   <string name="filedetails_size">サイズ:</string>
   <string name="filedetails_type">タイプ:</string>
   <string name="filedetails_created">作成:</string>
   <string name="filedetails_modified">更新:</string>
   <string name="filedetails_download">ダウンロード</string>
+  <string name="filedetails_sync_file">同期</string>
   <string name="filedetails_redownload">再ダウンロード</string>
   <string name="filedetails_open">開く</string>
+  <string name="filedetails_renamed_in_upload_msg">アップロード中にファイル名を %1$s に変更しました</string>
   <string name="common_yes">はい</string>
   <string name="common_no">いいえ</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">ダウンロードをキャンセル</string>
+  <string name="common_cancel_upload">アップロードをキャンセル</string>
   <string name="common_cancel">キャンセル</string>
   <string name="common_save_exit">保存して終了</string>
   <string name="common_exit">ownCloudを終了</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">コンタクト</string>
   <string name="sync_fail_ticker">同期失敗</string>
   <string name="sync_fail_content">%1$s の同期が完了しませんでした。</string>
+  <string name="sync_conflicts_in_favourites_ticker">競合が見つかりました</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d 同期ファイルを同期できませんでした</string>
+  <string name="sync_fail_in_favourites_ticker">ファイルの同期に失敗しました</string>
+  <string name="sync_fail_in_favourites_content">%1$d ファイルのコンテンツを同期できませんでした（%2$d の競合）</string>
   <string name="use_ssl">暗号通信を利用</string>
   <string name="location_no_provider">ownCloudがあなたのデバイスの位置情報を取得出来ません。位置情報設定を確認してください。</string>
   <string name="pincode_enter_pin_code">アプリのパスワードを入力してください</string>
   <string name="pincode_enter_new_pin_code">新しいアプリのパスワードを入力してください</string>
   <string name="pincode_configure_your_pin">ownCloudアプリのパスワードを入力してください</string>
+  <string name="pincode_configure_your_pin_explanation">アプリ開始時に毎回PINが要求されます。</string>
   <string name="pincode_reenter_your_pincode">ownCloudアプリのパスワードを再入力してください</string>
   <string name="pincode_remove_your_pincode">ownCloudアプリのパスワードを削除</string>
   <string name="pincode_mismatch">ownCloudアプリのパスワードが一致しません</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">接続を確立できませんでした</string>
   <string name="auth_secure_connection">暗号化通信を確立しました</string>
   <string name="auth_login_details">ログインの詳細</string>
+  <string name="auth_unauthorized">無効なログイン／パスワード</string>
+  <string name="auth_not_found">誤ったパスが指定されました</string>
+  <string name="auth_internal">内部サーバエラー、コード %1$d</string>
   <string name="crashlog_message">アプリケーションが予期せず終了しました。クラッシュレポートを送ってもよろしいでしょうか？</string>
   <string name="crashlog_send_report">レポートを送信</string>
   <string name="crashlog_dont_send_report">レポートを送信しない</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">名前を変更</string>
   <string name="common_remove">削除</string>
   <string name="confirmation_remove_alert">本当に %1$s を削除してもよろしいですか？</string>
+  <string name="confirmation_remove_folder_alert">本当に %1$s およびそのコンテンツを削除してもよろしいですか？</string>
   <string name="confirmation_remove_local">ローカルのみ</string>
+  <string name="confirmation_remove_folder_local">ローカルコンテンツのみ</string>
   <string name="confirmation_remove_remote">サーバから削除</string>
   <string name="confirmation_remove_remote_and_local">リモートとローカルの両方</string>
   <string name="remove_success_msg">削除に成功しました</string>
   <string name="remove_fail_msg">削除を完了できませんでした</string>
+  <string name="rename_dialog_title">新しい名前を入力</string>
   <string name="rename_local_fail_msg">ローカルコピーの名前の変更ができませんでした。別の名前で試してみてください</string>
   <string name="rename_server_fail_msg">名前の変更ができませんでした</string>
+  <string name="sync_file_fail_msg">リモートファイルをチェックできませんでした</string>
+  <string name="sync_file_nothing_to_do_msg">ファイルコンテンツはすでに同期されています</string>
   <string name="create_dir_fail_msg">ディレクトリを作成できませんでした</string>
   <string name="wait_a_moment">しばらくお待ちください</string>
   <string name="filedisplay_unexpected_bad_get_content">予期せぬ問題；他のアプリでファイルを選択してみてください。</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">サーバ証明書を取得できませんでした</string>
   <string name="ssl_validator_question">この証明書を信頼してもよろしいですか？</string>
   <string name="ssl_validator_not_saved">証明書は保存できませんでした</string>
+  <string name="ssl_validator_btn_details_see">詳細</string>
+  <string name="ssl_validator_btn_details_hide">非表示</string>
+  <string name="ssl_validator_label_subject">発行先:</string>
+  <string name="ssl_validator_label_issuer">発行元:</string>
+  <string name="ssl_validator_label_CN">コモンネーム:</string>
+  <string name="ssl_validator_label_O">組織:</string>
+  <string name="ssl_validator_label_OU">部門:</string>
+  <string name="ssl_validator_label_C">国:</string>
+  <string name="ssl_validator_label_ST">州:</string>
+  <string name="ssl_validator_label_L">市区町村:</string>
+  <string name="ssl_validator_label_validity">有効期限:</string>
+  <string name="ssl_validator_label_validity_from">元:</string>
+  <string name="ssl_validator_label_validity_to">先:</string>
+  <string name="ssl_validator_label_signature">署名:</string>
+  <string name="ssl_validator_label_signature_algorithm">アルゴリズム:</string>
   <string name="text_placeholder">これはプレースホルダです</string>
   <string name="instant_upload_on_wifi">WiFi経由でのみ写真をアップロード</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">更新の競合</string>
+  <string name="conflict_message">リモートファイル %s はローカルファイルと同期していません。続行すると、サーバ上のファイルを置き換えます。</string>
+  <string name="conflict_keep_both">両方を保持</string>
+  <string name="conflict_overwrite">上書き</string>
+  <string name="conflict_dont_upload">アップロードしない</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c757504a..f1b1a5bf 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1,2 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">ფაილები</string>
+  <string name="main_music">მუსიკა</string>
+  <string name="main_contacts">კონტაქტები</string>
+  <string name="main_bookmarks">ბუქმარკები</string>
+  <string name="main_settings">პარამეტრები</string>
+  <string name="actionbar_upload">ატვირთვა</string>
+  <string name="actionbar_upload_files">ფაილები</string>
+  <string name="actionbar_settings">პარამეტრები</string>
+  <string name="prefs_category_general">ზოგადი</string>
+  <string name="auth_host_url">URL</string>
+  <string name="auth_username">მომხმარებლის სახელი</string>
+  <string name="auth_password">პაროლი</string>
+  <string name="sync_string_files">ფაილები</string>
+  <string name="setup_hint_username">მომხმარებლის სახელი</string>
+  <string name="setup_hint_password">პაროლი</string>
+  <string name="uploader_btn_upload_text">ატვირთვა</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">გამოსვლა</string>
+  <string name="filedetails_download">ჩამოტვირთვა</string>
+  <string name="filedetails_open">გახსნა</string>
+  <string name="common_yes">კი</string>
+  <string name="common_cancel_upload">ატვირთვის გაუქმება</string>
+  <string name="common_cancel">გაუქმება</string>
+  <string name="common_error">შეცდომა</string>
+  <string name="sync_string_contacts">კონტაქტები</string>
+  <string name="common_share">გაზიარება</string>
+  <string name="common_rename">გადარქმევა</string>
+  <string name="common_remove">წაშლა</string>
+  <string name="ssl_validator_title">გაფრთხილება</string>
+  <string name="ssl_validator_btn_details_hide">დამალვა</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c757504a..43e4931e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,2 +1,219 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">암호:</string>
+  <string name="main_login">사용자 이름:</string>
+  <string name="main_button_login">로그인</string>
+  <string name="main_welcome">환영합니다</string>
+  <string name="main_files">파일</string>
+  <string name="main_music">음악</string>
+  <string name="main_contacts">연락처</string>
+  <string name="main_calendar">달력</string>
+  <string name="main_bookmarks">책갈피</string>
+  <string name="main_settings">설정</string>
+  <string name="main_tit_accsetup">계정 설정</string>
+  <string name="main_wrn_accsetup">이 장치에 ownCloud 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
+  <string name="about_message">%1$s Android 앱\n\n버전: %2$s</string>
+  <string name="actionbar_sync">새로 고침</string>
+  <string name="actionbar_upload">업로드</string>
+  <string name="actionbar_upload_from_apps">다른 앱의 콘텐츠</string>
+  <string name="actionbar_upload_files">파일</string>
+  <string name="actionbar_mkdir">디렉터리 만들기</string>
+  <string name="actionbar_search">검색</string>
+  <string name="actionbar_settings">설정</string>
+  <string name="prefs_category_general">일반</string>
+  <string name="prefs_category_trackmydevice">장치 추적</string>
+  <string name="prefs_add_session">새 세션 추가</string>
+  <string name="prefs_create_img_thumbnails">미리 보기 그림 만들기</string>
+  <string name="prefs_select_oc_account">계정 선택</string>
+  <string name="prefs_summary_select_oc_account">이 앱에서 사용할 계정을 선택하십시오.</string>
+  <string name="prefs_trackmydevice">장치 추적</string>
+  <string name="prefs_trackmydevice_summary_off">ownCloud에서 현재 위치 추적하기</string>
+  <string name="prefs_trackmydevice_summary_on">이 앱에서 장치 위치를 추적합니다</string>
+  <string name="prefs_trackmydevice_interval">업데이트 주기</string>
+  <string name="prefs_trackmydevice_interval_summary">%1$s분마다 업데이트</string>
+  <string name="prefs_accounts">계정</string>
+  <string name="prefs_manage_accounts">계정 관리</string>
+  <string name="prefs_pincode">앱 암호</string>
+  <string name="prefs_pincode_summary">내 클라이언트 보호</string>
+  <string name="prefs_instant_upload">자동 업로드 사용</string>
+  <string name="prefs_instant_upload_summary">카메라로 촬영한 사진 자동 업로드</string>
+  <string name="auth_host_url">URL</string>
+  <string name="auth_username">사용자 이름</string>
+  <string name="auth_password">암호</string>
+  <string name="auth_register">%1$s의 새로운 사용자입니다</string>
+  <string name="new_session_uri_error">잘못된 주소를 입력하였습니다</string>
+  <string name="new_session_session_name_error">세션 이름이 잘못되었습니다</string>
+  <string name="sync_string_files">파일</string>
+  <string name="uploader_no_file_selected">업로드할 파일이 선택되지 않았습니다</string>
+  <string name="setup_hint_username">사용자 이름</string>
+  <string name="setup_hint_password">암호</string>
+  <string name="setup_hint_address">웹 주소</string>
+  <string name="setup_hint_show_password">암호 보이기</string>
+  <string name="setup_title">내 %1$s에 접속</string>
+  <string name="setup_btn_connect">접속</string>
+  <string name="uploader_btn_upload_text">업로드</string>
+  <string name="uploader_wrn_no_account_title">계정 없음</string>
+  <string name="uploader_wrn_no_account_text">이 장치에 %1$s 계정이 없습니다. 먼저 계정을 설정하십시오.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">설정</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">끝내기</string>
+  <string name="uploader_wrn_no_content_title">업로드할 콘텐츠 없음</string>
+  <string name="uploader_wrn_no_content_text">받은 콘텐츠가 없습니다. 업로드할 항목이 없습니다.</string>
+  <string name="uploader_error_forbidden_content">%1$s에서 공유된 콘텐츠에 접근할 수 없습니다</string>
+  <string name="uploader_info_uploading">업로드 중</string>
+  <string name="uploader_btn_create_dir_text">업로드할 디렉터리 만들기</string>
+  <string name="file_list_empty">이 폴더에 파일이 없습니다.\n메뉴 옵션의 \"업로드\" 항목을 사용하여 새 파일을 업로드할 수 있습니다.</string>
+  <string name="filedetails_select_file">파일을 누르면 추가 정보가 표시됩니다.</string>
+  <string name="filedetails_size">크기:</string>
+  <string name="filedetails_type">종류:</string>
+  <string name="filedetails_created">만든 날짜:</string>
+  <string name="filedetails_modified">수정한 날짜:</string>
+  <string name="filedetails_download">다운로드</string>
+  <string name="filedetails_sync_file">새로 고침</string>
+  <string name="filedetails_redownload">다시 다운로드</string>
+  <string name="filedetails_open">열기</string>
+  <string name="filedetails_renamed_in_upload_msg">업로드 중 파일 이름을 %1$s(으)로 변경하였습니다</string>
+  <string name="common_yes">예</string>
+  <string name="common_no">아니요</string>
+  <string name="common_ok">확인</string>
+  <string name="common_cancel_download">다운로드 취소</string>
+  <string name="common_cancel_upload">업로드 취소</string>
+  <string name="common_cancel">취소</string>
+  <string name="common_save_exit">저장하고 끝내기</string>
+  <string name="common_exit">%1$s 떠나기</string>
+  <string name="common_error">오류</string>
+  <string name="about_title">정보</string>
+  <string name="delete_account">계정 삭제</string>
+  <string name="create_account">계정 만들기</string>
+  <string name="upload_chooser_title">다음에서 업로드...</string>
+  <string name="uploader_info_dirname">디렉터리 이름</string>
+  <string name="uploader_upload_in_progress_ticker">업로드 중...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% %2$s 업로드 중</string>
+  <string name="uploader_upload_succeeded_ticker">업로드 성공</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s을(를) 업로드하였습니다</string>
+  <string name="uploader_upload_succeeded_content_multiple">파일 %1$d개를 업로드하였습니다</string>
+  <string name="uploader_upload_failed_ticker">업로드 실패</string>
+  <string name="uploader_upload_failed_content_single">%1$s을(를) 업로드할 수 없었습니다</string>
+  <string name="uploader_upload_failed_content_multiple">업로드 실패: 파일 %2$d개 중 %1$d개를 업로드하였습니다</string>
+  <string name="downloader_download_in_progress_ticker">다운로드 중...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% %2$s 다운로드 중</string>
+  <string name="downloader_download_succeeded_ticker">다운로드 성공</string>
+  <string name="downloader_download_succeeded_content">%1$s을(를) 다운로드하였습니다</string>
+  <string name="downloader_download_failed_ticker">다운로드 실패</string>
+  <string name="downloader_download_failed_content">%1$s을(를) 다운로드할 수 없었습니다</string>
+  <string name="common_choose_account">계정 선택</string>
+  <string name="sync_string_contacts">연락처</string>
+  <string name="sync_fail_ticker">동기화 실패</string>
+  <string name="sync_fail_content">%1$s와(과) 동기화할 수 없었습니다</string>
+  <string name="sync_conflicts_in_favourites_ticker">충돌하는 항목 발견됨</string>
+  <string name="sync_conflicts_in_favourites_content">동기화된 파일 중 %1$d개를 동기화할 수 없었습니다</string>
+  <string name="sync_fail_in_favourites_ticker">파일을 동기화할 수 없었습니다</string>
+  <string name="sync_fail_in_favourites_content">파일 %1$d개의 내용을 동기화할 수 없었습니다 (충돌 %2$d개)</string>
+  <string name="use_ssl">암호화된 연결 사용</string>
+  <string name="location_no_provider">%1$s에서 장치 위치를 추적할 수 없습니다. 위치 설정을 확인하십시오.</string>
+  <string name="pincode_enter_pin_code">앱 암호를 입력하십시오</string>
+  <string name="pincode_enter_new_pin_code">새 앱 암호를 입력하십시오</string>
+  <string name="pincode_configure_your_pin">앱 암호를 입력하십시오</string>
+  <string name="pincode_configure_your_pin_explanation">앱을 시작할 때마다 암호를 물어봅니다</string>
+  <string name="pincode_reenter_your_pincode">앱 암호를 다시 입력하십시오</string>
+  <string name="pincode_remove_your_pincode">앱 암호 삭제</string>
+  <string name="pincode_mismatch">앱 암호가 일치하지 않습니다</string>
+  <string name="pincode_wrong">앱 암호가 잘못되었습니다</string>
+  <string name="pincode_removed">앱 암호가 삭제되었습니다</string>
+  <string name="pincode_stored">앱 암호가 저장되었습니다</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15분</item>
+    <item>30분</item>
+    <item>60분</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">로그인 중...</string>
+  <string name="auth_no_net_conn_title">네트워크에 연결할 수 없습니다</string>
+  <string name="auth_no_net_conn_message">네트워크 연결을 시도할 수 없습니다. 인터넷 연결을 확인하고 다시 시도하십시오.</string>
+  <string name="auth_connect_anyway">그래도 접속하기</string>
+  <string name="auth_nossl_plain_ok_title">암호화된 연결을 사용할 수 없습니다.</string>
+  <string name="auth_nossl_plain_ok_message">서버와 암호화된 통신을 시도할 수 없었습니다. 암호화되지 않은 연결을 사용할 수 있습니다. 그래도 접속하거나 취소할 수 있습니다.</string>
+  <string name="auth_connection_established">연결됨</string>
+  <string name="auth_testing_connection">연결 테스트 중...</string>
+  <string name="auth_not_configured_title">서버 설정이 잘못됨</string>
+  <string name="auth_not_configured_message">서버 인스턴스가 잘못 설정된 것 같습니다. 서버 관리자에게 문의하십시오.</string>
+  <string name="auth_unknown_error_title">알 수 없는 오류가 발생하였습니다!</string>
+  <string name="auth_unknown_error_message">알 수 없는 오류가 발생하였습니다. 지원 요청을 할 때 장치에 저장된 로그를 같이 업로드해 주십시오.</string>
+  <string name="auth_unknown_host_title">호스트를 찾을 수 없음</string>
+  <string name="auth_unknown_host_message">입력한 호스트를 찾을 수 없습니다. 호스트 이름과 서버 상태를 확인한 후 다시 시도해 주십시오.</string>
+  <string name="auth_incorrect_path_title">서버 인스턴스를 찾을 수 없음</string>
+  <string name="auth_incorrect_path_message">지정한 경로에서 서버 인스턴스를 찾을 수 없습니다. 경로를 확인하고 다시 시도해 주십시오.</string>
+  <string name="auth_timeout_title">서버 응답 시간이 초과되었습니다</string>
+  <string name="auth_incorrect_address_title">잘못된 URL</string>
+  <string name="auth_ssl_general_error_title">SSL 초기화 오류</string>
+  <string name="auth_ssl_unverified_server_title">확인되지 않은 SSL 서버 인증서</string>
+  <string name="auth_bad_oc_version_title">확인할 수 없는 서버 버전</string>
+  <string name="auth_wrong_connection_title">연결을 수립할 수 없음</string>
+  <string name="auth_secure_connection">암호화된 연결 사용 중</string>
+  <string name="auth_login_details">로그인 정보</string>
+  <string name="auth_unauthorized">잘못된 로그인/암호</string>
+  <string name="auth_not_found">경로가 잘못되었습니다</string>
+  <string name="auth_internal">내부 서버 오류, 코드 %1$d</string>
+  <string name="crashlog_message">프로그램이 예상치 못하게 종료되었습니다. 충돌 보고서를 전송하시겠습니까?</string>
+  <string name="crashlog_send_report">보고서 보내기</string>
+  <string name="crashlog_dont_send_report">보내지 않기</string>
+  <string name="extensions_avail_title">확장 기능을 사용할 수 있습니다!</string>
+  <string name="extensions_avail_message">현재 서버 인스턴스에서 확장 기능을 지원하는 것 같습니다. 안드로이드용 확장 기능을 검색해 보시겠습니까?</string>
+  <string name="fd_keep_in_sync">파일을 최신 정보로 유지</string>
+  <string name="common_share">공유</string>
+  <string name="common_rename">이름 바꾸기</string>
+  <string name="common_remove">삭제</string>
+  <string name="confirmation_remove_alert">%1$s을(를) 삭제하시겠습니까?</string>
+  <string name="confirmation_remove_folder_alert">%1$s 및 그 내용을 삭제하시겠습니까?</string>
+  <string name="confirmation_remove_local">로컬만</string>
+  <string name="confirmation_remove_folder_local">로컬 콘텐츠만</string>
+  <string name="confirmation_remove_remote">서버에서 삭제</string>
+  <string name="confirmation_remove_remote_and_local">서버와 로컬 모두</string>
+  <string name="remove_success_msg">성공적으로 삭제하였습니다</string>
+  <string name="remove_fail_msg">삭제할 수 없었습니다</string>
+  <string name="rename_dialog_title">새 이름 입력</string>
+  <string name="rename_local_fail_msg">로컬 파일의 이름을 변경할 수 없습니다. 다른 이름을 입력하십시오</string>
+  <string name="rename_server_fail_msg">이름을 변경할 수 없었습니다</string>
+  <string name="sync_file_fail_msg">원격 파일을 확인할 수 없었습니다</string>
+  <string name="sync_file_nothing_to_do_msg">파일 내용이 이미 동기화되었습니다</string>
+  <string name="create_dir_fail_msg">디렉터리를 만들 수 없었습니다</string>
+  <string name="wait_a_moment">잠시 기다려 주십시오</string>
+  <string name="filedisplay_unexpected_bad_get_content">예상하지 못한 오류입니다. 다른 앱에서 파일을 선택하십시오</string>
+  <string name="filedisplay_no_file_selected">선택한 파일 없음</string>
+  <string name="ssl_validator_title">경고</string>
+  <string name="ssl_validator_header">사이트 인증서를 확인할 수 없었습니다</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- 서버 인증서를 신뢰할 수 없습니다</string>
+  <string name="ssl_validator_reason_cert_expired">- 서버 인증서가 만료되었습니다</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- 서버 인증서의 유효 기간이 시작되지 않았습니다</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- 인증서의 URL과 입력한 URL이 일치하지 않습니다</string>
+  <string name="ssl_validator_certificate_not_available">서버 인증서를 가져올 수 없었습니다</string>
+  <string name="ssl_validator_question">이 인증서를 신뢰하시겠습니까?</string>
+  <string name="ssl_validator_not_saved">인증서를 저장할 수 없었습니다</string>
+  <string name="ssl_validator_btn_details_see">자세히</string>
+  <string name="ssl_validator_btn_details_hide">숨기기</string>
+  <string name="ssl_validator_label_subject">발급 대상:</string>
+  <string name="ssl_validator_label_issuer">발급자:</string>
+  <string name="ssl_validator_label_CN">공통 이름:</string>
+  <string name="ssl_validator_label_O">조직:</string>
+  <string name="ssl_validator_label_OU">조직 단위:</string>
+  <string name="ssl_validator_label_C">국가:</string>
+  <string name="ssl_validator_label_ST">도/광역시:</string>
+  <string name="ssl_validator_label_L">위치:</string>
+  <string name="ssl_validator_label_validity">유효 기간:</string>
+  <string name="ssl_validator_label_validity_from">시작:</string>
+  <string name="ssl_validator_label_validity_to">끝:</string>
+  <string name="ssl_validator_label_signature">서명:</string>
+  <string name="ssl_validator_label_signature_algorithm">알고리즘:</string>
+  <string name="text_placeholder">자리 비움자</string>
+  <string name="instant_upload_on_wifi">WiFi 사용 중일때만 사진 업로드</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">업데이트 충돌</string>
+  <string name="conflict_message">원격 파일 %s이(가) 로컬 파일과 동기화되지 않았습니다. 계속 진행하면 서버에 있는 파일을 덮어씁니다.</string>
+  <string name="conflict_keep_both">모두 저장</string>
+  <string name="conflict_overwrite">덮어쓰기</string>
+  <string name="conflict_dont_upload">업로드하지 않음</string>
+</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index c757504a..2b7d3d5c 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -1,2 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Passwuert:</string>
+  <string name="main_music">Musek</string>
+  <string name="main_contacts">Kontakter</string>
+  <string name="main_settings">Astellungen</string>
+  <string name="actionbar_settings">Astellungen</string>
+  <string name="filedetails_download">Download</string>
+  <string name="common_yes">Jo</string>
+  <string name="common_cancel_upload">Upload ofbriechen</string>
+  <string name="common_cancel">Ofbriechen</string>
+  <string name="common_error">Fehler</string>
+  <string name="sync_string_contacts">Kontakter</string>
+  <string name="common_share">Deelen</string>
+  <string name="ssl_validator_title">Warnung</string>
+</resources>
diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml
index 189c55dc..0df5da8e 100644
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@ -2,66 +2,151 @@
 <resources>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Slaptažodis:</string>
+  <string name="main_login">Prisijungimo vardas:</string>
+  <string name="main_button_login">Prisijungti</string>
+  <string name="main_welcome">Sveiki prisijungę prie savo OwnCloud</string>
   <string name="main_files">Failai</string>
   <string name="main_music">Muzika</string>
   <string name="main_contacts">Kontaktai</string>
   <string name="main_calendar">Kalendorius</string>
+  <string name="main_bookmarks">Žymekliai</string>
   <string name="main_settings">Nustatymai</string>
+  <string name="main_tit_accsetup">Nustatyti paskyrą</string>
+  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos ownCloud paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
   <string name="actionbar_sync">Atnaujinti</string>
+  <string name="actionbar_upload">Įkelti</string>
   <string name="actionbar_upload_from_apps">Turinys iš kitų programų</string>
   <string name="actionbar_upload_files">Failai</string>
+  <string name="actionbar_mkdir">Kurti aplanką</string>
   <string name="actionbar_search">Paieška</string>
   <string name="actionbar_settings">Nustatymai</string>
+  <string name="prefs_add_session">Pridėti naują sesiją</string>
   <string name="prefs_create_img_thumbnails">Sukurti paveikslėlių miniatiūras</string>
+  <string name="prefs_select_oc_account">Pasirinkite paskyrą</string>
+  <string name="prefs_summary_select_oc_account">Pasirinkite kurias jūsų paskyras programa turėtų naudoti.</string>
   <string name="prefs_trackmydevice_interval">Atnaujinimo intervalas</string>
+  <string name="prefs_accounts">Paskyros</string>
+  <string name="prefs_manage_accounts">Tvarkyti paskyras</string>
   <string name="prefs_pincode">ownCloud programos PIN kodas</string>
   <string name="prefs_pincode_summary">Apsaugokite savo ownCloud klientą</string>
   <string name="prefs_instant_upload_summary">Iš karto nusiųsti nufotografuotas nuotraukas</string>
   <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_username">Prisijungimo vardas</string>
   <string name="auth_password">Slaptažodis</string>
   <string name="new_session_uri_error">Neteisingas URL</string>
   <string name="new_session_session_name_error">Neteisingas sesijos pavadinimas</string>
   <string name="sync_string_files">Failai</string>
+  <string name="uploader_no_file_selected">Nusiuntimui nepasirinktas joks failas</string>
+  <string name="setup_hint_username">Prisijungimo vardas</string>
   <string name="setup_hint_password">Slaptažodis</string>
   <string name="setup_hint_address">Web adresas</string>
   <string name="setup_hint_show_password">Rodyti slaptažodį?</string>
   <string name="setup_title">Prisijunkite prie savo ownCloud</string>
   <string name="setup_btn_connect">Prisijungti</string>
+  <string name="uploader_btn_upload_text">Įkelti</string>
+  <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">IÅ¡eiti</string>
+  <string name="uploader_info_uploading">Išsiunčiama</string>
+  <string name="uploader_btn_create_dir_text">Kurti aplanką išsiuntimui</string>
   <string name="filedetails_size">Dydis:</string>
   <string name="filedetails_type">Tipas:</string>
   <string name="filedetails_created">Sukurta:</string>
   <string name="filedetails_modified">Modifikuota:</string>
   <string name="filedetails_download">Atsisiųsti</string>
+  <string name="filedetails_sync_file">Atnaujinti</string>
+  <string name="filedetails_redownload">Atnaujinti</string>
   <string name="filedetails_open">Atidaryti</string>
   <string name="common_yes">Taip</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">Gerai</string>
+  <string name="common_cancel_upload">Atšaukti siuntimą</string>
   <string name="common_cancel">Atšaukti</string>
   <string name="common_error">Klaida</string>
   <string name="about_title">Apie</string>
+  <string name="delete_account">Ištrinti paskyrą</string>
+  <string name="create_account">Sukurti paskyrą</string>
+  <string name="upload_chooser_title">Įkelti iš ...</string>
+  <string name="uploader_info_dirname">Aplanko pavadinimas</string>
+  <string name="uploader_upload_in_progress_ticker">Įkeliama ...</string>
+  <string name="uploader_upload_failed_ticker">Nusiuntimas nepavyko</string>
   <string name="downloader_download_in_progress_ticker">Atsiunčiama...</string>
   <string name="downloader_download_succeeded_ticker">Atsiuntimas pavyko</string>
   <string name="downloader_download_failed_ticker">Atsiuntimas nepavyko</string>
+  <string name="common_choose_account">Pasirinkite paskyrą</string>
   <string name="sync_string_contacts">Kontaktai</string>
+  <string name="sync_fail_ticker">Sinchronizacija nepavyko</string>
   <string name="use_ssl">Naudoti saugų prisijungimą</string>
+  <string name="location_no_provider">ownCloud negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
   <string name="pincode_enter_pin_code">Prašome įvesti savo programos PIN kodą</string>
   <string name="pincode_enter_new_pin_code">Prašome įvesti naują programos PIN kodą</string>
   <string name="pincode_configure_your_pin">Įveskite ownCloud programos PIN kodą</string>
+  <string name="pincode_configure_your_pin_explanation">PIN bus prašomas kiekvieną kartą paleidus programą</string>
   <string name="pincode_reenter_your_pincode">Prašome pakartoti ownCloud PIN kodą</string>
   <string name="pincode_remove_your_pincode">Pašalinti ownCloud programos PIN kodą</string>
   <string name="pincode_mismatch">Abu ownCloud programos PIN kodai nesutampa</string>
   <string name="pincode_wrong">Neteisingas ownCloud programos PIN kodas</string>
   <string name="pincode_removed">ownCloud programos PIN kodas pašalintas</string>
   <string name="pincode_stored">ownCloud programos PIN kodas išsaugotas</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 Minučių</item>
+    <item>30 Minučių</item>
+    <item>60 Minučių</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
   <string name="auth_trying_to_login">Bandoma prisijungti...</string>
   <string name="auth_no_net_conn_title">Nėra tinklo ryšio</string>
   <string name="auth_connect_anyway">Vis tiek prisijungti</string>
   <string name="auth_nossl_plain_ok_title">Saugus prisijungimas negalimas.</string>
+  <string name="auth_connection_established">Ryšys užmegztas</string>
   <string name="auth_testing_connection">IÅ¡bandomas prisijungimas...</string>
+  <string name="auth_not_configured_title">Sugadinta ownCloud konfigūracija</string>
+  <string name="auth_unknown_error_title">Įvyko nežinoma klaida!</string>
   <string name="auth_timeout_title">Serveris per ilgai neatsako</string>
   <string name="auth_incorrect_address_title">URL adrese yra klaidų</string>
+  <string name="auth_ssl_general_error_title">Nepavyko aktyvuoti SSL</string>
+  <string name="auth_bad_oc_version_title">Nežinoma ownCloud serverio versija</string>
   <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
+  <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
+  <string name="auth_login_details">Prisijungimo duomenys</string>
+  <string name="crashlog_message">Programa netikėtai sustojo. Ar norite nusiųsti šio lūžimo ataskaitą programos kūrėjams?</string>
+  <string name="crashlog_send_report">Siųsti ataskaitą </string>
+  <string name="crashlog_dont_send_report">Nesiųsti ataskaitos</string>
+  <string name="extensions_avail_title">Yra naujų papildinių!</string>
+  <string name="common_share">Dalintis</string>
+  <string name="common_rename">Pervadinti</string>
+  <string name="common_remove">Pašalinti</string>
   <string name="confirmation_remove_remote">Pašalinti iš serverio</string>
+  <string name="remove_success_msg">Pašalinta sėkmingai</string>
+  <string name="remove_fail_msg">Pašalinti nepavyko</string>
+  <string name="rename_local_fail_msg">Lokalios kopijos pervadinti nepavyko, pabandykite kitą pavadinimą</string>
+  <string name="rename_server_fail_msg">Pervadinti nepavyko</string>
+  <string name="create_dir_fail_msg">Aplanko sukurti nepavyko</string>
   <string name="wait_a_moment">Truputį palaukite</string>
   <string name="filedisplay_no_file_selected">Joks failas nebuvo pasirinktas</string>
+  <string name="ssl_validator_title">Įspėjimas</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Nepatikimas serverio sertifikatas</string>
+  <string name="ssl_validator_reason_cert_expired">- Serverio sertifikatas galiojimo laikas pasibaigęs</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Serverio sertifikatas yra pernelyg naujas</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL neatitinka adreso, kuris yra nurodytas sertifikate</string>
+  <string name="ssl_validator_certificate_not_available">Negalima gauti serverio sertifikato</string>
+  <string name="ssl_validator_question">Ar vis tiek norite priimti šį sertifikatą?</string>
+  <string name="ssl_validator_not_saved">Sertifikatas negali būti išsaugotas</string>
+  <string name="ssl_validator_label_O">Organizacija:</string>
+  <string name="ssl_validator_label_OU">Organizacijos padalinys:</string>
+  <string name="ssl_validator_label_C">Å alis:</string>
+  <string name="ssl_validator_label_ST">Valstija:</string>
+  <string name="ssl_validator_label_L">Vieta:</string>
+  <string name="ssl_validator_label_validity">Galiojimas:</string>
+  <string name="ssl_validator_label_validity_from">Nuo:</string>
+  <string name="ssl_validator_label_validity_to">Iki:</string>
+  <string name="ssl_validator_label_signature">Parašas:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmas:</string>
+  <string name="instant_upload_on_wifi">Įkelti nuotraukas tik kai prisijungiama per WiFi</string>
+  <string name="conflict_keep_both">Palikti abu</string>
+  <string name="conflict_overwrite">Perrašyti</string>
+  <string name="conflict_dont_upload">Nebesiųsti</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c757504a..3d49b8fb 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,2 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">Faili</string>
+  <string name="main_music">MÅ«zika</string>
+  <string name="main_settings">Iestatījumi</string>
+  <string name="actionbar_upload">Augšuplādet</string>
+  <string name="actionbar_upload_files">Faili</string>
+  <string name="actionbar_settings">Iestatījumi</string>
+  <string name="auth_username">Lietotājvārds</string>
+  <string name="auth_password">Parole</string>
+  <string name="sync_string_files">Faili</string>
+  <string name="setup_hint_username">Lietotājvārds</string>
+  <string name="setup_hint_password">Parole</string>
+  <string name="uploader_btn_upload_text">Augšuplādet</string>
+  <string name="filedetails_download">Lejuplādēt</string>
+  <string name="common_cancel_upload">Atcelt augšuplādi</string>
+  <string name="common_error">Kļūme</string>
+  <string name="common_share">Līdzdalīt</string>
+  <string name="common_rename">Pārdēvēt</string>
+</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c757504a..bdaf9360 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1,2 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Лозинка:</string>
+  <string name="main_login">Корисник:</string>
+  <string name="main_button_login">Најава</string>
+  <string name="main_welcome">Добредојде</string>
+  <string name="main_files">Датотеки</string>
+  <string name="main_music">Музика</string>
+  <string name="main_contacts">Контакти</string>
+  <string name="main_calendar">Календар</string>
+  <string name="main_bookmarks">Обележувачи</string>
+  <string name="main_settings">Параметри</string>
+  <string name="main_tit_accsetup">Постави сметка</string>
+  <string name="main_wrn_accsetup">Нема конфигурирано сметка на овој уред, за да можете да ја користите апликацијава треба да направите сметка.</string>
+  <string name="actionbar_sync">Освежи</string>
+  <string name="actionbar_upload">Подигни</string>
+  <string name="actionbar_upload_files">Датотеки</string>
+  <string name="actionbar_mkdir">Создади папка</string>
+  <string name="actionbar_search">Барај</string>
+  <string name="actionbar_settings">Параметри</string>
+  <string name="prefs_category_general">Општо</string>
+  <string name="prefs_category_trackmydevice">Следење на уред</string>
+  <string name="prefs_add_session">Додади нова сесија</string>
+  <string name="prefs_create_img_thumbnails">Направи мали слики</string>
+  <string name="prefs_select_oc_account">Избери сметка</string>
+  <string name="prefs_summary_select_oc_account">Избери која од вашите сметки</string>
+  <string name="prefs_trackmydevice">Следење на уред</string>
+  <string name="prefs_trackmydevice_summary_off">Овозможи ја оваа апликација за да ја следите локацијата на вашиот уред</string>
+  <string name="prefs_trackmydevice_summary_on">Оваа апликација го следи вашиот уред</string>
+  <string name="prefs_trackmydevice_interval">Интервал на ажурирање</string>
+  <string name="prefs_trackmydevice_interval_summary">Ажурирај секои %1$s минути</string>
+  <string name="prefs_accounts">Сметки</string>
+  <string name="auth_host_url">Адреса</string>
+  <string name="auth_username">Корисничко име</string>
+  <string name="auth_password">Лозинка</string>
+  <string name="new_session_uri_error">Дадена неточна адреса</string>
+  <string name="new_session_session_name_error">Неточно име на сесија</string>
+  <string name="sync_string_files">Датотеки</string>
+  <string name="setup_hint_username">Корисничко име</string>
+  <string name="setup_hint_password">Лозинка</string>
+  <string name="uploader_btn_upload_text">Подигни</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Прекини</string>
+  <string name="filedetails_size">Големина:</string>
+  <string name="filedetails_type">Тип:</string>
+  <string name="filedetails_created">Создадено:</string>
+  <string name="filedetails_modified">Изменето:</string>
+  <string name="filedetails_download">Преземање</string>
+  <string name="filedetails_open">Отвори</string>
+  <string name="common_yes">Да</string>
+  <string name="common_no">Не</string>
+  <string name="common_ok">Во ред</string>
+  <string name="common_cancel_upload">Откажи прикачување</string>
+  <string name="common_cancel">Откажи</string>
+  <string name="common_error">Грешка</string>
+  <string name="sync_string_contacts">Контакти</string>
+  <string name="common_share">Сподели</string>
+  <string name="common_rename">Преименувај</string>
+  <string name="common_remove">Отстрани</string>
+  <string name="ssl_validator_title">Предупредување</string>
+</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 26bf4e02..d98ccc29 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hello Dunia, OwnCloudMainScreen</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Kata laluan:</string>
   <string name="main_login">Nama pengguna:</string>
@@ -16,6 +15,7 @@
   <string name="main_wrn_accsetup">Peranti anda tidak mempunyai akaun ownCloud. Anda perlu membina satu akaun untuk menggunakan aplikasi ini</string>
   <string name="actionbar_sync">Refresh</string>
   <string name="actionbar_upload">Muat naik</string>
+  <string name="actionbar_upload_files">Fail-fail</string>
   <string name="actionbar_mkdir">Bina direktori</string>
   <string name="actionbar_search">Cari</string>
   <string name="actionbar_settings">Set</string>
@@ -50,13 +50,19 @@
   <string name="filedetails_created">Telah dibina:</string>
   <string name="filedetails_modified">Telah diubah:</string>
   <string name="filedetails_download">Muatturun</string>
+  <string name="filedetails_sync_file">Refresh</string>
+  <string name="filedetails_redownload">Refresh</string>
   <string name="filedetails_open">Buka</string>
   <string name="common_yes">Ya</string>
   <string name="common_no">Tidak</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_upload">Batal muat naik</string>
   <string name="common_cancel">Batal</string>
   <string name="common_save_exit">Simpan &amp; Keluar</string>
   <string name="common_error">Ralat</string>
   <string name="uploader_info_dirname">Nama direktori</string>
   <string name="common_choose_account">Pilih akaun</string>
+  <string name="sync_string_contacts">Hubungi </string>
+  <string name="common_share">Kongsi</string>
+  <string name="ssl_validator_title">Amaran</string>
 </resources>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index f2d97118..2eacd46d 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hallo Vergde, OwnCloundHovedSkjerm!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Passord:</string>
   <string name="main_login">Brukernavn:</string>
@@ -16,6 +15,7 @@
   <string name="main_wrn_accsetup">Det finnes ingen ownClound kontoer for din enhent. For å bruker denne appen må du opprette en,</string>
   <string name="actionbar_sync">Oppdater</string>
   <string name="actionbar_upload">Opplasting</string>
+  <string name="actionbar_upload_files">Filer</string>
   <string name="actionbar_mkdir">Opprett katalog</string>
   <string name="actionbar_search">Søk</string>
   <string name="actionbar_settings">Innstillinger</string>
@@ -26,6 +26,7 @@
   <string name="prefs_trackmydevice">Enhetssporing</string>
   <string name="prefs_trackmydevice_interval">Oppdateringsfrekvens</string>
   <string name="prefs_accounts">Kontoer</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Brukernavn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>
@@ -45,11 +46,14 @@
   <string name="filedetails_created">Opprette:</string>
   <string name="filedetails_modified">Endret:</string>
   <string name="filedetails_download">Last ned</string>
+  <string name="filedetails_sync_file">Oppdater</string>
   <string name="filedetails_redownload">Last ned igjen</string>
   <string name="filedetails_open">Åpne</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nei</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Avbryt nedlasting</string>
+  <string name="common_cancel_upload">Avbryt opplasting</string>
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Lager og avslutt</string>
   <string name="common_error">Feil</string>
@@ -66,14 +70,25 @@
   <string name="downloader_download_failed_ticker">Nedlasting feilet</string>
   <string name="common_choose_account">Velg konto</string>
   <string name="sync_string_contacts">Kontakter</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konflikter funnet</string>
+  <string name="use_ssl">Bruk sikker tilkobling</string>
   <string name="auth_trying_to_login">Prøver å logge inn...</string>
   <string name="auth_no_net_conn_title">Ingen nettverkstilgang</string>
   <string name="auth_connect_anyway">Koble til likevel</string>
   <string name="auth_testing_connection">Tester tilgang...</string>
+  <string name="auth_unauthorized">Ugyldig brukernavn / passord</string>
   <string name="crashlog_send_report">Send rapport</string>
   <string name="crashlog_dont_send_report">Ikke send rapport</string>
   <string name="common_share">Del</string>
   <string name="common_rename">Endre navn</string>
   <string name="common_remove">Fjern</string>
   <string name="confirmation_remove_local">Kun lokalt</string>
+  <string name="ssl_validator_title">Advarsel</string>
+  <string name="ssl_validator_btn_details_see">Detaljer</string>
+  <string name="ssl_validator_btn_details_hide">Skjul</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_validity_from">Fra:</string>
+  <string name="ssl_validator_label_validity_to">Til:</string>
+  <string name="ssl_validator_label_signature">Signatur:</string>
+  <string name="conflict_keep_both">Behold begge</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 597f15b6..fcb9489b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hallo Wereld! OwnCloud beginscherm!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Wachtwoord:</string>
   <string name="main_login">Gebruikersnaam:</string>
   <string name="main_button_login">Inloggen</string>
-  <string name="main_welcome">Welkom in uw ownCloud</string>
+  <string name="main_welcome">Welkom in je ownCloud</string>
   <string name="main_files">Bestanden</string>
   <string name="main_music">Muziek</string>
-  <string name="main_contacts">Kontactpersonen</string>
+  <string name="main_contacts">Contactpersonen</string>
   <string name="main_calendar">Kalender</string>
   <string name="main_bookmarks">Bladwijzers</string>
   <string name="main_settings">Instellingen</string>
   <string name="main_tit_accsetup">Account configureren.</string>
   <string name="main_wrn_accsetup">Er zijn nog geen ownCloud accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
+  <string name="about_message">ownCloud Android client\n\nversie: %1$s</string>
   <string name="actionbar_sync">Verversen</string>
   <string name="actionbar_upload">Uploaden</string>
   <string name="actionbar_upload_from_apps">Inhoud van andere apps</string>
@@ -24,7 +24,7 @@
   <string name="prefs_category_general">Algemeen</string>
   <string name="prefs_category_trackmydevice">Apparaat volgen</string>
   <string name="prefs_add_session">Voeg nieuwe sessie toe</string>
-  <string name="prefs_create_img_thumbnails">Maak afbeelding miniaturen</string>
+  <string name="prefs_create_img_thumbnails">Maak afbeeldingsminiaturen</string>
   <string name="prefs_select_oc_account">Selecteer een account</string>
   <string name="prefs_summary_select_oc_account">Kies welke accounts de app mag gebruiken.</string>
   <string name="prefs_trackmydevice">Apparaat volgen</string>
@@ -35,7 +35,7 @@
   <string name="prefs_accounts">Accounts</string>
   <string name="prefs_manage_accounts">Beheer accounts</string>
   <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Beveilig uw ownCloud client</string>
+  <string name="prefs_pincode_summary">Beveilig je ownCloud client</string>
   <string name="prefs_instant_upload">Schakel direct uploaden in</string>
   <string name="prefs_instant_upload_summary">Upload afbeeldingen van camera automatisch</string>
   <string name="auth_host_url">ownCloud URL</string>
@@ -50,7 +50,7 @@
   <string name="setup_hint_password">Wachtwoord</string>
   <string name="setup_hint_address">Webadres</string>
   <string name="setup_hint_show_password">Wachtwoord tonen?</string>
-  <string name="setup_title">Verbind met je ownCloud</string>
+  <string name="setup_title">Verbinden met je ownCloud</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
   <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
   <string name="uploader_info_uploading">Uploaden</string>
   <string name="uploader_btn_create_dir_text">Maak nieuwe map voor upload</string>
+  <string name="file_list_empty">Er zitten geen bestanden in deze map.\nNieuwe bestanden kunnen worden toegevoegd via de \"Upload\" menukeuze.</string>
   <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
   <string name="filedetails_size">Grootte:</string>
   <string name="filedetails_type">Type:</string>
   <string name="filedetails_created">Aangemaakt:</string>
   <string name="filedetails_modified">Aangepast:</string>
   <string name="filedetails_download">Download</string>
+  <string name="filedetails_sync_file">Verversen</string>
   <string name="filedetails_redownload">Opnieuw downloaden</string>
   <string name="filedetails_open">Open</string>
+  <string name="filedetails_renamed_in_upload_msg">Bestand was hernoemt naar %1$s tijdens het uploaden</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Annuleer download</string>
+  <string name="common_cancel_upload">Upload afbreken</string>
   <string name="common_cancel">Annuleren</string>
   <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
   <string name="common_exit">Verlaat ownCloud</string>
@@ -82,26 +87,34 @@
   <string name="create_account">Maak account aan</string>
   <string name="upload_chooser_title">Upload van ...</string>
   <string name="uploader_info_dirname">Map naam</string>
-  <string name="uploader_upload_in_progress_ticker">Uploading ...</string>
+  <string name="uploader_upload_in_progress_ticker">Uploaden ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Uploaden %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Upload succesvol</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s is met succes geupload</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s is met succes ge-upload</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d bestanden succesvol ge-upload</string>
   <string name="uploader_upload_failed_ticker">Upload mislukt</string>
   <string name="uploader_upload_failed_content_single">Upload van %1$s kon niet voltooid worden</string>
-  <string name="downloader_download_in_progress_ticker">Downloading ...</string>
+  <string name="uploader_upload_failed_content_multiple">Uploaden mislukt: %1$d/%2$d bestanden zijn geüpload</string>
+  <string name="downloader_download_in_progress_ticker">Downloaden ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Aan het downloaden %2$s</string>
   <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
-  <string name="downloader_download_succeeded_content">%1$s was succesvol gedownload</string>
+  <string name="downloader_download_succeeded_content">%1$s werd succesvol gedownload</string>
   <string name="downloader_download_failed_ticker">Downloaden mislukt</string>
   <string name="downloader_download_failed_content">Download van %1$s kon niet worden voltooid</string>
   <string name="common_choose_account">Kies account</string>
   <string name="sync_string_contacts">Contactpersonen</string>
   <string name="sync_fail_ticker">Synchronisatie mislukt</string>
   <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
+  <string name="sync_conflicts_in_favourites_ticker">Conflicten gevonden</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d in-synch-houden bestanden konden niet worden gesync\'d</string>
+  <string name="sync_fail_in_favourites_ticker">In-sync-houden bestanden mislukt</string>
+  <string name="sync_fail_in_favourites_content">Inhoud van %1$d bestanden kon niet worden gesynchroniseerd (%2$d conflicten)</string>
   <string name="use_ssl">Gebruik veilige verbinding</string>
   <string name="location_no_provider">ownCloud kan het apparaat niet volgen. Configureer de locatie instellingen (location settings).</string>
   <string name="pincode_enter_pin_code">Voer App PIN in</string>
   <string name="pincode_enter_new_pin_code">Voer nieuwe App PIN in</string>
   <string name="pincode_configure_your_pin">Voer App PIN in</string>
+  <string name="pincode_configure_your_pin_explanation">De PIN wordt steeds opnieuw gevraagd als de app wordt gestart</string>
   <string name="pincode_reenter_your_pincode">Voer App PIN opnieuw in</string>
   <string name="pincode_remove_your_pincode">Verwijder App PIN</string>
   <string name="pincode_mismatch">App PIN\'s komen niet overeen</string>
@@ -119,15 +132,15 @@
     <item>60</item>
   </string-array>
   <string name="auth_trying_to_login">Proberen om in te loggen...</string>
-  <string name="auth_no_net_conn_title">Geen netwerk verbinding</string>
-  <string name="auth_no_net_conn_message">Geen netwerkverbinding konden gevonden worden, controleer uw internet verbinding en probeer het opnieuw.</string>
+  <string name="auth_no_net_conn_title">Geen netwerkverbinding</string>
+  <string name="auth_no_net_conn_message">Er kon geen netwerkverbinding worden gevonden, controleer je internet verbinding en probeer het opnieuw.</string>
   <string name="auth_connect_anyway">Toch verbinden</string>
   <string name="auth_nossl_plain_ok_title">Veilige verbinding niet beschikbaar.</string>
-  <string name="auth_nossl_plain_ok_message">De applicatie kon geen beveiligde verbinding met de server maken. Er is echter wel een onbeveiligde verbinding beschikbaar. U kunt verder gaan of annuleren.</string>
+  <string name="auth_nossl_plain_ok_message">De applicatie kon geen beveiligde verbinding met de server maken. Er is echter wel een onbeveiligde verbinding beschikbaar. Je kunt verdergaan of annuleren.</string>
   <string name="auth_connection_established">Verbinding tot stand gebracht</string>
   <string name="auth_testing_connection">Probeer verbinding...</string>
   <string name="auth_not_configured_title">Foutieve ownCloud configuratie</string>
-  <string name="auth_not_configured_message">Het lijkt erop dat uw ownCloud instantie niet correct geconfigureerd is. Neem contact op met uw beheerder voor meer details.</string>
+  <string name="auth_not_configured_message">Het lijkt erop dat je ownCloud instantie niet correct geconfigureerd is. Neem contact op met je beheerder voor meer details.</string>
   <string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
   <string name="auth_unknown_error_message">Er heeft zich een onbekend fout voorgedaan. Neem alstublieft contact op met de beheerders en voeg de logs toe van uw apparaat.</string>
   <string name="auth_unknown_host_title">Kon geen host vinden</string>
@@ -141,30 +154,66 @@
   <string name="auth_bad_oc_version_title">Onherkende ownCloud server versie</string>
   <string name="auth_wrong_connection_title">Kon verbinding niet tot stand brengen.</string>
   <string name="auth_secure_connection">Veilige verbinding tot stand gebracht</string>
-  <string name="auth_login_details">Login gegevens</string>
-  <string name="crashlog_message">De applicatie is onverwacht beëindigd. Wilt u een crash report versturen?</string>
+  <string name="auth_login_details">Inloggegevens</string>
+  <string name="auth_unauthorized">login / password niet juist</string>
+  <string name="auth_not_found">Verkeerde pad opgegeven</string>
+  <string name="auth_internal">Interne server fout, code %1$d</string>
+  <string name="crashlog_message">De applicatie is onverwacht beëindigd. Wilt je een crash report versturen?</string>
   <string name="crashlog_send_report">Rapport verzenden</string>
   <string name="crashlog_dont_send_report">Rapport niet verzenden</string>
   <string name="extensions_avail_title">Uitbreidingen aanwezig!</string>
+  <string name="extensions_avail_message">Zo te zien ondersteunt je ownCloud instantie geavanceerde uitbreidingen. Wilt je deze uitbreidingen in Android zichtbaar maken?</string>
   <string name="fd_keep_in_sync">Houd bestand actueel</string>
   <string name="common_share">Delen</string>
   <string name="common_rename">Hernoemen</string>
   <string name="common_remove">Verwijderen</string>
-  <string name="confirmation_remove_alert">Wilt u werkelijk %1$s verwijderen?</string>
-  <string name="confirmation_remove_local">Lokaal alleen</string>
+  <string name="confirmation_remove_alert">Wilt je werkelijk %1$s verwijderen?</string>
+  <string name="confirmation_remove_folder_alert">Wil je echt %1$s ende inhoud daarvan verwijderen ?</string>
+  <string name="confirmation_remove_local">Alleen lokaal</string>
+  <string name="confirmation_remove_folder_local">Alleen lokale inhoud </string>
   <string name="confirmation_remove_remote">Verwijder van server</string>
   <string name="confirmation_remove_remote_and_local">Lokaal en op de server</string>
   <string name="remove_success_msg">Succesvol verwijderd</string>
   <string name="remove_fail_msg">Verwijdering kon niet voltooid worden</string>
+  <string name="rename_dialog_title">Voer een nieuwe naam in</string>
   <string name="rename_local_fail_msg">Lokaal kopie kon niet worden hernoemt.</string>
   <string name="rename_server_fail_msg">Hernoemen kon niet worden voltooid</string>
+  <string name="sync_file_fail_msg">Extern bestand kon niet worden gecontroleerd</string>
+  <string name="sync_file_nothing_to_do_msg">Bestandsinhoud is al gesynchroniseerd</string>
   <string name="create_dir_fail_msg">Map kon niet worden aangemaakt</string>
   <string name="wait_a_moment">Even geduld</string>
+  <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer een andere app om het bestand te selecteren</string>
   <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
   <string name="ssl_validator_title">Waarschuwing</string>
+  <string name="ssl_validator_header">De identiteit van de site kan niet worden gecontroleerd</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Het server certificaat wordt niet vertrouwd</string>
+  <string name="ssl_validator_reason_cert_expired">- Het server certificaat is verlopen</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Het server certificaat is te recent</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- De URL komt niet overeen met de hostname in het certificaat</string>
   <string name="ssl_validator_certificate_not_available">Het server certificaat kon niet opgevraagd worden</string>
   <string name="ssl_validator_question">Wil je dit certificaat alsnog vertrouwen?</string>
   <string name="ssl_validator_not_saved">Het certificaat kon niet worden opgeslagen</string>
-  <string name="text_placeholder">Dit is een placeholder</string>
+  <string name="ssl_validator_btn_details_see">Details</string>
+  <string name="ssl_validator_btn_details_hide">Verbergen</string>
+  <string name="ssl_validator_label_subject">Uitgegeven aan:</string>
+  <string name="ssl_validator_label_issuer">Uitgegeven door:</string>
+  <string name="ssl_validator_label_CN">Algemene naam:</string>
+  <string name="ssl_validator_label_O">Organisatie:</string>
+  <string name="ssl_validator_label_OU">Organisatorische eenheid:</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_ST">Status:</string>
+  <string name="ssl_validator_label_L">Locatie:</string>
+  <string name="ssl_validator_label_validity">Geldigheid:</string>
+  <string name="ssl_validator_label_validity_from">Van:</string>
+  <string name="ssl_validator_label_validity_to">Aan:</string>
+  <string name="ssl_validator_label_signature">Handtekening:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
+  <string name="text_placeholder">Dit is een gereserveerde ruimte</string>
   <string name="instant_upload_on_wifi">Upload afbeeldingen alleen via WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Update conflict</string>
+  <string name="conflict_message">Het remote bestand %s is niet gesynchroniseerd met het lokale bestand. Als je doorgaat wordt de inhoud van het bestand op de server vervangen.</string>
+  <string name="conflict_keep_both">Beide bewaren</string>
+  <string name="conflict_overwrite">Overschrijven</string>
+  <string name="conflict_dont_upload">Niet uploaden</string>
 </resources>
diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml
index c757504a..e9e4e64d 100644
--- a/res/values-nn-rNO/strings.xml
+++ b/res/values-nn-rNO/strings.xml
@@ -1,2 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">Filer</string>
+  <string name="main_music">Musikk</string>
+  <string name="main_contacts">Kotaktar</string>
+  <string name="main_settings">Innstillingar</string>
+  <string name="actionbar_upload">Last opp</string>
+  <string name="actionbar_upload_files">Filer</string>
+  <string name="actionbar_settings">Innstillingar</string>
+  <string name="auth_username">Brukarnamn</string>
+  <string name="auth_password">Passord</string>
+  <string name="sync_string_files">Filer</string>
+  <string name="setup_hint_username">Brukarnamn</string>
+  <string name="setup_hint_password">Passord</string>
+  <string name="uploader_btn_upload_text">Last opp</string>
+  <string name="filedetails_download">Last ned</string>
+  <string name="common_cancel">Kanseller</string>
+  <string name="common_error">Feil</string>
+  <string name="sync_string_contacts">Kotaktar</string>
+</resources>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 6dd057df..64bf6653 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Adissiatz monde, OwnCloudMainScreen !</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Senhal :</string>
   <string name="main_login">Nom o escais :</string>
@@ -15,6 +14,7 @@
   <string name="main_tit_accsetup">Compte de configuracion</string>
   <string name="actionbar_sync">Refresca</string>
   <string name="actionbar_upload">Amontcarga</string>
+  <string name="actionbar_upload_files">Fichièrs</string>
   <string name="actionbar_mkdir">Crea un repertòri</string>
   <string name="actionbar_search">Cèrca</string>
   <string name="actionbar_settings">Configuracion</string>
@@ -49,11 +49,13 @@
   <string name="filedetails_created">Creat :</string>
   <string name="filedetails_modified">Modificat :</string>
   <string name="filedetails_download">Avalcarga</string>
+  <string name="filedetails_sync_file">Refresca</string>
   <string name="filedetails_redownload">Torna avalcargar</string>
   <string name="filedetails_open">Dubrís</string>
   <string name="common_yes">Òc</string>
   <string name="common_no">Non</string>
   <string name="common_ok">D\'accòrdi</string>
+  <string name="common_cancel_upload"> Anulla l\'amontcargar</string>
   <string name="common_cancel">Annula</string>
   <string name="common_error">Error</string>
   <string name="about_title">A prepaus</string>
diff --git a/res/values-pl-rPL/strings.xml b/res/values-pl-rPL/strings.xml
index c757504a..8bd245c8 100644
--- a/res/values-pl-rPL/strings.xml
+++ b/res/values-pl-rPL/strings.xml
@@ -1,2 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_login">Nazwa użytkownika</string>
+  <string name="main_music">Muzyka</string>
+  <string name="main_settings">Ustawienia</string>
+  <string name="actionbar_settings">Ustawienia</string>
+  <string name="auth_username">Nazwa użytkownika</string>
+  <string name="setup_hint_username">Nazwa użytkownika</string>
+  <string name="filedetails_open">Otwórz</string>
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d8e70409..bec3b10e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hello World, OwnCloudMainScreen</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Hasło:</string>
   <string name="main_login">Nazwa użytkownika:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Ustawienia</string>
   <string name="main_tit_accsetup">Załóż konto</string>
   <string name="main_wrn_accsetup">Nie wykryto kont ownCloud, załóż konto w celu używania aplikacji.</string>
+  <string name="about_message">ownCloud Android klient⏎ ⏎ wersja: %1$s</string>
   <string name="actionbar_sync">Odśwież</string>
   <string name="actionbar_upload">Wyślij plik</string>
   <string name="actionbar_upload_from_apps">Zasoby innej aplikacji</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud niema dostępu do udostępnionych zawartości</string>
   <string name="uploader_info_uploading">Przesyłanie</string>
   <string name="uploader_btn_create_dir_text">Stwórz katalog do przesłania</string>
+  <string name="file_list_empty">Nie ma plików w tym folderze.⏎ Nowe pliki można dodac klikając \"Załaduj\"  opcje menu.</string>
   <string name="filedetails_select_file">Dotknij po dodatkowe informacje</string>
   <string name="filedetails_size">Rozmiar:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Utworzono:</string>
   <string name="filedetails_modified">Zmodyfikowano:</string>
   <string name="filedetails_download">Pobierz</string>
+  <string name="filedetails_sync_file">Odśwież</string>
   <string name="filedetails_redownload">Pobierz ponownie</string>
   <string name="filedetails_open">Otwórz</string>
+  <string name="filedetails_renamed_in_upload_msg">Podczas ładowania nazwa pliku została zmieniona na %1$s</string>
   <string name="common_yes">Tak</string>
   <string name="common_no">Nie</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Anuluj pobieranie</string>
+  <string name="common_cancel_upload">Przestań wysyłać</string>
   <string name="common_cancel">Anuluj</string>
   <string name="common_save_exit">Zapisz i wyjdź</string>
   <string name="common_exit">Opuść ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Błąd synchronizacji</string>
   <string name="sync_fail_content">Synchronizacja %1$s nie została zakończona</string>
+  <string name="sync_conflicts_in_favourites_ticker">Znaleziono konflikty</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d nie może zostać zsynchronizowany</string>
+  <string name="sync_fail_in_favourites_ticker">Synchronizacja plików nie powiodła się</string>
+  <string name="sync_fail_in_favourites_content">Zawartość %1$d plików nie może zostać synchronizowana (%2$d konfliktów)</string>
   <string name="use_ssl">Użyj bezpiecznego połączenia</string>
   <string name="location_no_provider">ownCloud nie można śledzić urządzenia. Sprawdź ustawienia lokalizacji</string>
   <string name="pincode_enter_pin_code">Podaj PIN</string>
   <string name="pincode_enter_new_pin_code">Podaj nowy PIN</string>
   <string name="pincode_configure_your_pin">Wpisz PIN</string>
+  <string name="pincode_configure_your_pin_explanation">Kod PIN bedzie wymagany za każdym razem, kiedy ta aplikacje wystartuje.</string>
   <string name="pincode_reenter_your_pincode">Podaj PIN ponownie</string>
   <string name="pincode_remove_your_pincode">Usuń PIN</string>
   <string name="pincode_mismatch">Podane numery PIN są różne</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Nie można ustanowić połączenia</string>
   <string name="auth_secure_connection">Nawiązano bezpieczne połączenie</string>
   <string name="auth_login_details">Szczegóły logowania</string>
+  <string name="auth_unauthorized">Nieprawidłowa nazwa użytkownika/hasło</string>
+  <string name="auth_not_found">Wprowadzono nieprawidłową ścieżkę</string>
+  <string name="auth_internal">Wewnętrzny błąd serwera, kod %1$d</string>
   <string name="crashlog_message">Aplikacja została nieoczekiwanie zakończona. Czy chcesz przesłać raport awarii?</string>
   <string name="crashlog_send_report">Wyślij raport</string>
   <string name="crashlog_dont_send_report">Nie wysyłaj raportu</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Zmień nazwę</string>
   <string name="common_remove">Usuń</string>
   <string name="confirmation_remove_alert">Czy chcesz usunąć %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Czy usunąć %1$s oraz jego zawartość?</string>
   <string name="confirmation_remove_local">Tylko lokalnie</string>
+  <string name="confirmation_remove_folder_local">Tylko treści lokalne</string>
   <string name="confirmation_remove_remote">Usuń z serwera</string>
   <string name="confirmation_remove_remote_and_local">Z serwera i telefonu</string>
   <string name="remove_success_msg">Usunięto</string>
   <string name="remove_fail_msg">Nie można usunąć pliku</string>
+  <string name="rename_dialog_title">Wprowadź nową nazwę</string>
   <string name="rename_local_fail_msg">Nie można zmienić nazwy lokalnej kopii; Spróbuj inną nową nazwę </string>
   <string name="rename_server_fail_msg">Nie można zmienić nazwy</string>
+  <string name="sync_file_fail_msg">Nie można sprawdzić zdalnego pliku</string>
+  <string name="sync_file_nothing_to_do_msg">Zawartość pliku została już synchronizowana</string>
   <string name="create_dir_fail_msg">Nie można utworzyć katalogu</string>
   <string name="wait_a_moment">Poczekaj chwilę</string>
   <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; Spróbuj innych aplikacji do wybierz plik</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Nie można uzyskać certyfikatu</string>
   <string name="ssl_validator_question">Zaakceptować certyfikat?</string>
   <string name="ssl_validator_not_saved">Nie można zapisać certyfikatu</string>
+  <string name="ssl_validator_btn_details_see">Szczegóły</string>
+  <string name="ssl_validator_btn_details_hide">Schowaj</string>
+  <string name="ssl_validator_label_subject">Wydane dla:</string>
+  <string name="ssl_validator_label_issuer">Wydane przez:</string>
+  <string name="ssl_validator_label_CN">Nazwa:</string>
+  <string name="ssl_validator_label_O">Organizacja:</string>
+  <string name="ssl_validator_label_OU">Jednostka organizacyjna:</string>
+  <string name="ssl_validator_label_C">Państwo:</string>
+  <string name="ssl_validator_label_ST">Województwo:</string>
+  <string name="ssl_validator_label_L">Lokalizacja:</string>
+  <string name="ssl_validator_label_validity">Ważność:</string>
+  <string name="ssl_validator_label_validity_from">Z:</string>
+  <string name="ssl_validator_label_validity_to">Do:</string>
+  <string name="ssl_validator_label_signature">Sygnatura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algorytm:</string>
   <string name="text_placeholder">Tekst zastępczy</string>
   <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Konflikt aktualizacji</string>
+  <string name="conflict_message">Zdalny plik %s nie jest zsynchronizowany z plikiem lokalnym. Nadal będzie zastąpować zawartość pliku na serwerze.</string>
+  <string name="conflict_keep_both">Utrzymanie obu</string>
+  <string name="conflict_overwrite">Zastąp</string>
+  <string name="conflict_dont_upload">Nie wysyłaj</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c83883d8..6262585f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Olá Mundo, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Senha</string>
   <string name="main_login">Nome de usuário</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Ajustes</string>
   <string name="main_tit_accsetup">Configuração de conta</string>
   <string name="main_wrn_accsetup">Não existem contas ownCloud no seu dispositivo. Para usar este aplicativo, você precisa criar uma.</string>
+  <string name="about_message">Cliente ownCloud para Android\n\nversão: %1$s</string>
   <string name="actionbar_sync">Atualizar</string>
   <string name="actionbar_upload">Upload</string>
   <string name="actionbar_upload_from_apps">Conteúdo de outros apps</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud não é permitido a acessar o conteúdo compartilhado</string>
   <string name="uploader_info_uploading">Enviando</string>
   <string name="uploader_btn_create_dir_text">Criar um diretório para upload</string>
+  <string name="file_list_empty">Não existe arquivos nesta pasta\nNovos arquivos podem ser adicionados com a opção do menu \"Enviar\"</string>
   <string name="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
   <string name="filedetails_size">Tamanho:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Criado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Download</string>
+  <string name="filedetails_sync_file">Atualizar</string>
   <string name="filedetails_redownload">Baixar novamente</string>
   <string name="filedetails_open">Abrir</string>
+  <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o upload</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Cancelar download</string>
+  <string name="common_cancel_upload">Cancelar upload</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Salvar &amp; Sair</string>
   <string name="common_exit">Sair do ownCloud</string>
@@ -100,11 +105,13 @@
   <string name="sync_string_contacts">Contatos</string>
   <string name="sync_fail_ticker">Sincronização falhou</string>
   <string name="sync_fail_content">Sincronização de %1$s não pôde ser completada</string>
+  <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
   <string name="use_ssl">Usar Conexão Segura</string>
   <string name="location_no_provider">ownCloud não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
   <string name="pincode_enter_pin_code">Por favor insira o PIN da sua aplicação</string>
   <string name="pincode_enter_new_pin_code">Por favor, insira seu novo App PIN</string>
   <string name="pincode_configure_your_pin">Digite ownCloud App PIN</string>
+  <string name="pincode_configure_your_pin_explanation">O PIN (senha) será solicitado toda vez que o aplicativo for iniciado</string>
   <string name="pincode_reenter_your_pincode">Redigite ownCloud App PIN, por favor</string>
   <string name="pincode_remove_your_pincode">Remova seu ownCloud App PIN</string>
   <string name="pincode_mismatch">Ambos ownCloud App PIN não são o mesmo</string>
@@ -145,6 +152,9 @@
   <string name="auth_wrong_connection_title">Não foi possível estabelecer conexão</string>
   <string name="auth_secure_connection">Conexão segura estabelecida</string>
   <string name="auth_login_details">Detalhes de login</string>
+  <string name="auth_unauthorized">Login / senha inválida</string>
+  <string name="auth_not_found">Caminho dado está errado</string>
+  <string name="auth_internal">Erro interno do servidor, código %1$d</string>
   <string name="crashlog_message">Aplicação terminou inesperadamente. Gostaria de submeter um relatório de erros?</string>
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
@@ -155,13 +165,18 @@
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
   <string name="confirmation_remove_alert">Você realmente quer remover %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Você deseja realmente apagar %1$s e seu conteúdo?</string>
   <string name="confirmation_remove_local">Somente local</string>
+  <string name="confirmation_remove_folder_local">Somente conteúdo local</string>
   <string name="confirmation_remove_remote">Remover do servidor</string>
   <string name="confirmation_remove_remote_and_local">Ambos remoto e local</string>
   <string name="remove_success_msg">Removido com sucesso</string>
   <string name="remove_fail_msg">Erro ao remover</string>
+  <string name="rename_dialog_title">Digite um novo nome</string>
   <string name="rename_local_fail_msg">Cópia local não pôde ser renomeada, tente outro nome</string>
   <string name="rename_server_fail_msg">Renomeação não pôde ser completada</string>
+  <string name="sync_file_fail_msg">Arquivo remoto não pode ser verificado</string>
+  <string name="sync_file_nothing_to_do_msg">Conteúdo do arquivo já foi sincronizado</string>
   <string name="create_dir_fail_msg">Diretório não pôde ser criado</string>
   <string name="wait_a_moment">Aguarde um momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado ; por favor, tente usar outro app para selecionar o arquivo</string>
@@ -175,6 +190,27 @@
   <string name="ssl_validator_certificate_not_available">O certificado do servidor não pode ser obtido</string>
   <string name="ssl_validator_question">Você confia nesse certificado mesmo assim?</string>
   <string name="ssl_validator_not_saved">O certificado não pode ser salvo</string>
+  <string name="ssl_validator_btn_details_see">Detalhes</string>
+  <string name="ssl_validator_btn_details_hide">Ocultar</string>
+  <string name="ssl_validator_label_subject">Emitido para:</string>
+  <string name="ssl_validator_label_issuer">Emitido por:</string>
+  <string name="ssl_validator_label_CN">Nome comum:</string>
+  <string name="ssl_validator_label_O">Organização:</string>
+  <string name="ssl_validator_label_OU">Unidade de organização:</string>
+  <string name="ssl_validator_label_C">País:</string>
+  <string name="ssl_validator_label_ST">Estado:</string>
+  <string name="ssl_validator_label_L">Localidade:</string>
+  <string name="ssl_validator_label_validity">Validade:</string>
+  <string name="ssl_validator_label_validity_from">De:</string>
+  <string name="ssl_validator_label_validity_to">Para:</string>
+  <string name="ssl_validator_label_signature">Assinatura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
   <string name="text_placeholder">Isso é um marcador de espaço</string>
   <string name="instant_upload_on_wifi">Fazer upload de fotos somente via WiFi</string>
+  <string name="instant_upload_path">/Upload instantâneo</string>
+  <string name="conflict_title">Conflito de atualização</string>
+  <string name="conflict_message">O arquivo remoto %s não está soncronizado com o arquivo local. Prosseguir irá substituir o arquivo no servidor.</string>
+  <string name="conflict_keep_both">Manter ambos</string>
+  <string name="conflict_overwrite">Sobrescrever</string>
+  <string name="conflict_dont_upload">Não fazer upload</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 208a3485..f7ebf10b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Olá Mundo, OwnCloudMainScreen!</string>
   <string name="app_name">owncloud</string>
   <string name="main_password">Palavra-passe:</string>
   <string name="main_login">Nome de Utilizador:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Definições</string>
   <string name="main_tit_accsetup">Configurar conta</string>
   <string name="main_wrn_accsetup">Não há contas ownCloud no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
+  <string name="about_message">cliente Android ownCloud\n\nversão: %1$s</string>
   <string name="actionbar_sync">Actualizar</string>
   <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Conteúdo das outras apps</string>
@@ -37,6 +37,7 @@
   <string name="prefs_pincode">ownCloud App PIN</string>
   <string name="prefs_pincode_summary">Proteja o seu cliente ownCloud</string>
   <string name="prefs_instant_upload">Activar envio instantâneo</string>
+  <string name="prefs_instant_upload_summary">Enviar automaticamente as fotografias tiradas pela camera</string>
   <string name="auth_host_url">URL ownCloud</string>
   <string name="auth_username">Nome de Utilizador</string>
   <string name="auth_password">Palavra-passe</string>
@@ -57,19 +58,26 @@
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
   <string name="uploader_wrn_no_content_title">Sem conteúdo para carregar</string>
+  <string name="uploader_wrn_no_content_text">Não foi recebido nenhum conteúdo. Nada para enviar.</string>
+  <string name="uploader_error_forbidden_content">O ownCloud não está autorizado a aceder aos ficheiro partilhados.</string>
   <string name="uploader_info_uploading">A enviar</string>
   <string name="uploader_btn_create_dir_text">Criar directoria para envio</string>
+  <string name="file_list_empty">Não existem ficheiros nesta pasta.\nPode adicionar ficheiros com a opção \"Enviar\" no menu.</string>
   <string name="filedetails_select_file">Clique no ficheiro para visualizar informação adicional.</string>
   <string name="filedetails_size">Tamanho:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Criado:</string>
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descarregar</string>
+  <string name="filedetails_sync_file">Actualizar</string>
   <string name="filedetails_redownload">Actualizar</string>
   <string name="filedetails_open">Abrir</string>
+  <string name="filedetails_renamed_in_upload_msg">O nome do ficheiro foi alterado para %1$s durante o envio.</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Cancelar a transferência</string>
+  <string name="common_cancel_upload">Cancelar envio</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar &amp; Sair</string>
   <string name="common_exit">Sair de ownCloud</string>
@@ -80,10 +88,13 @@
   <string name="upload_chooser_title">Carregar de...</string>
   <string name="uploader_info_dirname">Nome da directoria</string>
   <string name="uploader_upload_in_progress_ticker">A carregar...</string>
+  <string name="uploader_upload_in_progress_content">A enviar %1$d%% , %2$s completo.</string>
   <string name="uploader_upload_succeeded_ticker">Carregado com sucesso</string>
   <string name="uploader_upload_succeeded_content_single">%1$s foi carregado com sucesso</string>
   <string name="uploader_upload_succeeded_content_multiple">%1$d foram carregados com sucesso</string>
   <string name="uploader_upload_failed_ticker">Carregamento falhou</string>
+  <string name="uploader_upload_failed_content_single">O envio do ficheiro %1$s não foi concluído.</string>
+  <string name="uploader_upload_failed_content_multiple">O envio falhou. %1$d/%2$d ficheiro foram enviados com sucesso.</string>
   <string name="downloader_download_in_progress_ticker">A descarregar...</string>
   <string name="downloader_download_in_progress_content">%1$d%% A decarregar %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga com sucesso</string>
@@ -93,11 +104,23 @@
   <string name="common_choose_account">Escolha a conta</string>
   <string name="sync_string_contacts">Contactos</string>
   <string name="sync_fail_ticker">Falhou a sincronização</string>
+  <string name="sync_fail_content">Não foi possível sincronizar %1$s</string>
+  <string name="sync_conflicts_in_favourites_ticker">Foram encontrados conflitos</string>
+  <string name="sync_conflicts_in_favourites_content">Não foi possível sincronizar o ficheiro %1$d</string>
+  <string name="sync_fail_in_favourites_ticker">Falhou a operação de manter os ficheiros sincronizados</string>
+  <string name="sync_fail_in_favourites_content">Não foi possível sincronizar  o conteúdo de %1$d ficheiros  (%2$d conflictos)</string>
   <string name="use_ssl">Usar Ligação Segura</string>
+  <string name="location_no_provider">Nao é possível detectar a sua localização. Por favor verifique se os serviços de localização/GPS estão activados.</string>
   <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
   <string name="pincode_enter_new_pin_code">Por favor escreva o novo PIN da Aplicação</string>
   <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">O PIN vai ser pedido todas as vezes que iniciar a aplicação.</string>
   <string name="pincode_reenter_your_pincode">Volte a inserir o ownCloud App PIN, por favor</string>
+  <string name="pincode_remove_your_pincode">Remover o PIN do ownCloud.</string>
+  <string name="pincode_mismatch">Os códigos PIN introduzidos não são iguais.</string>
+  <string name="pincode_wrong">Código PIN Incorrecto.</string>
+  <string name="pincode_removed">PIN da aplicação ownCloud removido</string>
+  <string name="pincode_stored">PIN da aplicação ownCloud guardado</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutos</item>
     <item>30 Minutos</item>
@@ -110,34 +133,87 @@
   </string-array>
   <string name="auth_trying_to_login">A tentar entrar...</string>
   <string name="auth_no_net_conn_title">Sem ligação à rede</string>
+  <string name="auth_no_net_conn_message">Não foi detectada uma ligação de dados, por favor verifique se está se encontra activada.</string>
   <string name="auth_connect_anyway">Ligar de qualquer maneira</string>
   <string name="auth_nossl_plain_ok_title">Ligação segura indisponível</string>
+  <string name="auth_nossl_plain_ok_message">Não foi possível estabelecer uma ligação segura ao servidor, no entanto pode continuar ou cancelar.</string>
   <string name="auth_connection_established">Ligação estabelecida</string>
   <string name="auth_testing_connection">A testar a ligação...</string>
+  <string name="auth_not_configured_title">Configuração do ownCloud incorrecta.</string>
+  <string name="auth_not_configured_message">Parece haver um ou mais erros na configuração do ownCloud, por favor contacte o administrador para mais detalhes.</string>
   <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
+  <string name="auth_unknown_error_message">Ocorreu um erro desconhecido, por favor contacte os autores e inclua os logs de erro.</string>
   <string name="auth_unknown_host_title">Não é possível encontrar o servidor</string>
+  <string name="auth_unknown_host_message">Não foi possível encontrar o host. Por favor verifique se o nome está correcto, e se o servidor está disponível e tente novamente.</string>
   <string name="auth_incorrect_path_title">Instância ownCloud não encontrada</string>
+  <string name="auth_incorrect_path_message">Não foi possível encontrar o ownCloud no caminho dado. Por favor verifique novamente.</string>
   <string name="auth_timeout_title">O servidor levou demasiado tempo a responder</string>
   <string name="auth_incorrect_address_title">URL errado</string>
   <string name="auth_ssl_general_error_title">Inicialização de SSL falhou</string>
+  <string name="auth_ssl_unverified_server_title">Identidade SSL do servidor não verificada.</string>
   <string name="auth_bad_oc_version_title">Versão do servidor ownCloud não reconhecida</string>
   <string name="auth_wrong_connection_title">Não consegue estabelecer ligação</string>
   <string name="auth_secure_connection">Ligação segura estabelecida</string>
   <string name="auth_login_details">Detalhes de entrada</string>
+  <string name="auth_unauthorized">Palavra-passe ou nome de utilizador inválidos!</string>
+  <string name="auth_not_found">Foi dado um caminho inválido</string>
+  <string name="auth_internal">Erro interno de servidor, código: %1$d</string>
+  <string name="crashlog_message">A aplicação terminou de forma inesperada. Deseja enviar o relatório do erro?</string>
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
   <string name="extensions_avail_title">Extensões disponíveis!</string>
+  <string name="extensions_avail_message">Parece que a sua instalação do ownCloud suporta extensões avançadas. Deseja ver as extensões disponíveis para Android?</string>
   <string name="fd_keep_in_sync">manter ficheiro actualizado</string>
   <string name="common_share">Partilhar</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
+  <string name="confirmation_remove_alert">Tem a certeza que deseja remover %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Deseja realmente remover %1$s e o seu conteúdo?</string>
   <string name="confirmation_remove_local">Apenas localmente</string>
+  <string name="confirmation_remove_folder_local">So conteúdos locais</string>
   <string name="confirmation_remove_remote">Apagar do servidor</string>
   <string name="confirmation_remove_remote_and_local">ambos os remoto e local</string>
   <string name="remove_success_msg">Removido com sucesso</string>
+  <string name="remove_fail_msg">Não foi possível remover</string>
+  <string name="rename_dialog_title">Introduza um novo nome</string>
+  <string name="rename_local_fail_msg">Não foi possível renomear a cópia local, por favor tente outro nome.</string>
   <string name="rename_server_fail_msg">Não foi possível renomear</string>
+  <string name="sync_file_fail_msg">Não foi possível verificar o ficheiro remoto</string>
+  <string name="sync_file_nothing_to_do_msg">O conteúdo do ficheiro já foi sincronizado</string>
   <string name="create_dir_fail_msg">Não foi possível criar a pasta</string>
   <string name="wait_a_moment">Aguarde um momento</string>
+  <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Por favor tente outra aplicação para seleccionar o ficheiro.</string>
   <string name="filedisplay_no_file_selected">Não selecionou nenhum ficheiro</string>
   <string name="ssl_validator_title">Aviso</string>
+  <string name="ssl_validator_header">Não foi possível verificar a identidade do site.</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é de confiança</string>
+  <string name="ssl_validator_reason_cert_expired">- O certificado do servidor expirou</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- O certificado do servidor é muito recente</string>
+  <string name="ssl_validator_reason_hostname_not_verified">O URL não condiz com o nome no certificado.</string>
+  <string name="ssl_validator_certificate_not_available">- Não foi possível obter o certificado do servidor</string>
+  <string name="ssl_validator_question">Quer confiar neste certificado de qualquer maneira?</string>
+  <string name="ssl_validator_not_saved">O certificado não pôde ser guardado</string>
+  <string name="ssl_validator_btn_details_see">Detalhes</string>
+  <string name="ssl_validator_btn_details_hide">Esconder</string>
+  <string name="ssl_validator_label_subject">Emitido para:</string>
+  <string name="ssl_validator_label_issuer">Emitido por:</string>
+  <string name="ssl_validator_label_CN">Nome comum.</string>
+  <string name="ssl_validator_label_O">Organização:</string>
+  <string name="ssl_validator_label_OU">Unidade organizaconal.</string>
+  <string name="ssl_validator_label_C">País:</string>
+  <string name="ssl_validator_label_ST">Estado:</string>
+  <string name="ssl_validator_label_L">Localização:</string>
+  <string name="ssl_validator_label_validity">Validade:</string>
+  <string name="ssl_validator_label_validity_from">De:</string>
+  <string name="ssl_validator_label_validity_to">Para:</string>
+  <string name="ssl_validator_label_signature">Assinatura:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmo</string>
+  <string name="text_placeholder">Isto é uma variável.</string>
+  <string name="instant_upload_on_wifi">Enviar fotografias apenas via WiFi</string>
+  <string name="instant_upload_path">/Upload-Instantâneo </string>
+  <string name="conflict_title">Conflito na actualização</string>
+  <string name="conflict_message">O ficheiro remoto %s não está sincronizado com o ficheiro local. Se continuar ira substituir o ficheiro no servidor.</string>
+  <string name="conflict_keep_both">Manter os dois</string>
+  <string name="conflict_overwrite">Sobrepor</string>
+  <string name="conflict_dont_upload">Não enviar.</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 59ec6dc3..bef6249b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Salut lume, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Parolă:</string>
   <string name="main_login">Nume utilizator:</string>
@@ -60,11 +59,13 @@
   <string name="filedetails_created">Creat:</string>
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Descarcă</string>
+  <string name="filedetails_sync_file">Împrospătare</string>
   <string name="filedetails_redownload">Descarcă din nou</string>
   <string name="filedetails_open">Deschide</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Nu</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_upload">Anulează încărcarea</string>
   <string name="common_cancel">Anulare</string>
   <string name="common_save_exit">Salvare &amp; Ieșire</string>
   <string name="common_exit">Părăsire ownCloud</string>
@@ -137,4 +138,5 @@
   <string name="create_dir_fail_msg">Directorul nu a putut fi creat</string>
   <string name="wait_a_moment">Așteaptă un moment</string>
   <string name="filedisplay_no_file_selected">Nu a fost selectat nici un fișier</string>
+  <string name="ssl_validator_title">Atenție</string>
 </resources>
diff --git a/res/values-ru-rRU/strings.xml b/res/values-ru-rRU/strings.xml
index 1a3c6da1..937b45d3 100644
--- a/res/values-ru-rRU/strings.xml
+++ b/res/values-ru-rRU/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hello World, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Пароль:</string>
   <string name="main_login">Имя пользователя:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Настройки</string>
   <string name="main_tit_accsetup">Настройка аккаунта</string>
   <string name="main_wrn_accsetup">На Вашем устройстве нет ownCloud-аккаунта. Для того, чтобы использовать это приложение, Вам нужно создать его.</string>
+  <string name="about_message">ownCloud Android-клиент\n\nверсия: %1$s</string>
   <string name="actionbar_sync">Обновить</string>
   <string name="actionbar_upload">Загрузка</string>
   <string name="actionbar_upload_from_apps">Содержимое из других приложений</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud не разрешен доступ к общему содержимому</string>
   <string name="uploader_info_uploading">Загрузка</string>
   <string name="uploader_btn_create_dir_text">Создайте каталог для загрузки</string>
+  <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью опции \"Загрузка\" в меню.</string>
   <string name="filedetails_select_file">Нажмите на файл, чтобы увидеть дополнительную информацию.</string>
   <string name="filedetails_size">Размер:</string>
   <string name="filedetails_type">Тип:</string>
   <string name="filedetails_created">Создано:</string>
   <string name="filedetails_modified">Модифицировано:</string>
   <string name="filedetails_download">Загрузка</string>
+  <string name="filedetails_sync_file">Обновить</string>
   <string name="filedetails_redownload">Загрузить еще раз</string>
   <string name="filedetails_open">Открыть</string>
+  <string name="filedetails_renamed_in_upload_msg">Файл был переименован в %1$s во время загрузки</string>
   <string name="common_yes">Да</string>
   <string name="common_no">Нет</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Отменить загрузку</string>
+  <string name="common_cancel_upload">Отмена загрузки</string>
   <string name="common_cancel">Отмена</string>
   <string name="common_save_exit">Сохранить &amp; Выход</string>
   <string name="common_exit">Покинуть ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Контакты</string>
   <string name="sync_fail_ticker">Ошибка синхронизации</string>
   <string name="sync_fail_content">Синхронизация %1$s не может быть завершена</string>
+  <string name="sync_conflicts_in_favourites_ticker">Найдены конфликты</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d файлы, подлежащие синхронизации, не могут быть синхронизированы</string>
+  <string name="sync_fail_in_favourites_ticker">Синхронизация файлов не удалась</string>
+  <string name="sync_fail_in_favourites_content">Содержимое %1$d файлов не может быть синхронизировано (%2$d конфликты)</string>
   <string name="use_ssl">Использовать защищенное соединение</string>
   <string name="location_no_provider">ownCloud не может отследить Ваше устройство. Пожалуйста, проверьте настройки местоположения</string>
   <string name="pincode_enter_pin_code">Пожалуйста, введите Ваш PIN-код приложения</string>
   <string name="pincode_enter_new_pin_code">Пожалуйста, введите Ваш новый PIN-код приложения</string>
   <string name="pincode_configure_your_pin">Введите PIN-код приложения ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">PIN будет запрашиваться каждый раз при запуске приложения</string>
   <string name="pincode_reenter_your_pincode">Повторно введите PIN-код ownCloud-приложения, пожалуйста</string>
   <string name="pincode_remove_your_pincode">Удалите PIN-код ownCloud-приложения</string>
   <string name="pincode_mismatch">PIN-коды ownCloud-приложения не идентичны</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Не удалось установить соединение</string>
   <string name="auth_secure_connection">Защищенное соединение установлено</string>
   <string name="auth_login_details">Учетные данные</string>
+  <string name="auth_unauthorized">Неверный логин / пароль</string>
+  <string name="auth_not_found">Указан неверный путь</string>
+  <string name="auth_internal">Внутренняя ошибка сервера с кодом %1$d</string>
   <string name="crashlog_message">Приложение неожиданно завершило работу. Хотели бы вы отправить отчет о неполадках?</string>
   <string name="crashlog_send_report">Отправить отчет</string>
   <string name="crashlog_dont_send_report">Не отправлять отчет</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Переименовать</string>
   <string name="common_remove">Удалить</string>
   <string name="confirmation_remove_alert">Вы действительно хотите удалить %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Вы действительно хотите удалить %1$s и все содержимое ?</string>
   <string name="confirmation_remove_local">Только локально</string>
+  <string name="confirmation_remove_folder_local">Только локальное содержимое</string>
   <string name="confirmation_remove_remote">Удалить с сервера</string>
   <string name="confirmation_remove_remote_and_local">Оба, удаленный и локальный</string>
   <string name="remove_success_msg">Успешное удаление</string>
   <string name="remove_fail_msg">Удаление не может быть завершено</string>
+  <string name="rename_dialog_title">Введите новое имя</string>
   <string name="rename_local_fail_msg">Локальная копия не может быть переименована; попробуйте другое новое имя</string>
   <string name="rename_server_fail_msg">Переименование не может быть завершено</string>
+  <string name="sync_file_fail_msg">Удаленный файл не может быть проверен</string>
+  <string name="sync_file_nothing_to_do_msg">Содержимое файла уже синхронизировано</string>
   <string name="create_dir_fail_msg">Каталог не может быть создан</string>
   <string name="wait_a_moment">Подождите</string>
   <string name="filedisplay_unexpected_bad_get_content">Неожиданная проблема; пожалуйста, попробуйте другое приложение для выбора файла</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Сертификат сервера не может быть получен</string>
   <string name="ssl_validator_question">Хотите объявить этот сертификат надежным в любом случае?</string>
   <string name="ssl_validator_not_saved">Этот сертификат не может быть сохранен</string>
+  <string name="ssl_validator_btn_details_see">Сведения</string>
+  <string name="ssl_validator_btn_details_hide">Скрыть</string>
+  <string name="ssl_validator_label_subject">Выдано для:</string>
+  <string name="ssl_validator_label_issuer">Выдал:</string>
+  <string name="ssl_validator_label_CN">Общее имя:</string>
+  <string name="ssl_validator_label_O">Организация:</string>
+  <string name="ssl_validator_label_OU">Организационное подразделение:</string>
+  <string name="ssl_validator_label_C">Страна:</string>
+  <string name="ssl_validator_label_ST">Состояние:</string>
+  <string name="ssl_validator_label_L">Расположение:</string>
+  <string name="ssl_validator_label_validity">Срок действия:</string>
+  <string name="ssl_validator_label_validity_from">От:</string>
+  <string name="ssl_validator_label_validity_to">Для:</string>
+  <string name="ssl_validator_label_signature">Подпись:</string>
+  <string name="ssl_validator_label_signature_algorithm">Алгоритм:</string>
   <string name="text_placeholder">Это заполнитель</string>
   <string name="instant_upload_on_wifi">Загрузать изображения только посредством WiFi </string>
+  <string name="instant_upload_path">/НемедленнаяЗагрузка</string>
+  <string name="conflict_title">Конфликт обновления</string>
+  <string name="conflict_message">Удаленный файл %s не синхронизирован с локальным файлом. Продолжение повлечет замену содержимого файла на сервере.</string>
+  <string name="conflict_keep_both">Сохранить оба</string>
+  <string name="conflict_overwrite">Перезаписать</string>
+  <string name="conflict_dont_upload">Не загружать</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f65acc43..8d58f738 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Привет Мир, ГлавноеОкноOwnCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Пароль:</string>
   <string name="main_login">Пользователь:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Настройки</string>
   <string name="main_tit_accsetup">Настроить аккаунт</string>
   <string name="main_wrn_accsetup">На вашем устройстве нет ownCloud аккаунтов. Вам нужно создать аккаунт, чтобы пользоваться этим приложеним.</string>
+  <string name="about_message">ownCloud клиент для Android\n\nверсия: %1$s</string>
   <string name="actionbar_sync">Обновить</string>
   <string name="actionbar_upload">Загрузка</string>
   <string name="actionbar_upload_from_apps">Содержимое от других приложений</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud не имеет доступа к опубликованным данным</string>
   <string name="uploader_info_uploading">Загрузка</string>
   <string name="uploader_btn_create_dir_text">Создайте директорию для загрузки</string>
+  <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью пункта меню \"Загрузить\".</string>
   <string name="filedetails_select_file">Нажмите на файл для отображения дополнительной информации.</string>
   <string name="filedetails_size">Размер:</string>
   <string name="filedetails_type">Тип:</string>
   <string name="filedetails_created">Создан:</string>
   <string name="filedetails_modified">Изменён:</string>
   <string name="filedetails_download">Скачать</string>
+  <string name="filedetails_sync_file">Обновить</string>
   <string name="filedetails_redownload">Скачать заново</string>
   <string name="filedetails_open">Открыть</string>
+  <string name="filedetails_renamed_in_upload_msg">Файл был переименован в %1$s во время загрузки</string>
   <string name="common_yes">Да</string>
   <string name="common_no">Нет</string>
   <string name="common_ok">ОК</string>
+  <string name="common_cancel_download">Отменить скачивание</string>
+  <string name="common_cancel_upload">Отмена загрузки</string>
   <string name="common_cancel">Отмена</string>
   <string name="common_save_exit">Сохранить &amp; Выйти</string>
   <string name="common_exit">Выйти из ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Контакты</string>
   <string name="sync_fail_ticker">Синхронизация прошла неудачно</string>
   <string name="sync_fail_content">Синхронизация %1$s не может быть завершена</string>
+  <string name="sync_conflicts_in_favourites_ticker">Обнаружены конфликты</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d файлы, которые должны быть синхронизированными не могут синхронизироваться</string>
+  <string name="sync_fail_in_favourites_ticker">Не удалось синхронизировать файлы</string>
+  <string name="sync_fail_in_favourites_content">Содержание %1$d файла(ов) не может быть синхронизировано (%2$d конфликта(ов))</string>
   <string name="use_ssl">Использовать защищённое соединение</string>
   <string name="location_no_provider">ownCloud не может отслеживать ваше устройство. Проверьте настройки вашего местоположения</string>
   <string name="pincode_enter_pin_code">Вставьте PIN вашего приложения</string>
   <string name="pincode_enter_new_pin_code">Введите новый ownCloud App PIN</string>
   <string name="pincode_configure_your_pin">Введите ownCloud App PIN</string>
+  <string name="pincode_configure_your_pin_explanation">ПИН-код будет запрашиваться каждый раз, когда вы запускаете приложение.</string>
   <string name="pincode_reenter_your_pincode">Повторите ownCloud App PIN</string>
   <string name="pincode_remove_your_pincode">Удалить ownCloud App PIN</string>
   <string name="pincode_mismatch">Два ownCloud App PIN не совпадают</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Невозможно установить соединение</string>
   <string name="auth_secure_connection">Защищённое соединение установлено</string>
   <string name="auth_login_details">Детали входа</string>
+  <string name="auth_unauthorized">Неправильный логин / пароль</string>
+  <string name="auth_not_found">Указан неверный путь</string>
+  <string name="auth_internal">Внутренняя ошибка сервера, код %1$d</string>
   <string name="crashlog_message">Приложение завершилось неожиданно. Хотите отправить аварийный отчёт?</string>
   <string name="crashlog_send_report">Отправить отчёт</string>
   <string name="crashlog_dont_send_report">Не отправлять отчёт</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Переименовать</string>
   <string name="common_remove">Удалить</string>
   <string name="confirmation_remove_alert">Вы в самом деле хотите удалить %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Вы действительно хотите удалить %1$s  и его содержимое ?</string>
   <string name="confirmation_remove_local">Только локально</string>
+  <string name="confirmation_remove_folder_local">Только локальные данные</string>
   <string name="confirmation_remove_remote">Удалить с сервера</string>
   <string name="confirmation_remove_remote_and_local">И удалённо и локально</string>
   <string name="remove_success_msg">Успешное удаление</string>
   <string name="remove_fail_msg">Удаление не может быть завершено</string>
+  <string name="rename_dialog_title">Введите новое имя</string>
   <string name="rename_local_fail_msg">Локальная копия не может быть переименована; попробуйте другое имя</string>
   <string name="rename_server_fail_msg">Переименование не может быть завершено</string>
+  <string name="sync_file_fail_msg">Удаленный файл не может быть проверен</string>
+  <string name="sync_file_nothing_to_do_msg">Содержимое файла уже синхронизировано</string>
   <string name="create_dir_fail_msg">Директория не может быть создана</string>
   <string name="wait_a_moment">Подождите немного</string>
   <string name="filedisplay_unexpected_bad_get_content">Неизвестная ошибка; попробуйте другое приложение для выбора файла</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Сертификат сервера не доступен</string>
   <string name="ssl_validator_question">Все-равно доверять данному сертификату?</string>
   <string name="ssl_validator_not_saved">Сертификат не может быть сохранён</string>
+  <string name="ssl_validator_btn_details_see">Детали</string>
+  <string name="ssl_validator_btn_details_hide">Спрятать</string>
+  <string name="ssl_validator_label_subject">Выдано для:</string>
+  <string name="ssl_validator_label_issuer">Выдан:</string>
+  <string name="ssl_validator_label_CN">Имя:</string>
+  <string name="ssl_validator_label_O">Организация:</string>
+  <string name="ssl_validator_label_OU">Организационное подразделение:</string>
+  <string name="ssl_validator_label_C">Страна:</string>
+  <string name="ssl_validator_label_ST">Статус:</string>
+  <string name="ssl_validator_label_L">Местонахождение:</string>
+  <string name="ssl_validator_label_validity">Срок действия:</string>
+  <string name="ssl_validator_label_validity_from">От:</string>
+  <string name="ssl_validator_label_validity_to">До:</string>
+  <string name="ssl_validator_label_signature">Подпись:</string>
+  <string name="ssl_validator_label_signature_algorithm">Алгоритм:</string>
   <string name="text_placeholder">Это заполнитель</string>
   <string name="instant_upload_on_wifi">Загружать изображения только через WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Конфликт обновления</string>
+  <string name="conflict_message">Удаленный файл %s не синхронизирован с локальным. Завершение приведет к замене содержания файла на сервере.</string>
+  <string name="conflict_keep_both">Оставить оба</string>
+  <string name="conflict_overwrite">Заменить</string>
+  <string name="conflict_dont_upload">Не загружать</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c757504a..ad7863bd 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -1,2 +1,136 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">මුරපදය</string>
+  <string name="main_login">පරිශීලක නාමය</string>
+  <string name="main_button_login">ප්‍රවිශ්ටය</string>
+  <string name="main_welcome">OwnCloud වෙත ඔබව සාදරයෙන් පිළිගනිමු</string>
+  <string name="main_files">ගොනු</string>
+  <string name="main_music">සංගීතය</string>
+  <string name="main_contacts">සබඳතා</string>
+  <string name="main_calendar">දිනදසුන</string>
+  <string name="main_bookmarks">පිටු සළකුනු</string>
+  <string name="main_settings">සිටුවම්</string>
+  <string name="main_tit_accsetup">පරිශීලක ගිණුම ස්ථාපිත කරන්න</string>
+  <string name="main_wrn_accsetup">owncloud ගිණුම් මෙම යන්ත්‍රයේ නොමැත. මෙම යෙදුම භාවිතයට ගිණුමක් තිබිය යුතුය</string>
+  <string name="actionbar_sync">නැවුම් කරන්න</string>
+  <string name="actionbar_upload">උඩුගත කිරීම</string>
+  <string name="actionbar_upload_files">ගොනු</string>
+  <string name="actionbar_mkdir">ඩිරෙක්ටරිය සාදන්න</string>
+  <string name="actionbar_search">සොයන්න</string>
+  <string name="actionbar_settings">සිටුවම්</string>
+  <string name="prefs_category_general">සාමාන්‍යයෙන්</string>
+  <string name="prefs_category_trackmydevice">මෙවලම සෙවීම</string>
+  <string name="prefs_add_session">නව සැසියක් එකතු කරන්න</string>
+  <string name="prefs_create_img_thumbnails">සිඟිති රූ සාදන්න</string>
+  <string name="prefs_select_oc_account">ගිණුමක් තෝරන්න</string>
+  <string name="prefs_summary_select_oc_account">යෙදුම ඔබගේ ගිණුම් අතුරින් කිනම් ගිණුම භාවිතා කළ යුතුදැයි තෝරන්න</string>
+  <string name="prefs_trackmydevice">මෙවලම සෙවීම</string>
+  <string name="prefs_trackmydevice_summary_off">ඔබගේ යන්ත්‍රය ඇති ස්ථානය සොයාගැනීමට අවසර ownCloudට ලබාදෙන්න</string>
+  <string name="prefs_trackmydevice_summary_on">ඔබගේ ownCloud ඔබගේ යන්ත්‍රය ඇති ස්ථානය හඹායයි</string>
+  <string name="prefs_trackmydevice_interval">යාවත්කාලීන කරන කාල ප්‍රාන්තරය</string>
+  <string name="prefs_trackmydevice_interval_summary">සෑම මිනිත්තු %1$s වරක් යාවත්කාලීන කරන්න</string>
+  <string name="prefs_accounts">ගිණුම්</string>
+  <string name="prefs_manage_accounts">ගිණුම් කළමනාකරනය</string>
+  <string name="prefs_pincode_summary">ඔබේ ownCloud සේවාලාභියා සුරකින්න</string>
+  <string name="prefs_instant_upload">ක්‍ෂණික උඩුගත කිරීම් සක්‍රිය කරන්න</string>
+  <string name="prefs_instant_upload_summary">කැමරාවෙන් ගත් රූප ක්‍ෂණිකව උඩුගත කරන්න</string>
+  <string name="auth_host_url">ownCloud යොමුව</string>
+  <string name="auth_username">පරිශීලක නම</string>
+  <string name="auth_password">මුර පදය</string>
+  <string name="auth_register">මම ownCloudට නවකයෙක්මි</string>
+  <string name="new_session_uri_error">දී ඇති යෙදුම වැරදි</string>
+  <string name="new_session_session_name_error">වැරදි සැසිවාර නමක්</string>
+  <string name="sync_string_files">ගොනු</string>
+  <string name="uploader_no_file_selected">උඩුගත කිරීමට ගොනුවක් තෝරා නැත</string>
+  <string name="setup_hint_username">පරිශීලක නම</string>
+  <string name="setup_hint_password">මුර පදය</string>
+  <string name="setup_hint_address">අන්තර්ජාල ලිපිනය</string>
+  <string name="setup_hint_show_password">මුරපදය පෙන්වන්නද?</string>
+  <string name="setup_title">ඔබගේ ownCloud හා සම්බන්ධ වන්න</string>
+  <string name="setup_btn_connect">සම්බන්ධ වන්න</string>
+  <string name="uploader_btn_upload_text">උඩුගත කිරීම</string>
+  <string name="uploader_wrn_no_account_title">ගිණුමක් හමු නොවුණි</string>
+  <string name="uploader_wrn_no_account_text">owncloud ගිණුම් මෙම යන්ත්‍රයේ නොමැත. කරුණාකර ගිණුමක් සාදන්න</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">ස්ථාපනය</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">නික්මෙන්න</string>
+  <string name="uploader_info_uploading">උඩුගතවේ</string>
+  <string name="uploader_btn_create_dir_text">උඩුගත කිරීම් සඳහා ඩිරෙක්ටරිය තනන්න</string>
+  <string name="filedetails_select_file">වැඩි විස්තර සඳහා ගොනුවක් ස්පර්ෂ කරන්න</string>
+  <string name="filedetails_size">විශාලත්වය:</string>
+  <string name="filedetails_type">ගණය:</string>
+  <string name="filedetails_created">සෑදු දිනය:</string>
+  <string name="filedetails_modified">වෙනස් කළ දිනය:</string>
+  <string name="filedetails_download">භාගත කරන්න</string>
+  <string name="filedetails_sync_file">නැවුම් කරන්න</string>
+  <string name="filedetails_redownload">නැවුම් කරන්න</string>
+  <string name="filedetails_open">විවෘත කරන්න</string>
+  <string name="common_yes">ඔව්</string>
+  <string name="common_no">එපා</string>
+  <string name="common_ok">හරි</string>
+  <string name="common_cancel_upload">උඩුගත කිරීම අත් හරින්න</string>
+  <string name="common_cancel">එපා</string>
+  <string name="common_save_exit">සුරැක &amp; පිටවන්න</string>
+  <string name="common_exit">ownCloud අත්හැර යන්න</string>
+  <string name="common_error">දෝශය</string>
+  <string name="about_title">පිළිබඳව</string>
+  <string name="delete_account">ගිණුම මකන්න</string>
+  <string name="create_account">ගිණුම සාදන්න</string>
+  <string name="uploader_info_dirname">ඩිරෙක්ටරි නම</string>
+  <string name="uploader_upload_succeeded_ticker">උඩුගත කිරීම සාර්ථකයි</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d ගොනු සාර්ථකව උඩුගත කෙරුණි</string>
+  <string name="uploader_upload_failed_ticker">උඩුගත කිරීම අසාර්ථකයි</string>
+  <string name="uploader_upload_failed_content_multiple">උඩුගත කිරීම අසාර්ථකයි: %1$d/%2$d ගොනු උඩගත විය</string>
+  <string name="downloader_download_in_progress_ticker">බාගතවේ...</string>
+  <string name="downloader_download_succeeded_ticker">බාගත කිරීම සාර්ථකයි</string>
+  <string name="downloader_download_failed_ticker">බාගත කිරීම අසාර්ථකයි</string>
+  <string name="common_choose_account">ගිණුම තෝරන්න</string>
+  <string name="sync_string_contacts">සබඳතා</string>
+  <string name="use_ssl">ආරක්ෂිත සම්බන්ධතාවක් භාවිතා කරන්න</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>විනාඩි 15</item>
+    <item>විනාඩි 30</item>
+    <item>විනාඩි 60</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">පිවිසීමට උත්සහ කරනවා...</string>
+  <string name="auth_no_net_conn_title">ජාල සම්බන්ධතාවක් නොමැත</string>
+  <string name="auth_no_net_conn_message">ජාල සම්බන්ධතාවක් සොයා ගත නොහැක. ඔබගේ අන්තර්ජාල සම්බන්ධතාව පරීක්ෂාකර නැවත උත්සහ කරන්න</string>
+  <string name="auth_connect_anyway">කොහොමත් සම්බන්ධවන්න</string>
+  <string name="auth_nossl_plain_ok_title">ආරක්ෂිත සම්බන්ධතාවක් නොලැබුණි</string>
+  <string name="auth_connection_established">සම්බන්ධතාවක් සාදන ලදී</string>
+  <string name="auth_testing_connection">සම්බන්ධතාව පරීක්ෂා කෙරේ</string>
+  <string name="auth_not_configured_title">විකෘතිවු OwnCloud හැඩගැසුමක්</string>
+  <string name="auth_unknown_error_title">නොදන්නා දෝෂයක් ඇතිවිය</string>
+  <string name="auth_unknown_host_title">සේවාදායකයා සොයාගත නොහැක</string>
+  <string name="auth_timeout_title">සේවාදායකයා පිළිතුරු දීමට දිගු කාලයක් ගත්තේය</string>
+  <string name="auth_incorrect_address_title">විකෘතිවු යොමුවක්</string>
+  <string name="auth_ssl_general_error_title">SSL ආරම්භ කිරීම අසාර්ථකයි</string>
+  <string name="auth_bad_oc_version_title">හඳුනාගත නොහැකි ownCloud අනුවාදයක්</string>
+  <string name="auth_wrong_connection_title">සම්බන්ධයක් ඇතිකර ගැනීමට නොහැකි විය</string>
+  <string name="auth_secure_connection">රක්‍ෂිත සම්බන්ධතාවක් සාදන ලදී</string>
+  <string name="auth_login_details">පිවිසුම් සඳහා විස්තර</string>
+  <string name="crashlog_send_report">වාර්තාව යවන්න</string>
+  <string name="crashlog_dont_send_report">වාර්තාව යවන්න එපා</string>
+  <string name="fd_keep_in_sync">ගොනුව යාවත්කාලීනව තබාගන්න</string>
+  <string name="common_share">බෙදා හදාගන්න</string>
+  <string name="common_rename">නැවත නම් කරන්න</string>
+  <string name="common_remove">ඉවත් කරන්න </string>
+  <string name="confirmation_remove_alert">%1$s සැබැවින්ම ඉවත්කිරීමට අවශ්‍යද?</string>
+  <string name="confirmation_remove_local">පෙදෙසි පමණක්</string>
+  <string name="confirmation_remove_remote">සේවාදායකයාගෙන් ඉවත් කරන්න</string>
+  <string name="confirmation_remove_remote_and_local">දුරස්ථ හා පෙදෙසි </string>
+  <string name="remove_success_msg">සාර්ථක ඉවත්කිරීමක්</string>
+  <string name="remove_fail_msg">ඉවත් කිරීම සම්පූර්ණ කළ නොහැක</string>
+  <string name="rename_server_fail_msg">නැවත නම් කිරීම සම්පුර්ණ කළ නොහැකි විය</string>
+  <string name="create_dir_fail_msg">ඩිරෙක්ටරිය සෑදීමට නොහැකි විය</string>
+  <string name="wait_a_moment">ස්වල්ප මොහොතක් සිටින්න</string>
+  <string name="filedisplay_unexpected_bad_get_content">නොසිතු ප්‍රශ්ණයක්; කරුණාකර වෙනත් යෙදුමක් භාවිතා කර ගොනුව තෝරන්න</string>
+  <string name="filedisplay_no_file_selected">ගොනුවක් තෝරා නැත</string>
+  <string name="ssl_validator_title">අනතුරු ඇඟවිම</string>
+  <string name="ssl_validator_btn_details_hide">සඟවන්න</string>
+</resources>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index fa20febb..193c74d4 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
   <string name="main_password">Heslo:</string>
   <string name="main_login">Meno:</string>
   <string name="main_button_login">Login</string>
@@ -14,6 +15,7 @@
   <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty ownCloud. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
   <string name="actionbar_sync">Obnoviť</string>
   <string name="actionbar_upload">Nahraj súbor</string>
+  <string name="actionbar_upload_from_apps">Obsah z inej aplikácie</string>
   <string name="actionbar_upload_files">Súbory</string>
   <string name="actionbar_mkdir">Vytvor priečinok</string>
   <string name="actionbar_search">Hľadaj</string>
@@ -62,12 +64,16 @@
   <string name="filedetails_created">Vytvorený:</string>
   <string name="filedetails_modified">Zmenený:</string>
   <string name="filedetails_download">Stiahnuť</string>
+  <string name="filedetails_sync_file">Obnoviť</string>
   <string name="filedetails_redownload">Obnoviť</string>
   <string name="filedetails_open">Otvoriť</string>
   <string name="common_yes">Áno</string>
   <string name="common_no">Nie</string>
+  <string name="common_ok">OK</string>
+  <string name="common_cancel_upload">Zrušiť odosielanie</string>
   <string name="common_cancel">Zrušiť</string>
   <string name="common_save_exit">Uložiť a ukončiť</string>
+  <string name="common_exit">Opustiť ownCloud</string>
   <string name="common_error">Chyba</string>
   <string name="delete_account">Zmazať účet</string>
   <string name="create_account">Vytvoriť účet</string>
@@ -76,14 +82,19 @@
   <string name="uploader_upload_in_progress_ticker">Odosielam ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Odosielam %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Odoslanie bolo úspešné</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s úspešne odoslaný</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d súborov bolo úspešne odoslaných</string>
   <string name="uploader_upload_failed_ticker">Odoslanie bolo neúspešné</string>
+  <string name="uploader_upload_failed_content_single">Odoslanie %1$s nemohlo byť dokončené</string>
   <string name="downloader_download_in_progress_ticker">SÅ¥ahujem ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% SÅ¥ahovanie %2$s</string>
   <string name="downloader_download_succeeded_ticker">Sťahovanie bolo úspešné</string>
+  <string name="downloader_download_failed_ticker">Stiahnutie zlyhalo</string>
   <string name="common_choose_account">Zvoliť účet</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
   <string name="use_ssl">Použiť zabezpečené pripojenie</string>
+  <string name="location_no_provider">ownCloud nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
   <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
   <string name="pincode_enter_new_pin_code">Zadajte nové PIN aplikácie</string>
   <string name="pincode_configure_your_pin">Zadajte PIN ownCloud aplikácie</string>
@@ -110,10 +121,29 @@
   <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
   <string name="auth_connection_established">Pripojenie vytvorené</string>
   <string name="auth_testing_connection">Testovane pripojenia...</string>
+  <string name="auth_not_configured_title">Nesprávna konfigurácia ownCloud</string>
+  <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
+  <string name="auth_incorrect_path_title">ownCloud instance not found</string>
+  <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
+  <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
+  <string name="auth_wrong_connection_title">Nie je možne vytvoriť spojenie</string>
+  <string name="auth_secure_connection">Vytvorené zabezpečené spojenie</string>
   <string name="auth_login_details">Podrobnosti prihlásenia</string>
+  <string name="crashlog_send_report">Poslať výpis</string>
+  <string name="crashlog_dont_send_report">Neposlať výpis</string>
+  <string name="extensions_avail_title">Sú dostupné rozšírenia.</string>
+  <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_share">Zdieľaj</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
+  <string name="confirmation_remove_alert">Naozaj odstrániť %1$s ?</string>
+  <string name="confirmation_remove_local">Iba lokálne</string>
+  <string name="confirmation_remove_remote">Zmazať zo servera</string>
+  <string name="remove_success_msg">Úspešne odstránené</string>
+  <string name="rename_server_fail_msg">Nie je možné premenovať</string>
+  <string name="create_dir_fail_msg">Priečinok nie je možné vytvoriť</string>
+  <string name="wait_a_moment">Počkať chvíľu</string>
+  <string name="filedisplay_no_file_selected">Nebol vybraný súbor</string>
   <string name="ssl_validator_title">Upozornenie</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Certifikát servera nie je overený</string>
   <string name="ssl_validator_reason_cert_expired">- Platnosť certifikátu servera vypršala</string>
@@ -121,5 +151,6 @@
   <string name="ssl_validator_certificate_not_available">Nie je možné získať certifikát servera</string>
   <string name="ssl_validator_question">Chcete veriť tomuto certifikátu v každom prípade ?</string>
   <string name="ssl_validator_not_saved">Certifikát nemôže byť uložený</string>
+  <string name="ssl_validator_btn_details_hide">Skyť</string>
   <string name="instant_upload_on_wifi">Odoslať fotografie iba cez WiFi</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8e418364..74135699 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Pozdravljen svet, OwnCloudMainScreen!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Geslo:</string>
   <string name="main_login">Uporabniško ime:</string>
   <string name="main_button_login">Prijava</string>
-  <string name="main_welcome">Dobrodošli v vašem ownCloud</string>
+  <string name="main_welcome">Dobrodošli v oblaku ownCloud</string>
   <string name="main_files">Datoteke</string>
   <string name="main_music">Glasba</string>
   <string name="main_contacts">Stiki</string>
@@ -13,104 +12,115 @@
   <string name="main_bookmarks">Zaznamki</string>
   <string name="main_settings">Nastavitve</string>
   <string name="main_tit_accsetup">Nastavi račun</string>
-  <string name="main_wrn_accsetup">Na vaši napravi ni ownCloud računa. Če želite uporabljati to aplikacijo, ga morate ustvariti.</string>
+  <string name="main_wrn_accsetup">Na vaši napravi ni računa ownCloud. Za uporabo tega programa je treba račun ustvariti.</string>
+  <string name="about_message">Odjemalec ownCloud za Android\n\nrazličica: %1$s</string>
   <string name="actionbar_sync">Osveži</string>
-  <string name="actionbar_upload">Naloži datoteko</string>
-  <string name="actionbar_upload_from_apps">Vsebina iz drugih aplikacij</string>
+  <string name="actionbar_upload">Pošlji datoteko</string>
+  <string name="actionbar_upload_from_apps">Vsebina iz drugih programov</string>
   <string name="actionbar_upload_files">Datoteke</string>
   <string name="actionbar_mkdir">Ustvari mapo</string>
-  <string name="actionbar_search">Išči</string>
+  <string name="actionbar_search">Poišči</string>
   <string name="actionbar_settings">Nastavitve</string>
   <string name="prefs_category_general">Splošno</string>
   <string name="prefs_category_trackmydevice">Sledenje napravi</string>
   <string name="prefs_add_session">Dodaj novo sejo</string>
   <string name="prefs_create_img_thumbnails">Ustvari sličice slik</string>
   <string name="prefs_select_oc_account">Izberite račun</string>
-  <string name="prefs_summary_select_oc_account">Izberite račun, ki ga naj aplikacija uporabi.</string>
+  <string name="prefs_summary_select_oc_account">Izberite račun, ki ga naj program uporabi.</string>
   <string name="prefs_trackmydevice">Sledenje napravi</string>
-  <string name="prefs_trackmydevice_summary_off">Omogoči, da ownCloud sledi mestu vaše naprave</string>
-  <string name="prefs_trackmydevice_summary_on">Vaš ownCloud spremlja to napravo</string>
-  <string name="prefs_trackmydevice_interval">Interval posodobitev</string>
+  <string name="prefs_trackmydevice_summary_off">Omogoči sledenje mestu naprave preko oblaka ownCloud.</string>
+  <string name="prefs_trackmydevice_summary_on">Strežnik ownCloud spremlja mesto napravo</string>
+  <string name="prefs_trackmydevice_interval">Časovni razmik posodobitev</string>
   <string name="prefs_trackmydevice_interval_summary">Posodobi vsakih %1$s minut</string>
   <string name="prefs_accounts">Računi</string>
   <string name="prefs_manage_accounts">Upravljanje z računi</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Zaščitite vaš ownCloud odjemalec</string>
-  <string name="prefs_instant_upload">Omogoči takojšnje nalaganje</string>
-  <string name="prefs_instant_upload_summary">Takojšnje nalaganje posnetih fotografij</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_pincode">Koda PIN programa ownCloud</string>
+  <string name="prefs_pincode_summary">Zaščitite odjemalec ownCloud</string>
+  <string name="prefs_instant_upload">Omogoči takojšnje pošiljanje</string>
+  <string name="prefs_instant_upload_summary">Takojšnje pošiljanje posnetih fotografij</string>
+  <string name="auth_host_url">Naslov URL ownCloud</string>
   <string name="auth_username">Uporabniško ime</string>
   <string name="auth_password">Geslo</string>
-  <string name="auth_register">Nov sem na ownCloud</string>
-  <string name="new_session_uri_error">Podan je bil napačen URL</string>
+  <string name="auth_register">Sem nov v oblaku ownCloud</string>
+  <string name="new_session_uri_error">Podan je napačen naslov URL</string>
   <string name="new_session_session_name_error">Napačno ime seje</string>
   <string name="sync_string_files">Datoteke</string>
-  <string name="uploader_no_file_selected">Nobena datoteka ni izbrana za nalaganje</string>
+  <string name="uploader_no_file_selected">Ni izbrane datoteke za pošiljanje.</string>
   <string name="setup_hint_username">Uporabniško ime</string>
   <string name="setup_hint_password">Geslo</string>
   <string name="setup_hint_address">Spletni naslov</string>
-  <string name="setup_hint_show_password">Pokaži geslo?</string>
-  <string name="setup_title">Poveži se z vašim ownCloud</string>
+  <string name="setup_hint_show_password">Ali naj bo geslo prikazano?</string>
+  <string name="setup_title">Poveži se z oblakom ownCloud</string>
   <string name="setup_btn_connect">Poveži</string>
-  <string name="uploader_btn_upload_text">Naloži</string>
-  <string name="uploader_wrn_no_account_title">Ni najdenega uporabniškega računa</string>
-  <string name="uploader_wrn_no_account_text">Na vaši napravi ni ownCloud računov. Prosimo, če najprej nastavite vsaj en račun.</string>
+  <string name="uploader_btn_upload_text">Pošlji</string>
+  <string name="uploader_wrn_no_account_title">Uporabniškega računa ni mogoče najti</string>
+  <string name="uploader_wrn_no_account_text">Na napravi ni računov ownCloud. Nastaviti je treba vsaj en račun.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavi</string>
-  <string name="uploader_wrn_no_account_quit_btn_text">Izhod</string>
-  <string name="uploader_wrn_no_content_title">Ni vsebine za nalaganje</string>
-  <string name="uploader_wrn_no_content_text">Nobena vsebina ni bila sprejeta. Ničesar ni za naložit.</string>
-  <string name="uploader_error_forbidden_content">ownCloud nima dovoljenja za dostop do vsebine v souporabi</string>
-  <string name="uploader_info_uploading">Nalagam</string>
-  <string name="uploader_btn_create_dir_text">Ustvari mapo za nalaganje</string>
-  <string name="filedetails_select_file">Tapnite na datoteko za prikaz dodatnih informacij.</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Končaj</string>
+  <string name="uploader_wrn_no_content_title">Ni vsebine za pošiljanje</string>
+  <string name="uploader_wrn_no_content_text">Ni prejete vsebine. Ni datotek za pošiljanje.</string>
+  <string name="uploader_error_forbidden_content">Oblak ownCloud nima dovoljenj za dostop do vsebine v souporabi</string>
+  <string name="uploader_info_uploading">Pošiljanje</string>
+  <string name="uploader_btn_create_dir_text">Ustvari mapo za pošiljanje</string>
+  <string name="file_list_empty">V tej mapi ni datotek.\nNove datoteke je mogoče dodati preko možnosti menija \"Pošlji\".</string>
+  <string name="filedetails_select_file">Pritisnite n datoteko za prikaz dodatnih podrobnosti.</string>
   <string name="filedetails_size">Velikost:</string>
   <string name="filedetails_type">Vrsta:</string>
-  <string name="filedetails_created">Ustvarjen:</string>
-  <string name="filedetails_modified">Spremenjena:</string>
-  <string name="filedetails_download">Prenos</string>
-  <string name="filedetails_redownload">Ponovno prenesi</string>
+  <string name="filedetails_created">Ustvarjeno:</string>
+  <string name="filedetails_modified">Spremenjeno:</string>
+  <string name="filedetails_download">Prejmi</string>
+  <string name="filedetails_sync_file">Osveži</string>
+  <string name="filedetails_redownload">Osveži</string>
   <string name="filedetails_open">Odpri</string>
+  <string name="filedetails_renamed_in_upload_msg">Datoteka je bila med nalaganjem preimenovana v %1$s</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">V redu</string>
+  <string name="common_cancel_download">Prekliči prenos</string>
+  <string name="common_cancel_upload">Prekliči pošiljanje</string>
   <string name="common_cancel">Prekliči</string>
-  <string name="common_save_exit">Shrani &amp; Izhod</string>
+  <string name="common_save_exit">Shrani &amp; končaj</string>
   <string name="common_exit">Zapusti ownCloud</string>
   <string name="common_error">Napaka</string>
-  <string name="about_title">O ownCloud</string>
+  <string name="about_title">O oblaku ownCloud</string>
   <string name="delete_account">Izbriši račun</string>
   <string name="create_account">Ustvari račun</string>
-  <string name="upload_chooser_title">Naloži datoteko iz …</string>
+  <string name="upload_chooser_title">Pošlji datoteko iz …</string>
   <string name="uploader_info_dirname">Ime mape</string>
-  <string name="uploader_upload_in_progress_ticker">Nalagam …</string>
-  <string name="uploader_upload_in_progress_content">%1$d%% Nalaganje %2$s</string>
-  <string name="uploader_upload_succeeded_ticker">Nalaganje je bilo uspešno</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s je bil uspešno naložen</string>
-  <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully upload</string>
-  <string name="uploader_upload_failed_ticker">Nalaganje je spodletelo</string>
-  <string name="uploader_upload_failed_content_single">Nalaganje %1$s ni bilo mogoče dokončati</string>
-  <string name="uploader_upload_failed_content_multiple">Nalaganje je spodletelo: %1$d/%2$d files were upload</string>
-  <string name="downloader_download_in_progress_ticker">Prenašam …</string>
-  <string name="downloader_download_in_progress_content">%1$d%% Prenašam %2$s</string>
-  <string name="downloader_download_succeeded_ticker">Prenos je uspel</string>
-  <string name="downloader_download_succeeded_content">%1$s je bil uspešno prenešen</string>
-  <string name="downloader_download_failed_ticker">Prenos je spodletel</string>
-  <string name="downloader_download_failed_content">Prenos %1$s ni bilo mogoče dokončati</string>
-  <string name="common_choose_account">Izberite račun</string>
+  <string name="uploader_upload_in_progress_ticker">Pošiljanje …</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Pošiljanje %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Pošiljanje je uspešno končano</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s je uspešno poslan</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d datotek je uspešno poslanih</string>
+  <string name="uploader_upload_failed_ticker">Pošiljanje je spodletelo</string>
+  <string name="uploader_upload_failed_content_single">Pošiljanja %1$s ni mogoče dokončati</string>
+  <string name="uploader_upload_failed_content_multiple">Pošiljanje je spodletelo: Poslanih je %1$d/%2$d datotek.</string>
+  <string name="downloader_download_in_progress_ticker">Prejemanje …</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Prejemanje %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Prejemanje je uspešno končano</string>
+  <string name="downloader_download_succeeded_content">%1$s je uspešno prejet</string>
+  <string name="downloader_download_failed_ticker">Prejemanje je spodletelo</string>
+  <string name="downloader_download_failed_content">Prejemanja %1$s ni mogoče dokončati</string>
+  <string name="common_choose_account">Izbor računa</string>
   <string name="sync_string_contacts">Stiki</string>
   <string name="sync_fail_ticker">Usklajevanje je spodletelo</string>
-  <string name="sync_fail_content">Usklajevanja %1$s ni bilo mogoče dokončati</string>
+  <string name="sync_fail_content">Usklajevanja %1$s ni mogoče dokončati</string>
+  <string name="sync_conflicts_in_favourites_ticker">Najdeni spori</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d vedno-ažurnih datotek ni bilo mogoče uskladiti</string>
+  <string name="sync_fail_in_favourites_ticker">Usklajevanje vedno-ažurnih datotek je spodletelo</string>
+  <string name="sync_fail_in_favourites_content">Vsebino %1$d datotek ni bilo mogoče uskladiti (%2$d sporov)</string>
   <string name="use_ssl">Uporabi varno povezavo</string>
-  <string name="location_no_provider">ownCloud ne more slediti vaši napravi. Prosimo, če preverite nastavitve vaše lokacije.</string>
-  <string name="pincode_enter_pin_code">Prosimo, če vnesete vaš App PIN</string>
-  <string name="pincode_enter_new_pin_code">Prosimo, če vnesete vaš nov App PIN</string>
-  <string name="pincode_configure_your_pin">Vnesite ownCloud App PIN</string>
-  <string name="pincode_reenter_your_pincode">Prosimo, če ponovno vnesete ownCloud App PIN</string>
-  <string name="pincode_remove_your_pincode">Odstrani vaš ownCloud App PIN</string>
-  <string name="pincode_mismatch">ownCloud App PIN se ne ujemata</string>
-  <string name="pincode_wrong">Nepravilen ownCloud App PIN</string>
-  <string name="pincode_removed">ownCloud App PIN je bil odstranjen</string>
-  <string name="pincode_stored">ownCloud App PIN je shranjen</string>
+  <string name="location_no_provider">Z ownCloud ni mogoče slediti napravi. Preverite nastavitve vašega mesta nahajanja.</string>
+  <string name="pincode_enter_pin_code">Vnesite PIN programa</string>
+  <string name="pincode_enter_new_pin_code">Vnesite nov PIN programa</string>
+  <string name="pincode_configure_your_pin">Vnesite kodo PIN programa ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Koda PIN bo zahtevana vsakič pred zagonom programa.</string>
+  <string name="pincode_reenter_your_pincode">Ponovno vnesite kodo PIN programa ownCloud</string>
+  <string name="pincode_remove_your_pincode">Odstrani kodo PIN programa ownCloud</string>
+  <string name="pincode_mismatch">Vrednosti kodo PIN programa ownCloud nista enaki</string>
+  <string name="pincode_wrong">Nepravilen kodo PIN programa ownCloud</string>
+  <string name="pincode_removed">Koda PIN programa ownCloud je odstranjena</string>
+  <string name="pincode_stored">Koda PIN programa ownCloud je shranjena</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minut</item>
     <item>30 minut</item>
@@ -121,49 +131,89 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Poskušam se prijaviti…</string>
+  <string name="auth_trying_to_login">Poskus prijave …</string>
   <string name="auth_no_net_conn_title">Ni omrežne povezave</string>
-  <string name="auth_no_net_conn_message">Omrežna povezava ni bila zaznana. Preverite vašo internetno povezavo in poskusite znova.</string>
+  <string name="auth_no_net_conn_message">Omrežna povezava ni zaznana. Preverite internetno povezavo in poskusite znova.</string>
   <string name="auth_connect_anyway">Vseeno poveži</string>
   <string name="auth_nossl_plain_ok_title">Varna povezava ni na voljo.</string>
-  <string name="auth_nossl_plain_ok_message">Aplikaciji ni uspelo vzpostaviti varne povezave s strežnikom. Nadaljujete lahko z ne varno povezavo ali prekinete.</string>
-  <string name="auth_connection_established">Povezava vzpostavljena</string>
-  <string name="auth_testing_connection">Preizkušam povezavo...</string>
+  <string name="auth_nossl_plain_ok_message">Programu ni uspelo vzpostaviti varne povezave s strežnikom. Nadaljujete lahko z ne-varno povezavo ali pa prekinete.</string>
+  <string name="auth_connection_established">Povezava je vzpostavljena</string>
+  <string name="auth_testing_connection">Preizkušanje povezave ...</string>
   <string name="auth_not_configured_title">Nastavitve ownCloud so napačno oblikovane</string>
   <string name="auth_not_configured_message">Zdi se, da vaš ownCloud ni pravilno nastavljen. Za dodatna pojasnila se obrnite na skrbnika.</string>
   <string name="auth_unknown_error_title">Prišlo je do neznane napake</string>
-  <string name="auth_unknown_error_message">Prišlo je do neznane napake. Prosimo, če nanjo opozorite avtorje ter jim pri tem posredujete dnevniške zapise vaše naprave.</string>
+  <string name="auth_unknown_error_message">Prišlo je do neznane napake. Na napako opozorite razvijalce in jim posredujete dnevniške zapise z naprave.</string>
   <string name="auth_unknown_host_title">Gostitelja ni mogoče najti</string>
   <string name="auth_unknown_host_message">Vpisanega gostitelja ni bilo mogoče nati. Preverite ime gostitelja in razpoložljivost strežnika ter poskusite znova.</string>
-  <string name="auth_incorrect_path_title">ownCloud namestitve ni bilo mogoče najti</string>
-  <string name="auth_incorrect_path_message">Na podani poti ni bilo mogoče najti ownCloud namestitve. Prosimo, če preverite vpisano pot in poskusite znova.</string>
+  <string name="auth_incorrect_path_title">Namestitve ownCloud ni mogoče najti</string>
+  <string name="auth_incorrect_path_message">Na podani poti ni bilo mogoče najti namestitve ownCloud. Preverite vpisano pot in poskusite znova.</string>
   <string name="auth_timeout_title">Strežnik je potreboval preveč časa za odgovor</string>
-  <string name="auth_incorrect_address_title">Napačno oblikovan URL</string>
-  <string name="auth_ssl_general_error_title">SSL inicializacija je spodletela</string>
-  <string name="auth_ssl_unverified_server_title">SSL identiteta strežnika ni preverjena</string>
-  <string name="auth_bad_oc_version_title">Neprepoznana različica ownCloud strežnika</string>
-  <string name="auth_wrong_connection_title">Povezave ni bilo mogoče vzpostaviti</string>
+  <string name="auth_incorrect_address_title">Napačno oblikovan naslov URL</string>
+  <string name="auth_ssl_general_error_title">Začenjanje SSL je spodletelo</string>
+  <string name="auth_ssl_unverified_server_title">Istovetnost strežnika SSL ni preverjena</string>
+  <string name="auth_bad_oc_version_title">Neprepoznana različica strežnika ownCloud</string>
+  <string name="auth_wrong_connection_title">Povezave ni mogoče vzpostaviti</string>
   <string name="auth_secure_connection">Varna povezava je vzpostavljena</string>
   <string name="auth_login_details">Podrobnost prijave</string>
-  <string name="crashlog_message">Aplikacija se je nepričakovano zaprla. Ali bi želeli poslati poročilo o sesutju?</string>
+  <string name="auth_unauthorized">Neveljavna prijava / geslo</string>
+  <string name="auth_not_found">Podana je bila napačna pot</string>
+  <string name="auth_internal">Notranja napaka strežnika, koda %1$d</string>
+  <string name="crashlog_message">Program se je nepričakovano zaprl. Ali bi želeli poslati poročilo o sesutju?</string>
   <string name="crashlog_send_report">Pošlji poročilo</string>
   <string name="crashlog_dont_send_report">Ne pošlji poročila</string>
   <string name="extensions_avail_title">Na voljo so razširitve!</string>
-  <string name="extensions_avail_message">Iz</string>
-  <string name="fd_keep_in_sync">Datoteka naj ostane posodobljena</string>
+  <string name="extensions_avail_message">Videti je, da različica oblaka ownCloud podpira napredne razširitve. Ali želite pregledati razširitve za okolje Android?</string>
+  <string name="fd_keep_in_sync">Datoteka naj bo posodobljena</string>
   <string name="common_share">Souporaba</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
   <string name="confirmation_remove_alert">Ali ste prepričani, da želite odstraniti %1$s ?</string>
-  <string name="confirmation_remove_local">Samo lokalno</string>
-  <string name="confirmation_remove_remote">Odstrani iz strežnika</string>
-  <string name="confirmation_remove_remote_and_local">Obe, oddaljeno in lokalno</string>
-  <string name="remove_success_msg">Odstranitev je bila uspešna</string>
-  <string name="remove_fail_msg">Odstranjevanje ni bilo dokončano</string>
-  <string name="rename_local_fail_msg">Lokalne datoteke ni bilo mogoče preimenovati; poskusite z drugačnim novim imenom</string>
-  <string name="rename_server_fail_msg">Preimenovanja ni bilo možno dokončati</string>
-  <string name="create_dir_fail_msg">Mape ni bilo mogoče ustvariti</string>
-  <string name="wait_a_moment">Počakajte trenutek</string>
-  <string name="filedisplay_unexpected_bad_get_content">Prišlo je do nepričakovane napake. Prosimo, če poskusite datoteko izbrati z drugo aplikacijo.</string>
-  <string name="filedisplay_no_file_selected">Izbrana ni bila nobena datoteka</string>
+  <string name="confirmation_remove_folder_alert">Ali ste prepričani, da želite odstraniti %1$s in njeno vsebino?</string>
+  <string name="confirmation_remove_local">Samo krajevno</string>
+  <string name="confirmation_remove_folder_local">Samo lokalne vsebine</string>
+  <string name="confirmation_remove_remote">Odstrani s strežnika</string>
+  <string name="confirmation_remove_remote_and_local">Oddaljeno in krajevno</string>
+  <string name="remove_success_msg">Odstranitev je uspešno končana</string>
+  <string name="remove_fail_msg">Odstranjevanje ni dokončano</string>
+  <string name="rename_dialog_title">Vnesite novo ime</string>
+  <string name="rename_local_fail_msg">Krajevne datoteke ni mogoče preimenovati; poskusite z drugačnim novim imenom</string>
+  <string name="rename_server_fail_msg">Preimenovanja ni možno dokončati</string>
+  <string name="sync_file_fail_msg">Oddaljene datoteke ni bilo mogoče preveriti</string>
+  <string name="sync_file_nothing_to_do_msg">Vsebina datoteke je ažurna</string>
+  <string name="create_dir_fail_msg">Mape ni mogoče ustvariti</string>
+  <string name="wait_a_moment">Počakajte trenutek ...</string>
+  <string name="filedisplay_unexpected_bad_get_content">Prišlo je do nepričakovane napake. Poskusite datoteko izbrati z drugim programom.</string>
+  <string name="filedisplay_no_file_selected">Ni izbranih datotek</string>
+  <string name="ssl_validator_title">Opozorilo</string>
+  <string name="ssl_validator_header">Istovetnosti strani ni mogoče preveriti</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- potrdilo strežnika ni vredno zaupanja</string>
+  <string name="ssl_validator_reason_cert_expired">- potrdilo strežnika je poteklo</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- potrdilo strežnika je v uporabi</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- naslov URL ni skladen z imenom gostitelja potrdila</string>
+  <string name="ssl_validator_certificate_not_available">Potrdila strežnika ni mogoče pridobiti.</string>
+  <string name="ssl_validator_question">Ali vseeno želite zaupati potrdilu?</string>
+  <string name="ssl_validator_not_saved">Potrdila ni mogoče shraniti.</string>
+  <string name="ssl_validator_btn_details_see">Podrobnosti</string>
+  <string name="ssl_validator_btn_details_hide">Skrij</string>
+  <string name="ssl_validator_label_subject">Izdano za:</string>
+  <string name="ssl_validator_label_issuer">Izdajatelj:</string>
+  <string name="ssl_validator_label_CN">Splošno ime:</string>
+  <string name="ssl_validator_label_O">Organizacija:</string>
+  <string name="ssl_validator_label_OU">Organizacijska enota:</string>
+  <string name="ssl_validator_label_C">Država:</string>
+  <string name="ssl_validator_label_ST">Zvezna država:</string>
+  <string name="ssl_validator_label_L">Lokacija:</string>
+  <string name="ssl_validator_label_validity">Veljavnost:</string>
+  <string name="ssl_validator_label_validity_from">Od:</string>
+  <string name="ssl_validator_label_validity_to">Do:</string>
+  <string name="ssl_validator_label_signature">Podpis:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritem:</string>
+  <string name="text_placeholder">To je vsebnik predmetov.</string>
+  <string name="instant_upload_on_wifi">Pošiljaj slike le preko protokola Wi-Fi</string>
+  <string name="instant_upload_path">/NeposrednoNalaganje</string>
+  <string name="conflict_title">Posodobi konflikt</string>
+  <string name="conflict_message">Oddaljena datoteka %s ni usklajena z lokalno datoteko. Če nadaljujete, bo datoteka na strežniku zamenjana z vašo lokalno.</string>
+  <string name="conflict_keep_both">Ohrani obe</string>
+  <string name="conflict_overwrite">Prepiši</string>
+  <string name="conflict_dont_upload">Ne naloži</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-sq/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml
index c757504a..02e92c8d 100644
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@@ -1,2 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_files">Fajlovi</string>
+  <string name="main_music">Muzika</string>
+  <string name="main_settings">Podešavanja</string>
+  <string name="actionbar_upload">Pošalji</string>
+  <string name="actionbar_upload_files">Fajlovi</string>
+  <string name="actionbar_settings">Podešavanja</string>
+  <string name="auth_username">Korisničko ime</string>
+  <string name="auth_password">Lozinka</string>
+  <string name="sync_string_files">Fajlovi</string>
+  <string name="setup_hint_username">Korisničko ime</string>
+  <string name="setup_hint_password">Lozinka</string>
+  <string name="uploader_btn_upload_text">Pošalji</string>
+  <string name="filedetails_download">Preuzmi</string>
+  <string name="common_cancel">Otkaži</string>
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c757504a..a1efac3f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,2 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="main_login">Корисничко име:</string>
+  <string name="main_button_login">Пријава</string>
+  <string name="main_files">Фајлови</string>
+  <string name="main_music">Музика</string>
+  <string name="main_contacts">Контакти</string>
+  <string name="main_settings">Подешавања</string>
+  <string name="actionbar_upload">Пошаљи</string>
+  <string name="actionbar_upload_files">Фајлови</string>
+  <string name="actionbar_settings">Подешавања</string>
+  <string name="auth_username">Корисничко име</string>
+  <string name="auth_password">Лозинка</string>
+  <string name="sync_string_files">Фајлови</string>
+  <string name="setup_hint_username">Корисничко име</string>
+  <string name="setup_hint_password">Лозинка</string>
+  <string name="uploader_btn_upload_text">Пошаљи</string>
+  <string name="filedetails_download">Преузимање</string>
+  <string name="common_yes">Да</string>
+  <string name="common_cancel_upload">Прекини слање</string>
+  <string name="common_cancel">Откажи</string>
+  <string name="common_error">Грешка</string>
+  <string name="sync_string_contacts">Контакти</string>
+  <string name="common_share">Дељење</string>
+  <string name="common_rename">Преименуј</string>
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5ba49221..f1786dc1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Hallå världen, OwnCloudHuvudskärm!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Lösenord:</string>
   <string name="main_login">Användare:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">Inställningar</string>
   <string name="main_tit_accsetup">Skapa konto</string>
   <string name="main_wrn_accsetup">Det finns inget konto för ownCloud på denna enhet. För att kunna använda ownCloud så måste du skapa ett konto.</string>
+  <string name="about_message">ownCloud Android klient\n\nversion: %1$s</string>
   <string name="actionbar_sync">Uppdatera</string>
   <string name="actionbar_upload">Ladda upp</string>
   <string name="actionbar_upload_from_apps">Innehåll från andra program</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud har inte rättighet till det delade innehållet</string>
   <string name="uploader_info_uploading">Laddar upp</string>
   <string name="uploader_btn_create_dir_text">Skapa mapp för att ladda upp</string>
+  <string name="file_list_empty">Det finns inga filer i denna mapp.\nNya filer kan läggas till med \"Ladda upp\" i menyn.</string>
   <string name="filedetails_select_file">Peka på en fil för att visa mer information.</string>
   <string name="filedetails_size">Storlek:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Skapad:</string>
   <string name="filedetails_modified">Ändrad:</string>
   <string name="filedetails_download">Ladda ner</string>
+  <string name="filedetails_sync_file">Uppdatera</string>
   <string name="filedetails_redownload">Ladda ner igen</string>
   <string name="filedetails_open">Öppna</string>
+  <string name="filedetails_renamed_in_upload_msg">Filen bytte namn till %1$s under uppladdningen</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nej</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Avbryt nedladdning</string>
+  <string name="common_cancel_upload">Avbryt uppladdning</string>
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Spara &amp; Avsluta</string>
   <string name="common_exit">Lämna ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">Kontakter</string>
   <string name="sync_fail_ticker">Synkroniseringen misslyckades</string>
   <string name="sync_fail_content">Synkronisering av %1$s kunde inte slutföras</string>
+  <string name="sync_conflicts_in_favourites_ticker">Konflikter uppstod</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d Flaggad som HÃ¥ll-filen-uppdaterad kan inte synkas</string>
+  <string name="sync_fail_in_favourites_ticker">Filer flaggade som HÃ¥ll-filen-uppdaterad misslyckades</string>
+  <string name="sync_fail_in_favourites_content">Innehållet i %1$d filer kunde inte synkas (%2$d konflikter)</string>
   <string name="use_ssl">Använd säker anslutning</string>
   <string name="location_no_provider">ownCloud  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
   <string name="pincode_enter_pin_code">Ange din PIN</string>
   <string name="pincode_enter_new_pin_code">Ange din nya PIN</string>
   <string name="pincode_configure_your_pin">Ange ownCloud PIN</string>
+  <string name="pincode_configure_your_pin_explanation">Din PIN måste anges varje gång du startar programmet.</string>
   <string name="pincode_reenter_your_pincode">Ange ownCloud PIN igen</string>
   <string name="pincode_remove_your_pincode">Radera ownCloud PIN</string>
   <string name="pincode_mismatch">Båda ownCloud PIN är inte lika</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">Kunde inte etablera anslutning</string>
   <string name="auth_secure_connection">Säker anslutning etablerad</string>
   <string name="auth_login_details">Inloggningsuppgifter</string>
+  <string name="auth_unauthorized">Felaktigt användarnamn / lösenord</string>
+  <string name="auth_not_found">Felaktig  sökväg angavs</string>
+  <string name="auth_internal">Internt serverfel, kod %1$d</string>
   <string name="crashlog_message">Applikationen avslutades oväntat. Vill du skicka en felrapport?</string>
   <string name="crashlog_send_report">Skicka rapport</string>
   <string name="crashlog_dont_send_report">Skicka inte rapport</string>
@@ -155,13 +168,18 @@
   <string name="common_rename">Byt namn</string>
   <string name="common_remove">Radera</string>
   <string name="confirmation_remove_alert">Vill du verkligen radera: %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Vill du verkligen radera %1$s och dess innehåll?</string>
   <string name="confirmation_remove_local">Endast lokalt</string>
+  <string name="confirmation_remove_folder_local">Endast lokalt innehåll</string>
   <string name="confirmation_remove_remote">Radera från server</string>
   <string name="confirmation_remove_remote_and_local">BÃ¥de server och lokalt</string>
   <string name="remove_success_msg">Lyckad radering</string>
   <string name="remove_fail_msg">Radering kunde inte slutföras</string>
+  <string name="rename_dialog_title">Ange ett nytt namn</string>
   <string name="rename_local_fail_msg">Den lokala kopian kunde inte döpas om, prova med ett annat namn</string>
   <string name="rename_server_fail_msg">Namnbyte kunde inte slutföras</string>
+  <string name="sync_file_fail_msg">Fjärrfilen kunde inte kontrolleras</string>
+  <string name="sync_file_nothing_to_do_msg">Filinnehåll redan synkroniserat</string>
   <string name="create_dir_fail_msg">Mapp kunde inte skapas</string>
   <string name="wait_a_moment">Var god vänta</string>
   <string name="filedisplay_unexpected_bad_get_content">Oväntat problem; prova annat program för aktuell fil</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Servercertifikatet kunde inte hämtas</string>
   <string name="ssl_validator_question">Vill du lita på detta certifikat ändå?</string>
   <string name="ssl_validator_not_saved">Certifikatet kunde inte sparas</string>
+  <string name="ssl_validator_btn_details_see">Detaljer</string>
+  <string name="ssl_validator_btn_details_hide">Göm</string>
+  <string name="ssl_validator_label_subject">Utfärdat till:</string>
+  <string name="ssl_validator_label_issuer">Utfärdat av:</string>
+  <string name="ssl_validator_label_CN">Common name (CN):</string>
+  <string name="ssl_validator_label_O">Organisation (O):</string>
+  <string name="ssl_validator_label_OU">Organisationsenhet (OU):</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_ST">Stat:</string>
+  <string name="ssl_validator_label_L">Ort:</string>
+  <string name="ssl_validator_label_validity">Giltighet:</string>
+  <string name="ssl_validator_label_validity_from">Från:</string>
+  <string name="ssl_validator_label_validity_to">Till:</string>
+  <string name="ssl_validator_label_signature">Signatur:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritm:</string>
   <string name="text_placeholder">Detta är en platshållare</string>
   <string name="instant_upload_on_wifi">Ladda upp bilder endast via WiFi</string>
+  <string name="instant_upload_path">/DirektUppladdning</string>
+  <string name="conflict_title">Uppdatera konflikt</string>
+  <string name="conflict_message">Serverns fil %s är inte synkroniserad med den lokala filen. Fortsätt för att skriva över filen på servern.</string>
+  <string name="conflict_keep_both">Behåll båda</string>
+  <string name="conflict_overwrite">Skriv över</string>
+  <string name="conflict_dont_upload">Ladda inte upp</string>
 </resources>
diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml
index c757504a..c032781b 100644
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@@ -1,2 +1,213 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="app_name">OwnCloud</string>
+  <string name="main_password">கடவுச்சொல்:</string>
+  <string name="main_login">பயனாளர் பெயர்</string>
+  <string name="main_button_login">புகுபதிகை</string>
+  <string name="main_welcome">உங்களுடைய ownCloud இற்கு வரவேற்கின்றோம்</string>
+  <string name="main_files">கோப்புகள்</string>
+  <string name="main_music">இசை</string>
+  <string name="main_contacts">தொடர்புகள்</string>
+  <string name="main_calendar">நாட்காட்டி</string>
+  <string name="main_bookmarks">பக்க அடையாளங்கள்</string>
+  <string name="main_settings">அமைப்புகள்</string>
+  <string name="main_tit_accsetup">கணக்கு அமைப்பு</string>
+  <string name="main_wrn_accsetup">உங்களுடைய சாதனத்தில் ownCloud கணக்குகள் இல்லை. இந்த செயலிகளை பயன்படுத்துவதற்கு நீங்கள் கணக்கொன்றை உருவாக்க வேண்டும்.</string>
+  <string name="about_message">ownCloud Android சேவைப் பயனர்⏎ ⏎ பதிப்பு: %1$s</string>
+  <string name="actionbar_sync">மீள் ஏற்றுக</string>
+  <string name="actionbar_upload">பதிவேற்றுக</string>
+  <string name="actionbar_upload_from_apps">மற்ற செயலிகளிலிருந்து உள்ளடக்கம்</string>
+  <string name="actionbar_upload_files">கோப்புகள்</string>
+  <string name="actionbar_mkdir">அடைவை உருவாக்குக</string>
+  <string name="actionbar_search">தேடுதல்</string>
+  <string name="actionbar_settings">அமைப்புகள்</string>
+  <string name="prefs_category_general">பொதுவான</string>
+  <string name="prefs_category_trackmydevice">சாதனம் கண்காணிப்பு</string>
+  <string name="prefs_add_session">புதிய அமர்வை சேர்க்க</string>
+  <string name="prefs_create_img_thumbnails">படத்தின் சிறிய வடிவத்தை உருவாக்கு</string>
+  <string name="prefs_select_oc_account">கணக்கொன்றை தெரிவுசெய்க</string>
+  <string name="prefs_summary_select_oc_account">உங்களுடைய எந்த கணக்கு செயலியை பயன்படுத்தும் என்பதை தெரிவுசெய்க</string>
+  <string name="prefs_trackmydevice">சாதனம் கண்காணிப்பு</string>
+  <string name="prefs_trackmydevice_summary_off">உங்களுடைய சாதனத்தின் இருப்பிடத்தை அறிவதற்கு ownCloud ஐ இயலுமைப்படுத்துக</string>
+  <string name="prefs_trackmydevice_summary_on">உங்களுடைய ownCloud ஆனது  இந்த சாதனத்தின் கண்காணிப்புகளை வைத்துக்கொள்ளும்,</string>
+  <string name="prefs_trackmydevice_interval">இடைவேலையை இற்றைப்படுத்துக</string>
+  <string name="prefs_trackmydevice_interval_summary">ஒவ்வொரு %1$s நிமிடங்களையும் இற்றைப்படுத்துக</string>
+  <string name="prefs_accounts">கணக்குகள்</string>
+  <string name="prefs_manage_accounts">கணக்குகளை நிர்வகிக்க</string>
+  <string name="prefs_pincode">ownCloud App PIN</string>
+  <string name="prefs_pincode_summary">உங்களுடைய ownCloud சேவைப் பயனரை பாதுகாக்க</string>
+  <string name="prefs_instant_upload">உடனடி பதிவேற்றலை இயலுமைப்படுத்துக</string>
+  <string name="prefs_instant_upload_summary">கமராவினால் எடுக்கப்பட்ட படங்கள் உடனடியாக பதிவேற்றப்பட்டன</string>
+  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_username">பயனாளர் பெயர்</string>
+  <string name="auth_password">கடவுச்சொல்</string>
+  <string name="auth_register">ownCloud இற்கு நான் புதிது</string>
+  <string name="new_session_uri_error">பிழையான URL தரப்பட்டுள்ளது</string>
+  <string name="new_session_session_name_error">பிழையான அமர்வு பெயர்</string>
+  <string name="sync_string_files">கோப்புகள்</string>
+  <string name="uploader_no_file_selected">பதிவேற்றுவதற்கு கோப்புகள் தெரிவுசெய்யப்படவில்லை</string>
+  <string name="setup_hint_username">பயனாளர் பெயர்</string>
+  <string name="setup_hint_password">கடவுச்சொல்</string>
+  <string name="setup_hint_address">வலைய முகவரி</string>
+  <string name="setup_hint_show_password">கடவுச்சொல்லை தெரியப்படுத்தவா?</string>
+  <string name="setup_title">உங்களுடைய ownCloud இற்கு இணைக்க</string>
+  <string name="setup_btn_connect">இணைக்க</string>
+  <string name="uploader_btn_upload_text">பதிவேற்றுக</string>
+  <string name="uploader_wrn_no_account_title">ஒரு கணக்கும் அறியப்படவில்லை</string>
+  <string name="uploader_wrn_no_account_text">உங்களுடைய சாதனத்தில் ownCloud கணக்குகள் இல்லை. தயவுசெய்து முதலில் ஒரு கணக்கை அமைக்கவும்</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">அமைப்பு</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">விலகுக</string>
+  <string name="uploader_wrn_no_content_title">பதிவேற்றுவதற்கு உள்ளடக்கங்கள் இல்லை</string>
+  <string name="uploader_wrn_no_content_text">ஒரு உள்ளடக்கமும் பெறப்படவில்லை. பதிவேற்றுவதற்கு ஒன்றும் இல்லை</string>
+  <string name="uploader_error_forbidden_content">பகிரப்பட்ட உள்ளடக்ககங்களை அணுகுவதற்கு ownCloud  அனுமதிக்கமாட்டாது</string>
+  <string name="uploader_info_uploading">பதிவேற்றல்</string>
+  <string name="uploader_btn_create_dir_text">பதிவேற்றுவதற்கு அடைவை உருவாக்குக</string>
+  <string name="file_list_empty">இந்த கோப்புறையில் எந்த கோப்பும் இல்லை. \"பதிவேற்றல்\" பட்டி தெரிவு மூலம் புதிய கோப்புகளை பதிவேற்றமுடியும்.</string>
+  <string name="filedetails_select_file">மேலதிக தகவல்களை காட்சிப்படுத்துவதற்கு கோப்பின் மேல் தட்டுக.</string>
+  <string name="filedetails_size">அளவு:</string>
+  <string name="filedetails_type">வகை:</string>
+  <string name="filedetails_created">உருவாக்கப்பட்டது:</string>
+  <string name="filedetails_modified">மாற்றப்பட்டது:</string>
+  <string name="filedetails_download">பதிவிறக்குக</string>
+  <string name="filedetails_sync_file">மீள் ஏற்றுக</string>
+  <string name="filedetails_redownload">மீள் ஏற்றுக</string>
+  <string name="filedetails_open">திறக்க</string>
+  <string name="filedetails_renamed_in_upload_msg">பதிவேற்றும்போது கோப்பின் பெயரானது %1$s ஆக பெயர்மாற்றப்பட்டது</string>
+  <string name="common_yes">ஆம்</string>
+  <string name="common_no">இல்லை</string>
+  <string name="common_ok">சரி </string>
+  <string name="common_cancel_download">பதிவிறக்கலை இரத்துசெய்க</string>
+  <string name="common_cancel_upload">பதிவேற்றலை இரத்து செய்க</string>
+  <string name="common_cancel">இரத்து செய்க</string>
+  <string name="common_save_exit">சேமிக்க மற்றும் amp; வெளியேறு</string>
+  <string name="common_exit">ownCloud  இலிருந்து விலகு</string>
+  <string name="common_error">வழு</string>
+  <string name="about_title">பற்றி</string>
+  <string name="delete_account">கணக்கை நீக்குக</string>
+  <string name="create_account">கணக்கை உருவாக்குக</string>
+  <string name="upload_chooser_title">பதிவேற்றல் படிவம்</string>
+  <string name="uploader_info_dirname">அடைவு பெயர்</string>
+  <string name="uploader_upload_in_progress_ticker">பதிவேற்றல்...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% பதிவேற்றல்g %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">வெற்றிகரமாக பதிவேற்றப்பட்டது</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s வெற்றிகரமாக பதிவேற்றப்பட்டது</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d கோப்புகள் வெற்றிகரமாக பதிவேற்றப்பட்டது</string>
+  <string name="uploader_upload_failed_ticker">பதிவேற்றல் தோல்வியுற்றது</string>
+  <string name="uploader_upload_failed_content_single">பதிவேற்றலின் %1$s தை முடிக்கமுடியவில்லை</string>
+  <string name="uploader_upload_failed_content_multiple">பதிவேற்றல் தோல்வியுற்றது : %1$d/%2$d கோப்புகள் பதிவேற்றப்பட்டது</string>
+  <string name="downloader_download_in_progress_ticker">பதிவிறக்கப்படுகிறது....</string>
+  <string name="downloader_download_in_progress_content">%1$d%% பதிவிறக்கல் %2$s</string>
+  <string name="downloader_download_succeeded_ticker">வெற்றிகரமான பதிவிறக்கல் </string>
+  <string name="downloader_download_succeeded_content">%1$s  வெற்றிகரமாக பதிவிறக்கப்பட்டது</string>
+  <string name="downloader_download_failed_ticker">பதிவிறக்கல் தோல்வியுற்றது</string>
+  <string name="downloader_download_failed_content">பதிவிறக்கலின் %1$s தை முடிக்கவில்லை</string>
+  <string name="common_choose_account">கணக்கை தெரிவுசெய்க</string>
+  <string name="sync_string_contacts">தொடர்புகள்</string>
+  <string name="sync_fail_ticker">ஒத்திசைவாக்கல் தோல்வியுற்றது</string>
+  <string name="sync_fail_content">ஒத்திசைவாக்கலின் %1$s ஆனதை முடிக்கமுடியவில்லை</string>
+  <string name="sync_conflicts_in_favourites_ticker">முரன்பாடுகள் கண்டுப்பிடிக்கப்பட்டன</string>
+  <string name="sync_fail_in_favourites_content">கோப்புகள் %1$d இலுள்ள உள்ளடக்கங்களை ஒத்திசைவாக்கமுடியாது (%2$d முரன்பாடுகள்) </string>
+  <string name="use_ssl">பாதுகாப்பான இணைப்பை பயன்படுத்துக</string>
+  <string name="location_no_provider">ownCloud  இனால் உங்களுடைய சாதனத்தை கண்காணிக்க முடியவில்லை. தயவுசெய்து உங்களுடைய இருப்பிட அமைப்புக்களை சரிபார்க்கவும்</string>
+  <string name="pincode_enter_pin_code">தயவுசெய்து உங்களுடைய App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_enter_new_pin_code">தயவுசெய்து உங்களுடைய புதிய App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_configure_your_pin">ownCloud இன் App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_configure_your_pin_explanation">செயலி தொடங்கும் ஒவ்வொரு நேரமும் PIN கேட்கப்படுகின்றது.</string>
+  <string name="pincode_reenter_your_pincode">தயவுசெய்து மீண்டும் ownCloud App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_remove_your_pincode">உங்களுடைய ownCloud App PIN ஐ அகற்றுக</string>
+  <string name="pincode_mismatch">இரண்டு ownCloud App PIN களும் ஒன்றே அல்ல</string>
+  <string name="pincode_wrong">தவறான ownCloud App PIN </string>
+  <string name="pincode_removed">ownCloud App PIN அகற்றப்பட்டது</string>
+  <string name="pincode_stored">ownCloud App PIN சேமிக்கப்பட்டது</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 நிமிடங்கள்</item>
+    <item>30நிமிடங்கள்</item>
+    <item>60 நிமிடங்கள்</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">புகுபதிகைக்கு முயற்சிக்கின்றது...</string>
+  <string name="auth_no_net_conn_title">வ​லைய​மைப்பு இணைப்பு இல்லை</string>
+  <string name="auth_no_net_conn_message">எந்தவொரு வலையமைப்பு இணைப்பும் கண்டுப்பிடிக்கப்படவில்லை, இணைய இணைப்பை சரிபார்த்துவிட்டு மீண்டும் முயற்சிக்கவும். </string>
+  <string name="auth_connect_anyway">எப்படியாவது இணைக்க</string>
+  <string name="auth_nossl_plain_ok_title">பாதுகாப்பான இணைப்பு காணப்படவில்லை.</string>
+  <string name="auth_nossl_plain_ok_message">செயலியினால் சேவையகத்துடன் பாதுகாப்பான இணைப்பை ஏற்படுத்த முடியவில்லை.  பாதுகாப்பற்ற இணைப்புகளும் காணப்படுகின்றன. நீங்கள் தொடரலாம் அல்லது இரத்துசெய்யலாம்.</string>
+  <string name="auth_connection_established">இணைப்பு நிறுவப்பட்டது</string>
+  <string name="auth_testing_connection">இணைப்பு சோதிக்கப்படுகிறது.....</string>
+  <string name="auth_not_configured_title">பிறழ்வான ownCloud தகவமைப்பு</string>
+  <string name="auth_not_configured_message">உங்களுடைய ownCloud சரியாக தகவமைக்கப்படாததாக தெரிகிறது. மேலதிக தகவல்களுக்கு நிர்வாகியை தொடர்புகொள்ளவும்</string>
+  <string name="auth_unknown_error_title">அறியப்படாத வழு ஏற்பட்டுள்ளது!</string>
+  <string name="auth_unknown_error_message">அறியப்படாத வழு ஏற்பட்டுள்ளது. தயவுசெய்து உங்களுடைய சாதனத்தினூடாக ஆசிரியரையும் சேர்க்கப்பட்டுள்ள பதிகையையும் தொடர்புகொள்க.</string>
+  <string name="auth_unknown_host_title">ஓம்புனரை கண்டுப்பிடிக்கமுடியவில்லை</string>
+  <string name="auth_unknown_host_message">நுழைக்கப்பட்ட ஓம்புனரை கண்டுப்பிடிக்கமுடியவில்லை. தயவுசெய்து ஓம்புனர் பெயரையும் சேவையகத்தின் வழங்குதலையும் சரிப்பார்த்து மீண்டும் முயற்சிக்கவும்.</string>
+  <string name="auth_incorrect_path_title">ownCloud  காணப்படவில்லை</string>
+  <string name="auth_incorrect_path_message">தரப்பட்ட பாதையினூடாக செயலியினால் ownClound ஐ கண்டுப்பிடிக்க முடியவில்லை. தயவுசெய்து உங்களுடைய பாதையை சரிபார்த்து மீண்டும் முயற்சிக்கவும்.</string>
+  <string name="auth_timeout_title">இந்த சேவையகம் பதில் கொடுப்பதற்கு நீண்ட நேரம் எடுக்கின்றது</string>
+  <string name="auth_incorrect_address_title">பிறழ்வான URL</string>
+  <string name="auth_ssl_general_error_title">SSL இன் தொடக்கநிலை தோல்வியுற்றது</string>
+  <string name="auth_ssl_unverified_server_title">உறுதிப்படுத்தப்படாத SSL சேவையகத்தின் அடையாளம்</string>
+  <string name="auth_bad_oc_version_title">அங்கீகரிக்கப்படாத ownCloud சேவையகம் பதிப்பு</string>
+  <string name="auth_wrong_connection_title">இணைப்பை நிறுவமுடியாது</string>
+  <string name="auth_secure_connection">பாதுகாப்பான இணைப்பு உருவாக்கப்பட்டது.</string>
+  <string name="auth_login_details">புகுபதிகை விவரங்கள்</string>
+  <string name="crashlog_message">செயலி எதிர்பாராமல் முடிவுற்றது. உங்களுக்கு முறிவு அறிக்கை ஒன்றை சமர்ப்பிப்பதற்கு விருப்பம்மா?</string>
+  <string name="crashlog_send_report">அறிக்கையை அனுப்பவும்</string>
+  <string name="crashlog_dont_send_report">அறிக்கையை அனுப்பவேண்டாம்</string>
+  <string name="extensions_avail_title">நீட்சிகள் காணப்படுகின்றன!</string>
+  <string name="extensions_avail_message">உங்களுடைய ownCloud  முன்னேற்றமான நீட்சிக்கு ஆதரவளிப்பதாக தெரிகிறது. android க்கு நீட்சிகள் இருக்கின்றனவா என அறிய ஆவலா?</string>
+  <string name="fd_keep_in_sync">நவீன கோப்பை வைத்திருக்கவும்</string>
+  <string name="common_share">பகிர்வு</string>
+  <string name="common_rename">பெயர்மாற்றம்</string>
+  <string name="common_remove">அகற்றுக</string>
+  <string name="confirmation_remove_alert">உங்களுக்கு உண்மையாக %1$s ஐ அகற்றவேண்டுமா?</string>
+  <string name="confirmation_remove_folder_alert">உங்களுக்கு%1$s ஐயும் அதன் உள்ளடக்கங்களையும் அகற்ற வேண்டுமா?</string>
+  <string name="confirmation_remove_local">உள்ளூர் மட்டும்</string>
+  <string name="confirmation_remove_folder_local">இடத்துரி உள்ளடக்கங்கள் மட்டும்</string>
+  <string name="confirmation_remove_remote">சேவையகத்திலிருந்து அகற்றுக</string>
+  <string name="confirmation_remove_remote_and_local">தொலைவு மற்றும் உள்ளூர்</string>
+  <string name="remove_success_msg">வெற்றிகரமாக அகற்றப்பட்டது</string>
+  <string name="remove_fail_msg">நீக்கலை நிறைவு செய்ய முடியவில்லை</string>
+  <string name="rename_dialog_title">புதிய பெயரொன்றை நுழைக்க</string>
+  <string name="rename_local_fail_msg">சாதாரண நகல்களின் பெயரை மாற்றமுடியாது ; ஒரு வேறுப்பட்ட பெயரை முயற்சிக்கவும்</string>
+  <string name="rename_server_fail_msg">பெயர்மாற்றத்தை முற்றாக முடிக்கமுடியவில்லை</string>
+  <string name="sync_file_fail_msg">தொலை கோப்பை சரிபார்க்கமுடியவில்லை</string>
+  <string name="sync_file_nothing_to_do_msg">கோப்பு உள்ளடக்கங்கள் ஏற்கவே ஒத்திசைக்கப்படுள்ளன</string>
+  <string name="create_dir_fail_msg">அடைவுகளை உருவாக்க முடியவில்லை</string>
+  <string name="wait_a_moment">சிறிது நேரம் காத்திருங்கள்</string>
+  <string name="filedisplay_unexpected_bad_get_content">எதிர்பாராத பிரச்சினை ; தயவுசெய்து கோப்பை தெரிவுசெய்ய மற்ற செயலியை பயன்படுத்தவும்</string>
+  <string name="filedisplay_no_file_selected">ஒரு கோப்பும் தெரிவுசெய்யப்படவில்லை</string>
+  <string name="ssl_validator_title">எச்சரிக்கை</string>
+  <string name="ssl_validator_header">தளத்தின் அடையாளத்தை உறுதிப்படுத்தமுடியவில்லை</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- சேவையகத்தின் சான்றிதழ் நம்ப தகுந்ததாக இல்லை</string>
+  <string name="ssl_validator_reason_cert_expired">- சேவையகத்தின் சான்றிதழ் காலாவதியாகிவிட்டது</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- சேவையகத்தின் சான்றிதழ் மிகவும் இளமையானது</string>
+  <string name="ssl_validator_reason_hostname_not_verified">சான்றிதழில் உள்ள ஓம்புனரின் பெயர் URL உடன் ஒத்திருக்கவில்லை</string>
+  <string name="ssl_validator_certificate_not_available">சேவையக சான்றிதழை பெற முடியவில்லை</string>
+  <string name="ssl_validator_question">இந்த சான்றிதழை நம்புகிறீர்களா?</string>
+  <string name="ssl_validator_not_saved">சான்றிதழை சேமிக்க முடியவில்லை</string>
+  <string name="ssl_validator_btn_details_see">விவரங்கள்</string>
+  <string name="ssl_validator_btn_details_hide">மறைக்க</string>
+  <string name="ssl_validator_label_subject">வழங்கப்பட்டது:</string>
+  <string name="ssl_validator_label_issuer">ஆல் வழங்கப்பட்டது:</string>
+  <string name="ssl_validator_label_CN">பொதுவான பெயர்:</string>
+  <string name="ssl_validator_label_O">நிறுவனம்:</string>
+  <string name="ssl_validator_label_OU">நிறுவன அலகு:</string>
+  <string name="ssl_validator_label_C">நாடு:</string>
+  <string name="ssl_validator_label_ST">மாநிலம்:</string>
+  <string name="ssl_validator_label_L">இடம்:</string>
+  <string name="ssl_validator_label_validity">செல்லுபடி:</string>
+  <string name="ssl_validator_label_validity_from">இருந்து</string>
+  <string name="ssl_validator_label_validity_to">இற்கு</string>
+  <string name="ssl_validator_label_signature">கையொப்பம்:</string>
+  <string name="ssl_validator_label_signature_algorithm">நெறிமுறை</string>
+  <string name="text_placeholder">இது ஒரு placeholder</string>
+  <string name="instant_upload_on_wifi">WiFi ஊடாக மட்டும் படங்களை பதிவேற்றுக</string>
+  <string name="conflict_title">இற்றைப்படுத்தலில் முரண்பாடு</string>
+  <string name="conflict_message">இடத்துரி கோப்புடன் தொலைவு கோப்பு %s ஒத்திசைவாக்கப்படவில்லை. தொடர்ந்து மேற்கொண்டால் சேவையகத்தில் உள்ள கோப்பின் உள்ளடக்கம் மாற்றப்படும்.</string>
+  <string name="conflict_keep_both">இரண்டையும் வைக்க </string>
+  <string name="conflict_overwrite">மேலெழுதல்</string>
+  <string name="conflict_dont_upload">பதிவேற்ற வேண்டாம்</string>
+</resources>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 9c3f73e7..15e88100 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">สวัสดีชาวโลก, หน้าจอต้อนรับหลัก OwnCloud</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">รหัสผ่าน:</string>
   <string name="main_login">ชื่อผู้ใช้:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">ตั้งค่า</string>
   <string name="main_tit_accsetup">ตั้งค่าบัญชี</string>
   <string name="main_wrn_accsetup">ไม่มีบัญชี ownCloud ของคุณอยู่บนอุปกรณ์ของคุณ หากต้องการใช้งานแอปตัวนี้ คุณจำเป็นต้องสร้างบัญชีใหม่</string>
+  <string name="about_message">โปรแกรมไคลเอนต์ ownCloud สำหรับใช้งานกับแอนดรอยด์\n\nรุ่น: %1$s</string>
   <string name="actionbar_sync">รีเฟรช</string>
   <string name="actionbar_upload">อัพโหลดไฟล์</string>
   <string name="actionbar_upload_from_apps">เนื้อหาจากแอปฯอื่นๆ</string>
@@ -62,17 +62,20 @@
   <string name="uploader_error_forbidden_content">ownCloud ไม่อนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้</string>
   <string name="uploader_info_uploading">กำลังอัพโหลด</string>
   <string name="uploader_btn_create_dir_text">สร้างไดเร็กทอรี่สำหรับอัพโหลด</string>
+  <string name="file_list_empty">ยังไม่มีไฟล์อยู่ในโฟลเดอร์นี้.\nสามารถเพิ่มไฟล์ใหม่ได้จากตัวเลือกในเมนู \"อัพโหลด\".</string>
   <string name="filedetails_select_file">แตะที่ไฟล์ เพื่อแสดงข้อมูลเพิ่มเติม</string>
   <string name="filedetails_size">ขนาด:</string>
   <string name="filedetails_type">ชนิด:</string>
   <string name="filedetails_created">สร้างเมื่อ:</string>
   <string name="filedetails_modified">แก้ไขเมื่อ:</string>
   <string name="filedetails_download">ดาวน์โหลด</string>
+  <string name="filedetails_sync_file">รีเฟรช</string>
   <string name="filedetails_redownload">ดาวน์โหลดใหม่อีกครั้ง</string>
   <string name="filedetails_open">เปิด</string>
   <string name="common_yes">ตกลง</string>
   <string name="common_no">ไม่ตกลง</string>
   <string name="common_ok">ตกลง</string>
+  <string name="common_cancel_upload">ยกเลิกการอัพโหลด</string>
   <string name="common_cancel">ยกเลิก</string>
   <string name="common_save_exit">บันทึก &amp; ออก</string>
   <string name="common_exit">ออกจาก ownCloud</string>
@@ -105,6 +108,7 @@
   <string name="pincode_enter_pin_code">กรุณาใส่ PIN แอปของคุณ</string>
   <string name="pincode_enter_new_pin_code">กรุณาใส่รหัส PIN แอปตัวใหม่ของคุณ</string>
   <string name="pincode_configure_your_pin">กรอกรหัส PIN ของ ownCloud App</string>
+  <string name="pincode_configure_your_pin_explanation">หมายเลข PIN ดังกล่าวจะถูกร้องขอทุกครั้งที่เริ่มใช้งานแอปฯ</string>
   <string name="pincode_reenter_your_pincode">กรุณากรอกรหัส PIN ของแอป ownCloud ใหม่อีกครั้ง</string>
   <string name="pincode_remove_your_pincode">ลบรหัส PIN แอป ของ ownCloud ของคุณ</string>
   <string name="pincode_mismatch">รหัส ownCloud App API ไม่ตรงกัน</string>
@@ -175,6 +179,26 @@
   <string name="ssl_validator_certificate_not_available">ไม่สามารถขอรับใบรับรองความปลอดภัยของเซิร์ฟเวอร์ได้</string>
   <string name="ssl_validator_question">คุณต้องการให้ความไว้วางใจในใบรับรองความปลอดภัยนี้หรือไม่?</string>
   <string name="ssl_validator_not_saved">ไม่สามารถบันทึกใบรับรองความปลอดภัยได้</string>
+  <string name="ssl_validator_btn_details_see">รายละเอียด</string>
+  <string name="ssl_validator_btn_details_hide">ซ๋อน</string>
+  <string name="ssl_validator_label_subject">ออกถึง:</string>
+  <string name="ssl_validator_label_issuer">ออกโดย:</string>
+  <string name="ssl_validator_label_CN">ชื่อสามัญ:</string>
+  <string name="ssl_validator_label_O">องค์กร:</string>
+  <string name="ssl_validator_label_OU">หน่วยงาน:</string>
+  <string name="ssl_validator_label_C">ประเทศ:</string>
+  <string name="ssl_validator_label_ST">รัฐ:</string>
+  <string name="ssl_validator_label_L">สถานที่ตั้ง:</string>
+  <string name="ssl_validator_label_validity">ตั้งแต่วันที่:</string>
+  <string name="ssl_validator_label_validity_from">จาก:</string>
+  <string name="ssl_validator_label_validity_to">ถึง:</string>
+  <string name="ssl_validator_label_signature">ลายเซ็นต์:</string>
+  <string name="ssl_validator_label_signature_algorithm">อัลกอริทึ่ม:</string>
   <string name="text_placeholder">นี่เป็นตัวยึด</string>
   <string name="instant_upload_on_wifi">อัพโหลดรูปภาพผ่านทาง WiFi เท่านั้น</string>
+  <string name="conflict_title">ปรับปรุงปัญหาความขัดแย้ง</string>
+  <string name="conflict_message">ไฟล์ระยะไกล %s ยังไม่ได้ถูกผสานข้อมูลกับไฟล์ในเครื่อง การดำเนินการต่อไปจะเป็นการแทนที่เนื้อหาของไฟล์ที่อยู่บนเซิร์ฟเวอร์</string>
+  <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
+  <string name="conflict_overwrite">เขียนทับ</string>
+  <string name="conflict_dont_upload">ไม่ต้องอัพโหลด</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b35de2d8..905a8ae0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Merhaba Dünya, OwnCloudAnaEkran!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Şifre:</string>
   <string name="main_login">Kullanıcı Adı:</string>
@@ -34,6 +33,7 @@
   <string name="prefs_accounts">Hesaplar</string>
   <string name="prefs_manage_accounts">Hesapları yönet</string>
   <string name="prefs_pincode">ownCloud App PIN</string>
+  <string name="prefs_pincode_summary">Ä°stemcinizi koruyun</string>
   <string name="prefs_instant_upload">Anında yükleme etkinleştir</string>
   <string name="prefs_instant_upload_summary">Anında çekilen fotoğrafları yükle</string>
   <string name="auth_host_url">ownCloud URL</string>
@@ -65,11 +65,14 @@
   <string name="filedetails_created">Yaratma:</string>
   <string name="filedetails_modified">Değiştirme:</string>
   <string name="filedetails_download">Ä°ndir</string>
+  <string name="filedetails_sync_file">Tazele</string>
   <string name="filedetails_redownload">Tekrar indir</string>
   <string name="filedetails_open">Aç</string>
   <string name="common_yes">Evet</string>
   <string name="common_no">Hayır</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Ä°ndirmeyi iptal et</string>
+  <string name="common_cancel_upload">Yüklemeyi iptal et</string>
   <string name="common_cancel">Ä°ptal</string>
   <string name="common_save_exit">Kaydet %amp; Kapat</string>
   <string name="common_exit">Çıkış</string>
@@ -96,6 +99,7 @@
   <string name="common_choose_account">Hesap seçiniz</string>
   <string name="sync_string_contacts">Kontaklar</string>
   <string name="sync_fail_ticker">Eşitleme başarısız</string>
+  <string name="sync_conflicts_in_favourites_ticker">Çakışma bulundu</string>
   <string name="use_ssl">Güvenli bağlanti kullan</string>
   <string name="location_no_provider">ownCloud cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
   <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
@@ -133,6 +137,7 @@
   <string name="auth_unknown_host_message">Girilen anabilgisayar bulunamadı. Anabilgisayaradı ve sunucu kullanılabilirliğini kontrol edin ve yeniden deneyin.</string>
   <string name="auth_incorrect_path_title">ownCloud servisi bulunamadı.</string>
   <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda ownCloud bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
+  <string name="auth_timeout_title">Sunucu çok geç cevap veriyor</string>
   <string name="auth_incorrect_address_title">Hatalı biçimlendirilmiş URL</string>
   <string name="auth_ssl_general_error_title">SSL başlatılmasında hata</string>
   <string name="auth_ssl_unverified_server_title">Doğrulanmamış SSL sunucu kimliğini</string>
@@ -140,6 +145,7 @@
   <string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
   <string name="auth_secure_connection">Güvenli bağlantı sağlandı.</string>
   <string name="auth_login_details">Giriş detayları</string>
+  <string name="auth_unauthorized">Geçersiz kullanıcı adı/parola</string>
   <string name="crashlog_message">Uygulama umulmadık bir şekilde sonlandı. Hata raporunu göndermek ister misiniz ?</string>
   <string name="crashlog_send_report">Rapor gönder</string>
   <string name="crashlog_dont_send_report">Rapor gönderme</string>
@@ -150,15 +156,41 @@
   <string name="common_rename">İsim değiştir.</string>
   <string name="common_remove">Kaldır</string>
   <string name="confirmation_remove_alert"> %1$s ları gerçekten kaldırmak istiyor musunuz ?</string>
+  <string name="confirmation_remove_folder_alert">Gerçekten %1s ve içeriğini silmek istediğinizden emin misiniz?</string>
   <string name="confirmation_remove_local">Sadece yerel</string>
+  <string name="confirmation_remove_folder_local">Sadece yerel içerik</string>
   <string name="confirmation_remove_remote">Sunucudan kaldır</string>
   <string name="confirmation_remove_remote_and_local">Uzaktaki ve yereldeki</string>
   <string name="remove_success_msg">Kaldırma başarılı</string>
   <string name="remove_fail_msg">Kaldırma tamamlanamıyor</string>
+  <string name="rename_dialog_title">Yeni bir isim girin</string>
   <string name="rename_local_fail_msg">Yerel kopya adlandırılamaz; farklı bir ad deneyin</string>
   <string name="rename_server_fail_msg">Yeniden  adlandırılma tamamlanmadı</string>
   <string name="create_dir_fail_msg">Dizin oluşturulamadı</string>
   <string name="wait_a_moment">Bir süre bekleyin</string>
   <string name="filedisplay_unexpected_bad_get_content">Beklenmeyen problem ; lütfen, dosya seçmek için diğer uygulamayı deneyin</string>
   <string name="filedisplay_no_file_selected">Hiçbir dosya seçilmedi</string>
+  <string name="ssl_validator_title">Uyarı</string>
+  <string name="ssl_validator_reason_cert_expired">- Sunucu sertifikasının süresi geçmiş</string>
+  <string name="ssl_validator_certificate_not_available">Sunucu sertifikası elde edilemedi</string>
+  <string name="ssl_validator_question">Sertifikaya yine de güvenmek istiyor musunuz?</string>
+  <string name="ssl_validator_not_saved">Sertifika kaydedilemedi</string>
+  <string name="ssl_validator_btn_details_see">Ayrıntılar</string>
+  <string name="ssl_validator_btn_details_hide">Gizle</string>
+  <string name="ssl_validator_label_O">Organizasyon:</string>
+  <string name="ssl_validator_label_OU">Organizasyon birimi:</string>
+  <string name="ssl_validator_label_C">Ülke:</string>
+  <string name="ssl_validator_label_ST">Eyalet:</string>
+  <string name="ssl_validator_label_L">Konum:</string>
+  <string name="ssl_validator_label_validity">Geçerlilik:</string>
+  <string name="ssl_validator_label_validity_from">Kimden:</string>
+  <string name="ssl_validator_label_validity_to">Kime:</string>
+  <string name="ssl_validator_label_signature">Ä°mza:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
+  <string name="text_placeholder">Bu bir yer tutucudur</string>
+  <string name="instant_upload_on_wifi">Resimleri sadece WiFi bağlantısında yükle</string>
+  <string name="conflict_title">Çakışmayı güncelle</string>
+  <string name="conflict_keep_both">Ä°kisini de koru</string>
+  <string name="conflict_overwrite">Üzerine yaz</string>
+  <string name="conflict_dont_upload">Yükleme</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f54d7dc5..b7f4c4d4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,18 +1,219 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
   <string name="main_password">Пароль:</string>
+  <string name="main_login">Ім\'я користувача</string>
+  <string name="main_button_login">Логін</string>
+  <string name="main_welcome">Вітаємо у Вашому ownCloud</string>
   <string name="main_files">Файли</string>
+  <string name="main_music">Музика</string>
+  <string name="main_contacts">Контакти</string>
   <string name="main_calendar">Календар</string>
   <string name="main_bookmarks">Закладки</string>
   <string name="main_settings">Налаштування</string>
+  <string name="main_tit_accsetup">Налаштування облікового запису</string>
+  <string name="main_wrn_accsetup">На Вашому пристрої відсутні облікові запси ownCloud. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
+  <string name="about_message">ownCloud Android клієнт\n\nверсія: %1$s</string>
+  <string name="actionbar_sync">Оновити</string>
+  <string name="actionbar_upload">Відвантажити</string>
+  <string name="actionbar_upload_from_apps">Вміст із інших програм</string>
+  <string name="actionbar_upload_files">Файли</string>
+  <string name="actionbar_mkdir">Створити теку</string>
+  <string name="actionbar_search">Пошук</string>
   <string name="actionbar_settings">Налаштування</string>
+  <string name="prefs_category_general">Основне</string>
+  <string name="prefs_category_trackmydevice">Стеження за пристроєм</string>
+  <string name="prefs_add_session">Додати нову сесію</string>
+  <string name="prefs_create_img_thumbnails">Створити відбитки зображень</string>
+  <string name="prefs_select_oc_account">Обрати обліковий запис</string>
+  <string name="prefs_summary_select_oc_account">Оберіть, який із облікових записів повинна використовувати програма.</string>
+  <string name="prefs_trackmydevice">Стеження за пристроєм</string>
+  <string name="prefs_trackmydevice_summary_off">Дозволити ownCloud стежити за місцезнаходженням Вашого пристрою</string>
+  <string name="prefs_trackmydevice_summary_on">Ваш ownCloud стежить за цим пристроєм</string>
+  <string name="prefs_trackmydevice_interval">Інтервал оновлення</string>
+  <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$ хвилин</string>
+  <string name="prefs_accounts">Облікові записи</string>
+  <string name="prefs_manage_accounts">Управління обліковими записами</string>
+  <string name="prefs_pincode">ownCloud програмний PIN</string>
+  <string name="prefs_pincode_summary">Захист Вашог ownCloud клієнта</string>
+  <string name="prefs_instant_upload">Включити негайне завантаження</string>
+  <string name="prefs_instant_upload_summary">Негайно завантажувати фото, зроблені камерою</string>
+  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_username">Ім\'я користувача</string>
   <string name="auth_password">Пароль</string>
+  <string name="auth_register">Я новачок в ownCloud</string>
+  <string name="new_session_uri_error">Надано невірний URL</string>
+  <string name="new_session_session_name_error">Невірне ім\'я сесії</string>
   <string name="sync_string_files">Файли</string>
+  <string name="uploader_no_file_selected">Не обрано файл для завантаження</string>
+  <string name="setup_hint_username">Ім\'я користувача</string>
   <string name="setup_hint_password">Пароль</string>
+  <string name="setup_hint_address">Веб адреса</string>
+  <string name="setup_hint_show_password">Показувати пароль?</string>
+  <string name="setup_title">Підключитись до Вашого ownCloud</string>
+  <string name="setup_btn_connect">З\'єднати</string>
+  <string name="uploader_btn_upload_text">Відвантажити</string>
+  <string name="uploader_wrn_no_account_title">Не знайдено облікового запису</string>
+  <string name="uploader_wrn_no_account_text">На Вашому пристрої відсутні облікові записи ownCloud. Будь ласка, спочатку створіть запис.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Налаштування</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Вийти</string>
+  <string name="uploader_wrn_no_content_title">Відсутні дані для завантаження</string>
+  <string name="uploader_wrn_no_content_text">Не отримано даних. Нічого завантажувати.</string>
+  <string name="uploader_error_forbidden_content">ownCloud не може отримати доступ до спільного контенту</string>
+  <string name="uploader_info_uploading">Завантаження</string>
+  <string name="uploader_btn_create_dir_text">Створити теку для завантаження</string>
+  <string name="file_list_empty">В цьому каталозі відсутні файли.\nНові файли можна додати через опцію меню \"Завантаження\".</string>
+  <string name="filedetails_select_file">Натисніть на файлі для відображення додаткової інформації</string>
   <string name="filedetails_size">Розмір:</string>
+  <string name="filedetails_type">Тип:</string>
+  <string name="filedetails_created">Створено:</string>
   <string name="filedetails_modified">Змінено:</string>
   <string name="filedetails_download">Завантажити</string>
+  <string name="filedetails_sync_file">Оновити</string>
+  <string name="filedetails_redownload">Оновити</string>
+  <string name="filedetails_open">Відкрити</string>
+  <string name="filedetails_renamed_in_upload_msg">Файл був переіменований в %1$s протягом вивантаження</string>
   <string name="common_yes">Так</string>
   <string name="common_no">Ні</string>
+  <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Скасувати завантаження</string>
+  <string name="common_cancel_upload">Перервати завантаження</string>
   <string name="common_cancel">Відмінити</string>
+  <string name="common_save_exit">Зберегти &amp; Вихід</string>
+  <string name="common_exit">Вийти з ownCloud</string>
+  <string name="common_error">Помилка</string>
+  <string name="about_title">Про</string>
+  <string name="delete_account">Видалити запис</string>
+  <string name="create_account">Створити запис</string>
+  <string name="upload_chooser_title">Завантажити з …</string>
+  <string name="uploader_info_dirname">Ім\'я теки</string>
+  <string name="uploader_upload_in_progress_ticker">Завантаження …</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Завантаження %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Успішно завантажено</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s було успішно завантажено</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d файлів було успішно завантажено</string>
+  <string name="uploader_upload_failed_ticker">Помилка завантаження</string>
+  <string name="uploader_upload_failed_content_single">Завантаження %1$s не може завершитись</string>
+  <string name="uploader_upload_failed_content_multiple">Помилка завантаження: %1$d/%2$d файли завантажено</string>
+  <string name="downloader_download_in_progress_ticker">Зкачування …</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Зкачування %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Успішно зкачано</string>
+  <string name="downloader_download_succeeded_content">%1$ успішно завантажено</string>
+  <string name="downloader_download_failed_ticker">Завантаження не вдалося</string>
+  <string name="downloader_download_failed_content">Завантаження %1$ не вдається завершити</string>
+  <string name="common_choose_account">Оберіть обліковий запис</string>
+  <string name="sync_string_contacts">Контакти</string>
+  <string name="sync_fail_ticker">Помилка синхронізації</string>
+  <string name="sync_fail_content">Синхронізація %1$не вдалась</string>
+  <string name="sync_conflicts_in_favourites_ticker">Конфліктів знайдено</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d файли, які мають бути синхронізованими не можуть синхронізуватися</string>
+  <string name="sync_fail_in_favourites_ticker">Синхронізувати файли не вдалося</string>
+  <string name="sync_fail_in_favourites_content">Зміст %1$d файлів не може бути синхронізований (%2$d конфліктів)</string>
+  <string name="use_ssl">Використовувати безпечне з\'єднання</string>
+  <string name="location_no_provider">ownCloud не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
+  <string name="pincode_enter_pin_code">Будь ласка, введіть свій програмний PIN</string>
+  <string name="pincode_enter_new_pin_code">Будь ласка, введіть новий програмний PIN</string>
+  <string name="pincode_configure_your_pin">Введіть програмний PIN</string>
+  <string name="pincode_configure_your_pin_explanation">PIN необхідно буде вводити щоразу при запуску цієї програми</string>
+  <string name="pincode_reenter_your_pincode">Повторно введіть ownCloud програмний PIN, будь ласка</string>
+  <string name="pincode_remove_your_pincode">Видалити свій ownCloud програмний PIN</string>
+  <string name="pincode_mismatch">Обидва ownCloud програмних PIN не однакові</string>
+  <string name="pincode_wrong">Не вірний ownCloud програмний PIN</string>
+  <string name="pincode_removed">ownCloud програмний PIN видалено</string>
+  <string name="pincode_stored">ownCloud програмний PIN збережено</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 хвилин</item>
+    <item>30 хвилин</item>
+    <item>60 хвилин</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Спроба входу…</string>
+  <string name="auth_no_net_conn_title">Відсутнє підключення до мережі</string>
+  <string name="auth_no_net_conn_message">Не знайдено підключення до мережі, перевірте своє підключення до Інтернету та спробуйте ще.</string>
+  <string name="auth_connect_anyway">Все одно з\'єднатися</string>
+  <string name="auth_nossl_plain_ok_title">Безпечне з\'єднання не доступне.</string>
+  <string name="auth_nossl_plain_ok_message">Програма не може встановити безпечне з\'єднання з сервером. Проте, не захищене з\'єднання можливе. Ви можете продовжити або відмінити.</string>
+  <string name="auth_connection_established">З\'єднання встановлено</string>
+  <string name="auth_testing_connection">Перевірка з\'єднання…</string>
+  <string name="auth_not_configured_title">Не вірні налаштування ownCloud </string>
+  <string name="auth_not_configured_message">Здається, Ваш ownCloud примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
+  <string name="auth_unknown_error_title">Виникла невідома помилка!</string>
+  <string name="auth_unknown_error_message">Виникла невідома помилка. Будь ласка, зв\'яжіться з авторами та надайте лог-файли з Вашого пристрою.</string>
+  <string name="auth_unknown_host_title">Не вдалося знайти хост</string>
+  <string name="auth_unknown_host_message">Не вдалося знайти визначений хост. Будь ласка, перевірте ім\'я хосту і доступність серверу та спробуйте ще.</string>
+  <string name="auth_incorrect_path_title">Не знайдено примірник ownCloud</string>
+  <string name="auth_incorrect_path_message">Програмі не вдалося знайти примірник ownClound за вказаною адресою. Будь ласка, перевірте адресу та спробуйте ще.</string>
+  <string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
+  <string name="auth_incorrect_address_title">Пошкоджений URL</string>
+  <string name="auth_ssl_general_error_title">Помилка SSL ініціалізації</string>
+  <string name="auth_ssl_unverified_server_title">Неперевірена SSL ідентифікація серверу</string>
+  <string name="auth_bad_oc_version_title">Не вдалося визначити версію ownCloud серверу</string>
+  <string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
+  <string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
+  <string name="auth_login_details">Дані для входу</string>
+  <string name="auth_unauthorized">Невірний Логін / Пароль</string>
+  <string name="auth_not_found">Вказано невірний шлях</string>
+  <string name="auth_internal">Внутрішня помилка серверу, код %1$d</string>
+  <string name="crashlog_message">Програма несподівано закрилася. Чи бажаєте Ви надіслати доповідь про аварію?</string>
+  <string name="crashlog_send_report">Надіслати доповідь</string>
+  <string name="crashlog_dont_send_report">Не  відсилати доповідь</string>
+  <string name="extensions_avail_title">Розширення доступні!</string>
+  <string name="extensions_avail_message">Здається, що Ваш примірник ownCloud підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
+  <string name="fd_keep_in_sync">Оновлювати файл</string>
+  <string name="common_share">Поділитися</string>
+  <string name="common_rename">Перейменувати</string>
+  <string name="common_remove">Видалити</string>
+  <string name="confirmation_remove_alert">Ви дійсно бажаєте видалити %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Ви дійсно бажаєте видалити %1$s і його зміст ?</string>
+  <string name="confirmation_remove_local">Лише локально</string>
+  <string name="confirmation_remove_folder_local">Лише локальний зміст</string>
+  <string name="confirmation_remove_remote">Видалити із серверу</string>
+  <string name="confirmation_remove_remote_and_local">Віддалено і локально</string>
+  <string name="remove_success_msg">Успішно видалено</string>
+  <string name="remove_fail_msg">Видалення не вдалось</string>
+  <string name="rename_dialog_title">Введіть нове ім\'я</string>
+  <string name="rename_local_fail_msg">Локальна копія не може бути перейменована; спробуйте визначити нове ім\'я</string>
+  <string name="rename_server_fail_msg">Перейменування не вдалося</string>
+  <string name="sync_file_fail_msg">Неможливо перевірити віддалений файл</string>
+  <string name="sync_file_nothing_to_do_msg">Зміст файлу вже синхронізовано</string>
+  <string name="create_dir_fail_msg">Не вдалося створити теку</string>
+  <string name="wait_a_moment">Зачекайте хвилинку</string>
+  <string name="filedisplay_unexpected_bad_get_content">Несподівані проблеми ; будь ласка, спробуйте використати іншу програму для вибору файлу</string>
+  <string name="filedisplay_no_file_selected">Не обрано файл</string>
+  <string name="ssl_validator_title">Попередження</string>
+  <string name="ssl_validator_header">Не вдалося перевірити ідентифікацію сайта</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Не довірений сертифікат серверу</string>
+  <string name="ssl_validator_reason_cert_expired">- Сертифікат серверу втратив чинність</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Сертифікат серверу занадто новий</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL не відповідає імені хоста у сертифікаті</string>
+  <string name="ssl_validator_certificate_not_available">Не вдалося отримати сертифікат серверу</string>
+  <string name="ssl_validator_question">Ви все одно бажаєте довіряти цьому сертифікату?</string>
+  <string name="ssl_validator_not_saved">Не вдалося зберегти сертифікат</string>
+  <string name="ssl_validator_btn_details_see">Деталі</string>
+  <string name="ssl_validator_btn_details_hide">Сховати</string>
+  <string name="ssl_validator_label_subject">Видано для:</string>
+  <string name="ssl_validator_label_issuer">Видавець:</string>
+  <string name="ssl_validator_label_CN">Ім\'я:</string>
+  <string name="ssl_validator_label_O">Організація:</string>
+  <string name="ssl_validator_label_OU">Підрозділ:</string>
+  <string name="ssl_validator_label_C">Країна:</string>
+  <string name="ssl_validator_label_ST">Область:</string>
+  <string name="ssl_validator_label_L">Місцевість:</string>
+  <string name="ssl_validator_label_validity">Чинність:</string>
+  <string name="ssl_validator_label_validity_from">З:</string>
+  <string name="ssl_validator_label_validity_to">До:</string>
+  <string name="ssl_validator_label_signature">Підпис:</string>
+  <string name="ssl_validator_label_signature_algorithm">Алгоритм:</string>
+  <string name="text_placeholder">Це заповнювач</string>
+  <string name="instant_upload_on_wifi">Завантажувати зображення тільки через WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Конфлікт оновлення</string>
+  <string name="conflict_message">Віддалений файл %s не синхронізовано з локальним. Продовження процедури замінить вміст файлу на сервері.</string>
+  <string name="conflict_keep_both">Залишити обидва</string>
+  <string name="conflict_overwrite">Замінити</string>
+  <string name="conflict_dont_upload">Не завантажувати</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 22afb733..86092fc2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,31 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">Xin chào bạn đến với trang chủ OwnCloud</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Mật khẩu :</string>
   <string name="main_login">Tên người dùng :</string>
   <string name="main_button_login">Đăng nhập</string>
   <string name="main_welcome">Chào mừng bạn đến với OwnCloud</string>
-  <string name="main_files">Các tập tin</string>
+  <string name="main_files">Tập tin</string>
   <string name="main_music">Âm nhạc</string>
   <string name="main_contacts">Danh sách liên lạc</string>
   <string name="main_calendar">Lịch</string>
-  <string name="main_bookmarks">Đánh dấu</string>
+  <string name="main_bookmarks">Bookmarks</string>
   <string name="main_settings">Cài đặt</string>
-  <string name="main_tit_accsetup">Cài đặt tài khoản</string>
-  <string name="main_wrn_accsetup">Trên thiết bị của bạn không có tài khoản ownCloud .Để sử dụng ứng dụng này, bạn cần phải tạo một tài khoản.</string>
+  <string name="main_tit_accsetup">Thiết lập tài khoản</string>
+  <string name="main_wrn_accsetup">Trên thiết bị của bạn không có tài khoản ownCloud. Để sử dụng ứng dụng này bạn cần phải tạo một tài khoản.</string>
+  <string name="about_message">ownCloud Android máy trạm⏎ ⏎ phiên bản: %1$s</string>
   <string name="actionbar_sync">Đồng bộ tài khoản</string>
   <string name="actionbar_upload">Tải lên</string>
+  <string name="actionbar_upload_from_apps">Nội dung từ các ứng dụng khác</string>
+  <string name="actionbar_upload_files">Các tập tin</string>
   <string name="actionbar_mkdir">Tạo thư mục</string>
   <string name="actionbar_search">Tìm kiếm</string>
   <string name="actionbar_settings">Cài đặt</string>
   <string name="prefs_category_general">Tổng hợp</string>
+  <string name="prefs_category_trackmydevice">Thiết bị theo dõi</string>
+  <string name="prefs_add_session">Thêm phiên làm việc mới</string>
+  <string name="prefs_create_img_thumbnails">Tạo hình ảnh thu nhỏ</string>
   <string name="prefs_select_oc_account">Chọn một tài khoản</string>
+  <string name="prefs_summary_select_oc_account">Chọn, các tài khoản của bạn và các ứng dụng nên sử dụng.</string>
+  <string name="prefs_trackmydevice">Thiết bị theo dõi</string>
+  <string name="prefs_trackmydevice_summary_off">Bật tính năng ownCloud để theo dõi vị trí thiết bị của bạn</string>
+  <string name="prefs_trackmydevice_summary_on">ownCloud tiếp tục theo dõi thiết bị này</string>
+  <string name="prefs_trackmydevice_interval">Cập nhật khoảng thời gian</string>
   <string name="prefs_trackmydevice_interval_summary">Đã cập nhập được %1$s</string>
+  <string name="prefs_accounts">Tài khoản</string>
+  <string name="prefs_manage_accounts">Quản lý tài khoản</string>
+  <string name="prefs_pincode">Mã PIN ứng dụng ownCloud</string>
+  <string name="prefs_pincode_summary">Bảo vệ ownCloud client của bạn</string>
+  <string name="prefs_instant_upload">Kích hoạt tính năng tải lên ngay lập tức</string>
+  <string name="prefs_instant_upload_summary">Ngay lập tức tải lên các hình ảnh được chụp bởi camera</string>
   <string name="auth_host_url">ownCloud URL</string>
   <string name="auth_username">Tên người dùng</string>
   <string name="auth_password">Mật khẩu</string>
+  <string name="auth_register">Tôi mới đến ownCloud</string>
   <string name="new_session_uri_error">Bạn nhập sai URL</string>
+  <string name="new_session_session_name_error">Sai tên phiên làm việc</string>
   <string name="sync_string_files">Tập tin</string>
   <string name="uploader_no_file_selected">Không có tập tin nào được chọn để tải lên</string>
   <string name="setup_hint_username">Tài khoản</string>
@@ -39,5 +57,158 @@
   <string name="uploader_wrn_no_account_text">Trên thiết bị của bạn không có tài khoản ownCloud .Bước đầu tiên hãy thiết lập một tài khoản.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Cài đặt</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Thoát</string>
+  <string name="uploader_wrn_no_content_title">Không có nội dung tải lên</string>
+  <string name="uploader_wrn_no_content_text">Không có nội dung được nhận. Không có gì để tải lên.</string>
+  <string name="uploader_error_forbidden_content">ownCloud không cho phép truy cập vào các nội dung chia sẻ</string>
   <string name="uploader_info_uploading">Đang tải lên</string>
+  <string name="uploader_btn_create_dir_text">Tạo thư mục để tải lên</string>
+  <string name="file_list_empty">Không có các tập tin trong thư mục này ⏎ tập tin mới có thể được thêm vào với tùy chọn trình đơn \"Tải lên\".</string>
+  <string name="filedetails_select_file">Tap vào một tập tin để hiển thị thêm thông tin</string>
+  <string name="filedetails_size">Kích thước:</string>
+  <string name="filedetails_type">Loại:</string>
+  <string name="filedetails_created">Đã tạo:</string>
+  <string name="filedetails_modified">Đã chỉnh sửa:</string>
+  <string name="filedetails_download">Tải về</string>
+  <string name="filedetails_sync_file">Làm mới</string>
+  <string name="filedetails_redownload">Làm mới</string>
+  <string name="filedetails_open">Mở</string>
+  <string name="filedetails_renamed_in_upload_msg">Tập tin đã bị đổi tên thành %1$s trong quá trình tải lên</string>
+  <string name="common_yes">Yes</string>
+  <string name="common_no">Không</string>
+  <string name="common_ok">Chấp nhận</string>
+  <string name="common_cancel_download">Hủy tải về</string>
+  <string name="common_cancel_upload">Hủy upload</string>
+  <string name="common_cancel">Hủy</string>
+  <string name="common_save_exit">Lưu &amp; Thoát</string>
+  <string name="common_exit">Rời khỏi ownCloud</string>
+  <string name="common_error">Lỗi</string>
+  <string name="about_title">Giới thiệu</string>
+  <string name="delete_account">Xóa tài khoản</string>
+  <string name="create_account">Tạo tài khoản</string>
+  <string name="upload_chooser_title">Tải lên từ ...</string>
+  <string name="uploader_info_dirname">Tên thư mục</string>
+  <string name="uploader_upload_in_progress_ticker">Đang tải lên ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Đang tải lên %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Tải lên thành công</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s là tải lên thành công</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d tập tin là tải lên thành công</string>
+  <string name="uploader_upload_failed_ticker">Tải lên thất bại</string>
+  <string name="uploader_upload_failed_content_single">Tải lên %1$s không thể hoàn thành</string>
+  <string name="uploader_upload_failed_content_multiple">Tải lên thất bại: %1$d/%2$d tập tin đã được tải lên</string>
+  <string name="downloader_download_in_progress_ticker">Đang tải về ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Đang tải về %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Tải về thành công</string>
+  <string name="downloader_download_succeeded_content">%1$s là hoàn thành việc tải về</string>
+  <string name="downloader_download_failed_ticker">Tải về thất bại</string>
+  <string name="downloader_download_failed_content">Tải về %1$s không thể được hoàn thành</string>
+  <string name="common_choose_account">Chọn tài khoản</string>
+  <string name="sync_string_contacts">Danh sách liên lạc</string>
+  <string name="sync_fail_ticker">Đồng bộ thất bại</string>
+  <string name="sync_fail_content">Đồng bộ %1$s không thể hoàn thành</string>
+  <string name="sync_conflicts_in_favourites_ticker">Tìm thấy xung đột</string>
+  <string name="sync_fail_in_favourites_content">Nội dung tập tin %1$d không thể đồng bộ (%2$d xung đột)</string>
+  <string name="use_ssl">Sử dụng kết nối an toàn</string>
+  <string name="location_no_provider">ownCloud không thể theo dõi điện thoại của bạn. Vui lòng kiểm tra cài đặt vị trí của bạn</string>
+  <string name="pincode_enter_pin_code">Vui lòng, nhập mã PIN ứng dụng của bạn</string>
+  <string name="pincode_enter_new_pin_code">Vui lòng, nhập mã PIN mới của ứng dụng</string>
+  <string name="pincode_configure_your_pin">Nhập mã PIN ứng dụng ownCloud</string>
+  <string name="pincode_configure_your_pin_explanation">Mã PIN sẽ được yêu cầu mỗi khi ứng dụng được bật </string>
+  <string name="pincode_reenter_your_pincode">Vui lòng nhập lại mã PIN ứng dụng ownCloud</string>
+  <string name="pincode_remove_your_pincode">Hủy mã PIN ứng dụng ownCloud của bạn</string>
+  <string name="pincode_mismatch">Mã PIN ứng dụng ownCloud không được trùng</string>
+  <string name="pincode_wrong">Mã PIN ứng dụng ownCloud không đúng</string>
+  <string name="pincode_removed">Mã PIN ứng dụng ownCloud đã bị xóa</string>
+  <string name="pincode_stored">Mã PIN ứng dụng ownCloud đã được lưu trữ</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 Phút</item>
+    <item>30 Phút</item>
+    <item>60 Phút</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Đang cố gắng để đăng nhập…</string>
+  <string name="auth_no_net_conn_title">Không có kết nối mạng</string>
+  <string name="auth_no_net_conn_message">Không tìm thấy kết nối mạng, kiểm tra lại kết nối mạng và thử lại.</string>
+  <string name="auth_connect_anyway">Kết nối nào</string>
+  <string name="auth_nossl_plain_ok_title">Bảo mật kết nối không có giá trị.</string>
+  <string name="auth_nossl_plain_ok_message">Ứng dụng không thể thiết lập một kết nối an toàn đến máy chủ. Một kết nối không an toàn đang có giá trị. Bạn có thể tiếp tục hoặc hủy bỏ.</string>
+  <string name="auth_connection_established">Kết nối đã thiết lập</string>
+  <string name="auth_testing_connection">Đang kiểm tra kết nối...</string>
+  <string name="auth_not_configured_title">Thay đổi cấu hình ownCloud </string>
+  <string name="auth_not_configured_message">Có vẻ như phiên bản ownCloud của bạn cấu hình không đúng. Liên hệ với quản trị viên để biết thêm chi tiết.</string>
+  <string name="auth_unknown_error_title">Không xác định được lỗi!</string>
+  <string name="auth_unknown_error_message">Lỗi không xác định. Vui lòng liên hệ tác giả và gửi kèm theo logs từ thiết bị của bạn.</string>
+  <string name="auth_unknown_host_title">Không thể tìm thấy máy chủ</string>
+  <string name="auth_unknown_host_message">Không thể tìm thấy máy chủ. Xin vui lòng kiểm tra hostname, máy chủ có giá trị và thử lại.</string>
+  <string name="auth_incorrect_path_title">Phiên bản ownCloud không tìm thấy</string>
+  <string name="auth_incorrect_path_message">Ứng dụng không thể tìm thấy phiên bản ownClound tại đường dẫn đã cho. Xin vui lòng kiểm tra đường dẫn của bạn và thử lại.</string>
+  <string name="auth_timeout_title">Máy chủ đã quá dài để đáp ứng</string>
+  <string name="auth_incorrect_address_title">Thay đổi URL</string>
+  <string name="auth_ssl_general_error_title">SSL khởi tạo thất bại</string>
+  <string name="auth_ssl_unverified_server_title">Chưa được xác minh danh tính của máy chủ SSL</string>
+  <string name="auth_bad_oc_version_title">Không chấp nhận phiên bản máy chủ ownCloud</string>
+  <string name="auth_wrong_connection_title">Không thể thiết lập kết nối</string>
+  <string name="auth_secure_connection">Kết nối an toàn đã được thiết lập</string>
+  <string name="auth_login_details">Chi tiết đăng nhập</string>
+  <string name="auth_not_found">Đường dẫn đã cho không đúng</string>
+  <string name="auth_internal">Lỗi máy chủ nội bộ, mã lỗi %1$d</string>
+  <string name="crashlog_message">Ứng dụng chấm dứt đột ngột. Bạn có muốn gửi báo cáo sự cố?</string>
+  <string name="crashlog_send_report">Gửi báo cáo</string>
+  <string name="crashlog_dont_send_report">Không gửi báo cáo</string>
+  <string name="extensions_avail_title">Phần mở rộng có giá trị!</string>
+  <string name="extensions_avail_message">Hình như phiên bản ownCloud của bạn có hỗ trợ các phần mở rộng nâng cao. Bạn có muốn thấy các phần mở rộng có giá trị trên Android?</string>
+  <string name="fd_keep_in_sync">Giữ tập tin cập nhật</string>
+  <string name="common_share">Chia sẻ</string>
+  <string name="common_rename">Sửa tên</string>
+  <string name="common_remove">Xóa</string>
+  <string name="confirmation_remove_alert">Bạn có thực sự muốn xóa %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Bạn có thật sự muốn xóa %1$s và nội dung của nó ?</string>
+  <string name="confirmation_remove_local">Chỉ cục bộ</string>
+  <string name="confirmation_remove_remote">Xóa từ máy chủ</string>
+  <string name="confirmation_remove_remote_and_local">Remote và local</string>
+  <string name="remove_success_msg">Xóa thành công</string>
+  <string name="remove_fail_msg">Xóa không thành công</string>
+  <string name="rename_dialog_title">Nhập tên mới</string>
+  <string name="rename_local_fail_msg">Bản sao Local không thể được đổi tên; thử một tên khác</string>
+  <string name="rename_server_fail_msg">Đổi tên không thể hoàn thành</string>
+  <string name="sync_file_fail_msg">Tập tin từ xa không được kiểm tra</string>
+  <string name="sync_file_nothing_to_do_msg">Nội dung tập tin đã đồng bộ</string>
+  <string name="create_dir_fail_msg">Thư mục không thể được tạo</string>
+  <string name="wait_a_moment">Chờ một lúc</string>
+  <string name="filedisplay_unexpected_bad_get_content">Vấn đề bất ngờ ; hãy thử ứng dụng khác để chọn tập tin</string>
+  <string name="filedisplay_no_file_selected">Không có tập tin nào được chọn</string>
+  <string name="ssl_validator_title">Cảnh báo</string>
+  <string name="ssl_validator_header">Không thể xác minh danh tính của site</string>
+  <string name="ssl_validator_reason_cert_not_trusted">Chứng chỉ này không đáng tin cậy</string>
+  <string name="ssl_validator_reason_cert_expired">Chứng chỉ đã hết hạn</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">Chứng nhận máy chủ quá mới</string>
+  <string name="ssl_validator_reason_hostname_not_verified">URL không phù hợp với tên máy trong chứng chỉ</string>
+  <string name="ssl_validator_certificate_not_available">Không đạt được chứng chỉ </string>
+  <string name="ssl_validator_question">Bạn có chắc chắn tin tưởng chứng chỉ này?</string>
+  <string name="ssl_validator_not_saved">Giấy chứng nhận này không có thể được Lưu</string>
+  <string name="ssl_validator_btn_details_see">Chi tiết</string>
+  <string name="ssl_validator_btn_details_hide">Ẩn</string>
+  <string name="ssl_validator_label_subject">Cấp cho :</string>
+  <string name="ssl_validator_label_issuer">Nơi cấp:</string>
+  <string name="ssl_validator_label_CN">Tên thông dụng :</string>
+  <string name="ssl_validator_label_O">Tổ chức</string>
+  <string name="ssl_validator_label_OU">Đơn vị :</string>
+  <string name="ssl_validator_label_C">Quốc gia :</string>
+  <string name="ssl_validator_label_ST">Tiểu bang :</string>
+  <string name="ssl_validator_label_L">Đến từ :</string>
+  <string name="ssl_validator_label_validity">Hiệu lực :</string>
+  <string name="ssl_validator_label_validity_from">Từ :</string>
+  <string name="ssl_validator_label_validity_to">Tới :</string>
+  <string name="ssl_validator_label_signature">Chữ ký :</string>
+  <string name="ssl_validator_label_signature_algorithm">Thuật toán :</string>
+  <string name="text_placeholder">Vị trí này đã được đặt chỗ trước</string>
+  <string name="instant_upload_on_wifi">Tải hình ảnh lên thông qua WiFi</string>
+  <string name="conflict_title">Cập nhật xung đột</string>
+  <string name="conflict_message">%s là tập tin từ xa nó không đồng bộ với tập tin máy bạn . Nếu bạn tiếp tục sẽ thay đổi nội dung của tập tin trên máy chủ.</string>
+  <string name="conflict_keep_both">Giữ cho cả hai</string>
+  <string name="conflict_overwrite">Ghi đè lên</string>
+  <string name="conflict_dont_upload">Không tải lên</string>
 </resources>
diff --git a/res/values-zh-rBG/strings.xml b/res/values-zh-rBG/strings.xml
index 3a329201..b45ca46e 100644
--- a/res/values-zh-rBG/strings.xml
+++ b/res/values-zh-rBG/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">你好世界，我是 OwnCloud 主屏幕！</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">密码</string>
   <string name="main_login">用户名：</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置帐号</string>
   <string name="main_wrn_accsetup">您的设备上没有 ownCloud 帐号。要使用此应用，您需要创建一个帐号。</string>
+  <string name="about_message">ownCloud Android 客户端⏎ ⏎ 版本：%1$s</string>
   <string name="actionbar_sync">刷新</string>
   <string name="actionbar_upload">上传</string>
   <string name="actionbar_upload_from_apps">其他应用的内容</string>
@@ -62,17 +62,20 @@
   <string name="uploader_error_forbidden_content">ownCloud 不允许访问共享内容</string>
   <string name="uploader_info_uploading">上传中</string>
   <string name="uploader_btn_create_dir_text">创建上传文件夹</string>
+  <string name="file_list_empty">此文件夹中没有文件。⏎ 可以通过 \"上传\" 菜单选项添加新文件。</string>
   <string name="filedetails_select_file">按文件显示额外信息。</string>
   <string name="filedetails_size">大小：</string>
   <string name="filedetails_type">类型：</string>
   <string name="filedetails_created">创建于：</string>
   <string name="filedetails_modified">修改于：</string>
   <string name="filedetails_download">下载</string>
+  <string name="filedetails_sync_file">刷新</string>
   <string name="filedetails_redownload">重新下载</string>
   <string name="filedetails_open">打开</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">好</string>
+  <string name="common_cancel_upload">取消上传</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">保存 &amp; 退出</string>
   <string name="common_exit">离开 ownCloud</string>
@@ -105,6 +108,7 @@
   <string name="pincode_enter_pin_code">请插入您的应用 PIN</string>
   <string name="pincode_enter_new_pin_code">请插入您的新应用 PIN</string>
   <string name="pincode_configure_your_pin">输入 ownCloud 应用 PIN</string>
+  <string name="pincode_configure_your_pin_explanation">将在每次应用程序启动时请求 PIN </string>
   <string name="pincode_reenter_your_pincode">请重新输入 ownCloud 应用 PIN</string>
   <string name="pincode_remove_your_pincode">移除您的 ownCloud 应用 PIN</string>
   <string name="pincode_mismatch">两次 ownCloud 应用 PIN 不相同</string>
@@ -175,6 +179,26 @@
   <string name="ssl_validator_certificate_not_available">无法获取服务器证书</string>
   <string name="ssl_validator_question">您想要强行信任此证书吗？</string>
   <string name="ssl_validator_not_saved">证书不能保存</string>
+  <string name="ssl_validator_btn_details_see">细节</string>
+  <string name="ssl_validator_btn_details_hide">隐藏</string>
+  <string name="ssl_validator_label_subject">签发对象：</string>
+  <string name="ssl_validator_label_issuer">签发者：</string>
+  <string name="ssl_validator_label_CN">通用名：</string>
+  <string name="ssl_validator_label_O">组织：</string>
+  <string name="ssl_validator_label_OU">组织单元：</string>
+  <string name="ssl_validator_label_C">国家：</string>
+  <string name="ssl_validator_label_ST">州省：</string>
+  <string name="ssl_validator_label_L">位置：</string>
+  <string name="ssl_validator_label_validity">有效性：</string>
+  <string name="ssl_validator_label_validity_from">从：</string>
+  <string name="ssl_validator_label_validity_to">到：</string>
+  <string name="ssl_validator_label_signature">签名：</string>
+  <string name="ssl_validator_label_signature_algorithm">算法：</string>
   <string name="text_placeholder">这是一个占位符</string>
   <string name="instant_upload_on_wifi">只通过 WiFi 上传图片</string>
+  <string name="conflict_title">上传冲突</string>
+  <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
+  <string name="conflict_keep_both">保留两者</string>
+  <string name="conflict_overwrite">覆写</string>
+  <string name="conflict_dont_upload">不上传</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2ea53931..e85f14ae 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">你好，OwnCloud主屏幕!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">密码：</string>
   <string name="main_login">用户名：</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置账号</string>
   <string name="main_wrn_accsetup">设备上无 ownCloud 账号，要使用此 App，需要先创建一个账号。</string>
+  <string name="about_message">ownCloud安卓客户端\n\n版本： %1$s</string>
   <string name="actionbar_sync">刷新</string>
   <string name="actionbar_upload">上传</string>
   <string name="actionbar_upload_from_apps">来自其它app的内容</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud未被允许访问共享内容。</string>
   <string name="uploader_info_uploading">上传</string>
   <string name="uploader_btn_create_dir_text">创建上传文件夹</string>
+  <string name="file_list_empty">文件夹为空\n可以使用上传按钮来增加文件</string>
   <string name="filedetails_select_file">点击一个文件来显示额外的信息。</string>
   <string name="filedetails_size">大小：</string>
   <string name="filedetails_type">类型：</string>
   <string name="filedetails_created">创建于：</string>
   <string name="filedetails_modified">已修改：</string>
   <string name="filedetails_download">下载</string>
+  <string name="filedetails_sync_file">刷新</string>
   <string name="filedetails_redownload">重新下载</string>
   <string name="filedetails_open">打开</string>
+  <string name="filedetails_renamed_in_upload_msg">上传过程中文件被更名为了 %1$s</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">取消下载</string>
+  <string name="common_cancel_upload">取消上传</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">保存并退出</string>
   <string name="common_exit">离开ownCloud。</string>
@@ -100,11 +105,14 @@
   <string name="sync_string_contacts">联系人</string>
   <string name="sync_fail_ticker">同步失败</string>
   <string name="sync_fail_content"> %1$s同步未完成。</string>
+  <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
+  <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="use_ssl">使用安全链接</string>
   <string name="location_no_provider">ownCloud不能跟踪你的设备。请检查你的位置设置。</string>
   <string name="pincode_enter_pin_code">请输入您的App PIN码</string>
   <string name="pincode_enter_new_pin_code">请输入新的App PIN码</string>
   <string name="pincode_configure_your_pin">输入ownCloud App PIN码</string>
+  <string name="pincode_configure_your_pin_explanation">每次应用启动时都会请求PIN码</string>
   <string name="pincode_reenter_your_pincode">再次输入ownCloud App PIN码</string>
   <string name="pincode_remove_your_pincode">移除ownCloud App PIN码</string>
   <string name="pincode_mismatch">两次ownCloud App PIN码不同</string>
@@ -145,6 +153,9 @@
   <string name="auth_wrong_connection_title">无法建立连接</string>
   <string name="auth_secure_connection">加密连接已建立</string>
   <string name="auth_login_details">登录信息</string>
+  <string name="auth_unauthorized">错误的用户名或密码</string>
+  <string name="auth_not_found">错误的路径</string>
+  <string name="auth_internal">内部服务器错误，代码 %1$d</string>
   <string name="crashlog_message">应用崩溃，是否提交崩溃报告？</string>
   <string name="crashlog_send_report">发送报告</string>
   <string name="crashlog_dont_send_report">不发送报告</string>
@@ -155,13 +166,18 @@
   <string name="common_rename">重命名</string>
   <string name="common_remove">删除</string>
   <string name="confirmation_remove_alert">是否要删除%1$s ?</string>
+  <string name="confirmation_remove_folder_alert">您确定要删除 %1$s 及其内容吗？</string>
   <string name="confirmation_remove_local">仅本地</string>
+  <string name="confirmation_remove_folder_local">仅本地内容</string>
   <string name="confirmation_remove_remote">从服务器删除</string>
   <string name="confirmation_remove_remote_and_local">远程和本地都</string>
   <string name="remove_success_msg">成功删除</string>
   <string name="remove_fail_msg">无法完成删除</string>
+  <string name="rename_dialog_title">请输出新的名字</string>
   <string name="rename_local_fail_msg">本地副本无法重命名，请尝试另外的名字</string>
   <string name="rename_server_fail_msg">重命名未完成</string>
+  <string name="sync_file_fail_msg">无法核实远程文件</string>
+  <string name="sync_file_nothing_to_do_msg">文件内容已同步</string>
   <string name="create_dir_fail_msg">无法创建文件夹</string>
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
@@ -175,6 +191,26 @@
   <string name="ssl_validator_certificate_not_available">无法获得服务器证书</string>
   <string name="ssl_validator_question">是否信任此证书？</string>
   <string name="ssl_validator_not_saved">证书无法保存</string>
+  <string name="ssl_validator_btn_details_see">详细信息</string>
+  <string name="ssl_validator_btn_details_hide">隐藏</string>
+  <string name="ssl_validator_label_subject">授权给：</string>
+  <string name="ssl_validator_label_issuer">授权 由：</string>
+  <string name="ssl_validator_label_CN">通用名称：</string>
+  <string name="ssl_validator_label_O">组织：</string>
+  <string name="ssl_validator_label_OU">组织单元：</string>
+  <string name="ssl_validator_label_C">国家：</string>
+  <string name="ssl_validator_label_ST">州省：</string>
+  <string name="ssl_validator_label_L">地区：</string>
+  <string name="ssl_validator_label_validity">有效性：</string>
+  <string name="ssl_validator_label_validity_from">从：</string>
+  <string name="ssl_validator_label_validity_to">到：</string>
+  <string name="ssl_validator_label_signature">签名：</string>
+  <string name="ssl_validator_label_signature_algorithm">算法：</string>
   <string name="text_placeholder">占位符一枚</string>
   <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>
+  <string name="conflict_title">上传冲突</string>
+  <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
+  <string name="conflict_keep_both">保留两者</string>
+  <string name="conflict_overwrite">覆盖</string>
+  <string name="conflict_dont_upload">不上传</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-zh-rHK/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4f1dd765..5da07670 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -7,6 +7,7 @@
   <string name="main_welcome">歡迎來到您的ownCloud</string>
   <string name="main_files">檔案</string>
   <string name="main_music">音樂</string>
+  <string name="main_contacts">通訊錄</string>
   <string name="main_calendar">日曆</string>
   <string name="main_bookmarks">書籤</string>
   <string name="main_settings">設定</string>
@@ -14,6 +15,7 @@
   <string name="main_wrn_accsetup">您尚未在裝置上設定您的ownCloud帳號. 您必需建立一組帳號才能繼續使用.</string>
   <string name="actionbar_sync">更新</string>
   <string name="actionbar_upload">上傳檔案</string>
+  <string name="actionbar_upload_files">檔案</string>
   <string name="actionbar_mkdir">建立目錄</string>
   <string name="actionbar_search">搜尋</string>
   <string name="actionbar_settings">設定</string>
@@ -26,6 +28,7 @@
   <string name="prefs_manage_accounts">管理帳號</string>
   <string name="prefs_pincode_summary">保護您的ownCloud用戶端</string>
   <string name="prefs_instant_upload">啟用即時上傳</string>
+  <string name="auth_host_url">網址URL</string>
   <string name="auth_username">使用者名稱</string>
   <string name="auth_password">密碼</string>
   <string name="new_session_uri_error">錯誤的URL</string>
@@ -45,10 +48,13 @@
   <string name="filedetails_type">類型:</string>
   <string name="filedetails_created">建立:</string>
   <string name="filedetails_modified">修改:</string>
+  <string name="filedetails_download">下載</string>
+  <string name="filedetails_sync_file">更新</string>
   <string name="filedetails_redownload">重新下載</string>
   <string name="filedetails_open">開啟</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
+  <string name="common_cancel_upload">取消上傳</string>
   <string name="common_cancel">取消</string>
   <string name="common_exit">離開ownCloud</string>
   <string name="common_error">錯誤</string>
@@ -66,6 +72,7 @@
   <string name="downloader_download_succeeded_ticker">下載成功</string>
   <string name="downloader_download_failed_ticker">下載失敗</string>
   <string name="common_choose_account">選擇帳號</string>
+  <string name="sync_string_contacts">通訊錄</string>
   <string-array name="prefs_trackmydevice_intervall_values">
     <item>15</item>
     <item>30</item>
@@ -87,4 +94,5 @@
   <string name="rename_local_fail_msg">本地的複本無法被重新命名; 請嘗試一個不同的新名稱</string>
   <string name="create_dir_fail_msg">資料夾無法被建立</string>
   <string name="wait_a_moment">請稍後</string>
+  <string name="ssl_validator_title">警告</string>
 </resources>
diff --git a/res/values-zu-rZA/strings.xml b/res/values-zu-rZA/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-zu-rZA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d99144e..0041d1b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -116,7 +116,7 @@
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
 	<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
 	<string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
-	<string name="sync_foreign_files_forgotten_content">%1$d files out of the ownCloud directory could not be copied into</string>
+	<string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
 	<string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
     
     <string name="foreign_files_move">"Move all"</string>
diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index e112347a..f66980cb 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -359,7 +359,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), explanationIntent, 0);
         notification.setLatestEventInfo(getContext().getApplicationContext(), 
                                         getContext().getString(R.string.sync_foreign_files_forgotten_ticker), 
-                                        String.format(getContext().getString(R.string.sync_foreign_files_forgotten_content), mForgottenLocalFiles.size()), 
+                                        String.format(getContext().getString(R.string.sync_foreign_files_forgotten_content), mForgottenLocalFiles.size(), getContext().getString(R.string.app_name)), 
                                         notification.contentIntent);
         ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_foreign_files_forgotten_ticker, notification);