From: jabarros <jabarros@solidgear.es>
Date: Wed, 29 Oct 2014 17:09:16 +0000 (+0100)
Subject: Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect
X-Git-Tag: oc-android-1.7.0_signed~126
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/945c584f34b269fa1cf47a9281e4bea77372ced0?hp=3c53502efa32a45a9697a4394b8d8b3c8764e021

Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect

Bugfix multiple select
---

diff --git a/res/values-af-rZA/strings.xml b/res/values-af-rZA/strings.xml
index 6ea41913..17d68853 100644
--- a/res/values-af-rZA/strings.xml
+++ b/res/values-af-rZA/strings.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_settings">Instellings</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_help">Hulp</string>
   <string name="auth_username">Gebruikersnaam</string>
   <string name="auth_password">Wagwoord</string>
diff --git a/res/values-ak/strings.xml b/res/values-ak/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-ak/strings.xml
+++ b/res/values-ak/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-am-rET/strings.xml b/res/values-am-rET/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-am-rET/strings.xml
+++ b/res/values-am-rET/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4d89b576..266507d5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">إعدادات</string>
   <string name="actionbar_see_details">تفاصيل</string>
   <string name="actionbar_send_file">أرسل</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">عام</string>
   <string name="prefs_category_more">المزيد</string>
   <string name="prefs_accounts">حسابات</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b037311c..d3a9060b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Quraşdırmalar</string>
   <string name="actionbar_see_details">Detallar</string>
   <string name="actionbar_send_file">Göndər</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Ümumi</string>
   <string name="prefs_category_more">Daha da</string>
   <string name="prefs_accounts">Hesablar</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 42e20789..0e52b53f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_settings">Налады</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="common_yes">Так</string>
   <string name="common_no">Не</string>
   <string name="common_ok">Добра</string>
diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index 47d243cf..5497ee5a 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Настройки</string>
   <string name="actionbar_see_details">Детайли</string>
   <string name="actionbar_send_file">Изпращане</string>
+  <string name="actionbar_sort">Сортиране</string>
+  <string name="actionbar_sort_title">Сортирай по</string>
+  <string-array name="actionbar_sortby">
+    <item>А-Я</item>
+    <item>Нови - Стари</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Общи</string>
   <string name="prefs_category_more">Още</string>
   <string name="prefs_accounts">Профили</string>
@@ -238,6 +246,7 @@
   <string name="preview_image_description">Преглед на изображението</string>
   <string name="preview_image_error_unknown_format">Изображението не може да бъде показано</string>
   <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
+  <string name="prefs_instant_upload_path_title">Местоположение на качване</string>
   <string name="share_link_no_support_share_api">За съжаление споделянето не е включено на сървъра ви. 
 Моля, свържете се с администратора.</string>
   <string name="share_link_file_no_exist">Неуспешен опит за споделяне. Моля, провери дали файла съществува.</string>
@@ -263,6 +272,7 @@
   <string name="downloader_download_file_not_found">Файлът вече не се намира на този сървър</string>
   <string name="prefs_category_accounts">Профили</string>
   <string name="prefs_add_account">Добавяне на профил</string>
+  <string name="auth_redirect_non_secure_connection_title">Сигурна връзка е пренасочена по несигурен път.</string>
   <string name="actionbar_logger">Доклади</string>
   <string name="log_send_history_button">Изпрати История</string>
   <string name="log_mail_subject">ownCloud Android доклади</string>
@@ -277,5 +287,6 @@
   <string name="move_file_invalid_overwrite">Файлът вече съществува в отдалечената папка.</string>
   <string name="move_file_error">Настъпи грешка при опита за преместване на този файл или папка.</string>
   <string name="forbidden_permissions_move">за да преместиш този файл</string>
+  <string name="prefs_category_instant_uploading">Незабавно качване</string>
   <string name="prefs_category_security">Сигурност</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index cae19b70..a5cf5425 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">নিয়ামকসমূহ</string>
   <string name="actionbar_see_details">বিস্তারিত</string>
   <string name="actionbar_send_file">পাঠাও</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">সাধারণ</string>
   <string name="prefs_category_more">বেশী</string>
   <string name="prefs_accounts">একাউন্ট</string>
diff --git a/res/values-bn-rIN/strings.xml b/res/values-bn-rIN/strings.xml
index a49555a8..3b69168f 100644
--- a/res/values-bn-rIN/strings.xml
+++ b/res/values-bn-rIN/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_upload_files">ফাইলস</string>
   <string name="actionbar_mkdir">নতুন ফোল্ডার</string>
   <string name="actionbar_settings">সেটিংস</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_imprint">অঙ্কিত করা</string>
   <string name="auth_username">ইউজারনেম</string>
   <string name="sync_string_files">ফাইলস</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 30f5ce22..4c2f8692 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_mkdir">Nova fascikla</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d0b98a1d..c5d91d54 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Configuració</string>
   <string name="actionbar_see_details">Detalls</string>
   <string name="actionbar_send_file">Envia</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Més</string>
   <string name="prefs_accounts">Comptes</string>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 6b8b96c6..a9db9c5b 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Nastavení</string>
   <string name="actionbar_see_details">Podrobnosti</string>
   <string name="actionbar_send_file">Odeslat</string>
+  <string name="actionbar_sort">Seřadit</string>
+  <string name="actionbar_sort_title">Seřadit podle</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Nejnovější - nejstarší</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Obecné</string>
   <string name="prefs_category_more">Více</string>
   <string name="prefs_accounts">Účty</string>
diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml
index daace9cd..80cc3c93 100644
--- a/res/values-cy-rGB/strings.xml
+++ b/res/values-cy-rGB/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_upload_files">Ffeiliau</string>
   <string name="actionbar_settings">Gosodiadau</string>
   <string name="actionbar_send_file">Anfon</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Cyffredinol</string>
   <string name="prefs_accounts">Cyfrifon</string>
   <string name="prefs_manage_accounts">Rheoli Cyfrifon</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 54449009..9a275407 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Indstillinger</string>
   <string name="actionbar_see_details">Detaljer</string>
   <string name="actionbar_send_file">Send</string>
+  <string name="actionbar_sort">Sortér</string>
+  <string name="actionbar_sort_title">Sortér efter</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Å</item>
+    <item>Nyeste - ældste</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Generel</string>
   <string name="prefs_category_more">Mere</string>
   <string name="prefs_accounts">Konti</string>
diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml
index f2c13bf6..8a65cc16 100644
--- a/res/values-de-rAT/strings.xml
+++ b/res/values-de-rAT/strings.xml
@@ -2,6 +2,8 @@
 <resources>
   <string name="actionbar_upload_files">Dateien</string>
   <string name="actionbar_settings">Einstellungen</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_help">Hilfe</string>
   <string name="auth_password">Passwort</string>
diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml
index 7a5b9e91..20392974 100644
--- a/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Senden</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 70bd98fa..9f0ebcf9 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Senden</string>
+  <string name="actionbar_sort">Sortieren</string>
+  <string name="actionbar_sort_title">Sortieren nach</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Neueste - Älteste</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 028b6bc6..2bd365c1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Senden</string>
+  <string name="actionbar_sort">Sortieren</string>
+  <string name="actionbar_sort_title">Sortieren nach</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Neueste - Älteste</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 94e35a6b..67b16e2a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Ρυθμίσεις</string>
   <string name="actionbar_see_details">Λεπτομέρειες</string>
   <string name="actionbar_send_file">Αποστολή</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Γενικά</string>
   <string name="prefs_category_more">Περισσότερα</string>
   <string name="prefs_accounts">Λογαριασμοί</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 320d1e67..4ef373d2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Settings</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Send</string>
+  <string name="actionbar_sort">Sort</string>
+  <string name="actionbar_sort_title">Sort by</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Newest - Oldest</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">More</string>
   <string name="prefs_accounts">Accounts</string>
diff --git a/res/values-en-rNZ/strings.xml b/res/values-en-rNZ/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-en-rNZ/strings.xml
+++ b/res/values-en-rNZ/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 2b4413ce..dd653401 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -10,6 +10,8 @@
   <string name="actionbar_settings">Agordo</string>
   <string name="actionbar_see_details">Detaloj</string>
   <string name="actionbar_send_file">Sendi</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Ĝeneralo</string>
   <string name="prefs_category_more">Pli</string>
   <string name="prefs_accounts">Kontoj</string>
diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index 780a6043..74e2f64a 100644
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Configuración</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="actionbar_send_file">Mandar</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Más</string>
   <string name="prefs_accounts">Cuentas</string>
diff --git a/res/values-es-rBO/strings.xml b/res/values-es-rBO/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rBO/strings.xml
+++ b/res/values-es-rBO/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
index c9510725..f3ad1805 100644
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@@ -7,6 +7,8 @@
   <string name="actionbar_mkdir">Nuevo directorio</string>
   <string name="actionbar_settings">Configuración</string>
   <string name="actionbar_see_details">detalles</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_accounts">Cuentas</string>
   <string name="prefs_manage_accounts">Administrar Cuentas</string>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rCR/strings.xml b/res/values-es-rCR/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rCR/strings.xml
+++ b/res/values-es-rCR/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rEC/strings.xml b/res/values-es-rEC/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rEC/strings.xml
+++ b/res/values-es-rEC/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index ef91bc63..78ee8b40 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Ajustes</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="actionbar_send_file">Enviar</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Más</string>
   <string name="prefs_accounts">Cuentas</string>
diff --git a/res/values-es-rPE/strings.xml b/res/values-es-rPE/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rPE/strings.xml
+++ b/res/values-es-rPE/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rPY/strings.xml b/res/values-es-rPY/strings.xml
index 56fe6665..26dde5f1 100644
--- a/res/values-es-rPY/strings.xml
+++ b/res/values-es-rPY/strings.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_upload_files">Archivos</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="sync_string_files">Archivos</string>
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es-rUY/strings.xml b/res/values-es-rUY/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-es-rUY/strings.xml
+++ b/res/values-es-rUY/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7f661730..d78ff809 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Configuración</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="actionbar_send_file">Enviar</string>
+  <string name="actionbar_sort">Ordenar</string>
+  <string name="actionbar_sort_title">Ordenar por</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Más nuevo - Más viejo</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Más</string>
   <string name="prefs_accounts">Cuentas</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index daba47f4..2a23f187 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Seaded</string>
   <string name="actionbar_see_details">Üksikasjad</string>
   <string name="actionbar_send_file">Saada</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Üldine</string>
   <string name="prefs_category_more">Rohkem</string>
   <string name="prefs_accounts">Kontod</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a9461fc0..4afe2756 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="filedetails_download">Deskargatu</string>
   <string name="common_cancel">Ezeztatu</string>
   <string name="empty"></string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fec7404d..78d39f1c 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -11,6 +11,13 @@
   <string name="actionbar_settings">Ezarpenak</string>
   <string name="actionbar_see_details">Xehetasunak</string>
   <string name="actionbar_send_file">Bidali</string>
+  <string name="actionbar_sort">Ordenatu</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Berrienak - Zaharrenak</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Orokorra</string>
   <string name="prefs_category_more">Gehiago</string>
   <string name="prefs_accounts">Kontuak</string>
@@ -236,6 +243,7 @@ Mesedez, baimendu berriz</string>
   <string name="preview_image_description">Irudi aurreikuspena</string>
   <string name="preview_image_error_unknown_format">Ezin da irudi hau erakutsi</string>
   <string name="error__upload__local_file_not_copied">%1$s ezin da %2$s karpeta lokalera kopiatu</string>
+  <string name="prefs_instant_upload_path_title">Igotzetarako Bidea</string>
   <string name="share_link_no_support_share_api">Sentitzen dut, partekatzea ez dago zure zerbitzarian gaituta. Mesedez jarri harremanetan zure administratzailearekin.</string>
   <string name="share_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzerakoan</string>
   <string name="unshare_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzeari uzterakoan</string>
@@ -258,8 +266,12 @@ Mesedez, baimendu berriz</string>
   <string name="downloader_download_file_not_found">Fitxategia jadanik ez dago eskuragarri zerbitzarian</string>
   <string name="prefs_category_accounts">Kontuak</string>
   <string name="prefs_add_account">Gehitu kontua</string>
+  <string name="log_mail_subject">ownCloud Android programaren egunerokoak</string>
+  <string name="log_progress_dialog_text">Datuak kargatzen...</string>
   <string name="saml_authentication_required_text">Autentikazioa beharrezkoa</string>
   <string name="saml_authentication_wrong_pass">Pasahitz okerra</string>
+  <string name="actionbar_move">Mugitu</string>
   <string name="move_choose_button_text">Aukeratu</string>
+  <string name="prefs_category_instant_uploading">Berehalako Igoerak</string>
   <string name="prefs_category_security">Segurtasuna</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6a22f893..80348366 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">تنظیمات</string>
   <string name="actionbar_see_details">جزئیات</string>
   <string name="actionbar_send_file">ارسال</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">عمومی</string>
   <string name="prefs_category_more">بیش‌تر</string>
   <string name="prefs_accounts">حساب‌ها</string>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index 6f02e4bc..18e972fb 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Asetukset</string>
   <string name="actionbar_see_details">Tiedot</string>
   <string name="actionbar_send_file">Lähetä</string>
+  <string name="actionbar_sort">Lajittele</string>
+  <string name="actionbar_sort_title">Lajittelujärjestys</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Ö</item>
+    <item>Uusimmasta vanhimpaan</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Yleiset</string>
   <string name="prefs_category_more">Enemmän</string>
   <string name="prefs_accounts">Tilit</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 17da4a97..90c54a90 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -4,13 +4,21 @@
   <string name="about_version">version %1$s</string>
   <string name="actionbar_sync">Actualiser le compte</string>
   <string name="actionbar_upload">Téléverser</string>
-  <string name="actionbar_upload_from_apps">Contenu d\'une autre application</string>
+  <string name="actionbar_upload_from_apps">Contenu d\'autres applications</string>
   <string name="actionbar_upload_files">Fichiers</string>
   <string name="actionbar_open_with">Ouvrir avec</string>
   <string name="actionbar_mkdir">Nouveau dossier</string>
   <string name="actionbar_settings">Paramètres</string>
   <string name="actionbar_see_details">Détails</string>
   <string name="actionbar_send_file">Envoyer</string>
+  <string name="actionbar_sort">Trier</string>
+  <string name="actionbar_sort_title">Trier par</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Plus récent - Plus ancien</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Général</string>
   <string name="prefs_category_more">Plus</string>
   <string name="prefs_accounts">Comptes</string>
@@ -165,7 +173,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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_unauthorized">Nom d\'utilisateur ou mot de passe incorrect</string>
-  <string name="auth_oauth_error">Echec d\'autorisation</string>
+  <string name="auth_oauth_error">Échec d\'autorisation</string>
   <string name="auth_oauth_error_access_denied">Accès refusé par le serveur d\'autorisation</string>
   <string name="auth_wtf_reenter_URL">État inattendu ; veuillez entrer à nouveau l\'URL du serveur</string>
   <string name="auth_expired_oauth_token_toast">Votre autorisation a expiré. Merci de vous authentifier à nouveau</string>
@@ -243,6 +251,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="preview_image_description">Prévisualisation de l\'image</string>
   <string name="preview_image_error_unknown_format">Cette image ne peut pas être affichée</string>
   <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié dans le dossier local %2$s</string>
+  <string name="prefs_instant_upload_path_title">Chemin d\'accès pour le téléversement</string>
   <string name="share_link_no_support_share_api">Désolé, le partage n\'est pas disponible sur votre serveur. Contactez votre administrateur, s\'il vous plait.</string>
   <string name="share_link_file_no_exist">Impossible de partager. Vérifiez que le fichier est bien présent</string>
   <string name="share_link_file_error">Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire</string>
@@ -267,6 +276,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="downloader_download_file_not_found">Ce fichier n’est plus disponible sur le serveur</string>
   <string name="prefs_category_accounts">Comptes</string>
   <string name="prefs_add_account">Ajouter un compte</string>
+  <string name="auth_redirect_non_secure_connection_title">La connexion sécurisée est redirigée via une route non-sécurisée.</string>
   <string name="actionbar_logger">Journaux</string>
   <string name="log_send_history_button">Envoyer l\'historique</string>
   <string name="log_mail_subject">Journaux de l\'application Android ownCloud</string>
@@ -281,5 +291,6 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="move_file_invalid_overwrite">Le fichier existe déjà dans le dossier de destination</string>
   <string name="move_file_error">Une erreur est survenue lors de la tentative de déplacement de ce fichier ou dossier</string>
   <string name="forbidden_permissions_move">de déplacer ce fichier</string>
+  <string name="prefs_category_instant_uploading">Téléchargements instantanés</string>
   <string name="prefs_category_security">Sécurité</string>
 </resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c169179c..3479d359 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Preferencias</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="actionbar_send_file">Enviar</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Xeral</string>
   <string name="prefs_category_more">Máis</string>
   <string name="prefs_accounts">Contas</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 4ae0072d..9bc427b6 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">הגדרות</string>
   <string name="actionbar_see_details">פרטים</string>
   <string name="actionbar_send_file">שליחה</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">כללי</string>
   <string name="prefs_category_more">יותר</string>
   <string name="prefs_accounts">חשבונות</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6d0355c7..06c5d2b9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">सेटिंग्स</string>
   <string name="actionbar_see_details">विवरण </string>
   <string name="actionbar_send_file">भेजें</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">सामान्य </string>
   <string name="prefs_category_more">और अधिक</string>
   <string name="prefs_accounts">खाते </string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b8dcfc5b..2c986dd5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_mkdir">Nova mapa</string>
   <string name="actionbar_settings">Postavke</string>
   <string name="actionbar_send_file">Pošaljite</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Općenito</string>
   <string name="prefs_category_more">više</string>
   <string name="prefs_accounts">Korisnićki računi</string>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index f5900060..18f000c9 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Beállítások</string>
   <string name="actionbar_see_details">Részletek</string>
   <string name="actionbar_send_file">Küldjük el</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Általános</string>
   <string name="prefs_category_more">Több</string>
   <string name="prefs_accounts">Fiókok</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index eeb78fe8..7994bf47 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="filedetails_download">Ô²Õ¥Õ¼Õ¶Õ¥Õ¬</string>
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml
index 0d79fbde..9bcfedfd 100644
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_mkdir">Nove dossier</string>
   <string name="actionbar_settings">Configurationes</string>
   <string name="actionbar_send_file">Invia</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Plus</string>
   <string name="prefs_help">Adjuta</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index be93270a..1ed5c03a 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Pengaturan</string>
   <string name="actionbar_see_details">Rincian</string>
   <string name="actionbar_send_file">Kirim</string>
+  <string name="actionbar_sort">Urutkan</string>
+  <string name="actionbar_sort_title">Urutan</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Terbaru - Terlawas</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Umum</string>
   <string name="prefs_category_more">Lainnya</string>
   <string name="prefs_accounts">Akun</string>
@@ -84,6 +92,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s berhasil diunggah</string>
   <string name="uploader_upload_failed_ticker">Gagal mengunggah</string>
   <string name="uploader_upload_failed_content_single">Unggah %1$s tidak selesai</string>
+  <string name="uploader_upload_failed_credentials_error">Unggah gagal, Anda perlu masuk ulang</string>
   <string name="downloader_download_in_progress_ticker">Mengunduh...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Mengunduh %2$s</string>
   <string name="downloader_download_succeeded_ticker">Berhasil mengunduh</string>
@@ -168,6 +177,8 @@
   <string name="auth_connecting_auth_server">Menyambungkan ke server otentikasi...</string>
   <string name="auth_unsupported_auth_method">Server tidak mendukung medote otentikasi ini</string>
   <string name="auth_unsupported_multiaccount">%1$s tidak mendukung banyak akun </string>
+  <string name="auth_fail_get_user_name">Server Anda tidak membalas id pengguna dengan banar, Sialakn hubungi Administrator
+	</string>
   <string name="auth_can_not_auth_against_server">Tidak dapat mengotentikasi pada server ini</string>
   <string name="fd_keep_in_sync">Biarkan berkas tetap terbaru</string>
   <string name="common_rename">Ubah nama</string>
@@ -234,12 +245,48 @@
   <string name="conflict_dont_upload">Jangan mengunggah</string>
   <string name="preview_image_description">Pratilik gambar</string>
   <string name="preview_image_error_unknown_format">Gambar ini tidak dapat ditampilkan</string>
+  <string name="error__upload__local_file_not_copied">%1$s tidak dapat disalin ke folder lokal %2$s</string>
+  <string name="prefs_instant_upload_path_title">Jalur Lokasi Unggah</string>
+  <string name="share_link_no_support_share_api">Maaf, berbagi tidak diaktifkan pada server Anda. Silakan hubungi
+		administrator Anda.</string>
+  <string name="share_link_file_no_exist">Tidak dapat berbagi. Mohon periksa apakah berkas ada</string>
+  <string name="share_link_file_error">Terjadi kesalahan saat mencoba membagikan berkas atau folder ini</string>
+  <string name="unshare_link_file_no_exist">Tidak dapat menghapus berbagi. Mohon periksa apakah berkas ada</string>
+  <string name="unshare_link_file_error">Terjadi kesalahan saat mencoba menghapus berbagi berkas dan folder ini</string>
   <string name="activity_chooser_send_file_title">Kirim</string>
+  <string name="copy_link">Salin tautan</string>
   <string name="clipboard_text_copied">Disalin ke papan klip</string>
+  <string name="error_cant_bind_to_operations_service">Kesalahan fatal: tidak dapat melakukan operasi</string>
+  <string name="network_error_socket_exception">Terjadi kesalahan saat menghubungkan dengan server.</string>
+  <string name="network_error_socket_timeout_exception">Terjadi kesalahan saat menunggu balasan server, operasi tidak dapat diselesaikan</string>
+  <string name="network_error_connect_timeout_exception">Terjadi kesalahan saat menunggu balasan server, operasi tidak dapat diselesaikan</string>
+  <string name="network_host_not_available">Operasi tidak dapat diselesaikan, server tidak tersedia</string>
   <string name="empty"></string>
+  <string name="forbidden_permissions">Anda tidak memiliki izin %s</string>
+  <string name="forbidden_permissions_rename">untuk mengubah nama berkas ini</string>
+  <string name="forbidden_permissions_delete">untuk menghapus berkas ini</string>
+  <string name="share_link_forbidden_permissions">untuk membagikan berkas ini</string>
+  <string name="unshare_link_forbidden_permissions">untuk batal membagikan berkas ini</string>
+  <string name="forbidden_permissions_create">untuk membuat berkas</string>
+  <string name="uploader_upload_forbidden_permissions">untuk mengunggah kedalam folder ini</string>
+  <string name="downloader_download_file_not_found">Berkas tidak lagi tersedia pada server</string>
   <string name="prefs_category_accounts">Akun</string>
+  <string name="prefs_add_account">Tambah akun</string>
+  <string name="auth_redirect_non_secure_connection_title">Sambungan aman dialihkan ke rute yang tidak aman.</string>
+  <string name="actionbar_logger">Log</string>
+  <string name="log_send_history_button">Kirim Riwayat</string>
+  <string name="log_mail_subject">Log apl ownCloud Android</string>
+  <string name="log_progress_dialog_text">Memuat data...</string>
   <string name="saml_authentication_required_text">Diperlukan otentikasi</string>
   <string name="saml_authentication_wrong_pass">Sandi salah</string>
+  <string name="actionbar_move">Pindah</string>
+  <string name="file_list_empty_moving">Tdak ada apapun disini. Anda dapat menambahkan sebuah folder!</string>
   <string name="move_choose_button_text">Pilih</string>
+  <string name="move_file_not_found">Tidak dapat memindahkan. Silakan periksa apakah berkas ada</string>
+  <string name="move_file_invalid_into_descendent">Tidak mungkin untuk memindahkan folder kedalam turunannya</string>
+  <string name="move_file_invalid_overwrite">Berkas sudah ada didalam folder tujuan</string>
+  <string name="move_file_error">Terjadi kesalahan saat mencoba memindahkan berkas atau folder ini</string>
+  <string name="forbidden_permissions_move">untuk memindahkan berkas ini</string>
+  <string name="prefs_category_instant_uploading">Unggah Cepat</string>
   <string name="prefs_category_security">Keamanan</string>
 </resources>
diff --git a/res/values-io/strings.xml b/res/values-io/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-io/strings.xml
+++ b/res/values-io/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d6eaedad..81109d51 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -4,6 +4,8 @@
   <string name="actionbar_upload_files">Skrár</string>
   <string name="actionbar_settings">Stillingar</string>
   <string name="actionbar_send_file">Senda</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_more">Meira</string>
   <string name="prefs_help">Hjálp</string>
   <string name="auth_username">Notendanafn</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ffa01f31..4a1c5bda 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Impostazioni</string>
   <string name="actionbar_see_details">Dettagli</string>
   <string name="actionbar_send_file">Invia</string>
+  <string name="actionbar_sort">Ordina</string>
+  <string name="actionbar_sort_title">Ordina per</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Più recente - Più datato</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Generale</string>
   <string name="prefs_category_more">Altro</string>
   <string name="prefs_accounts">Account</string>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index b6d8ffb4..67c1e6e2 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -11,6 +11,10 @@
   <string name="actionbar_settings">設定</string>
   <string name="actionbar_see_details">詳細</string>
   <string name="actionbar_send_file">送信</string>
+  <string name="actionbar_sort">ソート</string>
+  <string name="actionbar_sort_title">ソート: </string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">一般</string>
   <string name="prefs_category_more">もっと見る</string>
   <string name="prefs_accounts">アカウント</string>
diff --git a/res/values-jv/strings.xml b/res/values-jv/strings.xml
index 084a4e3e..0eaa7454 100644
--- a/res/values-jv/strings.xml
+++ b/res/values-jv/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="filedetails_download">Njipuk</string>
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 43b1a456..51ce611f 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -6,6 +6,8 @@
   <string name="actionbar_mkdir">ახალი ფოლდერი</string>
   <string name="actionbar_settings">პარამეტრები</string>
   <string name="actionbar_send_file">გაგზავნა</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">ზოგადი</string>
   <string name="prefs_category_more">უფრო მეტი</string>
   <string name="prefs_accounts">ანგარიში</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 752985c3..b31d4831 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -6,6 +6,8 @@
   <string name="actionbar_settings">ការកំណត់</string>
   <string name="actionbar_see_details">ព័ត៌មាន​លម្អិត</string>
   <string name="actionbar_send_file">ផ្ញើ</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">ទូទៅ</string>
   <string name="prefs_category_more">ច្រើន​ទៀត</string>
   <string name="prefs_accounts">គណនី</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4a0df83f..726c4d52 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">설정</string>
   <string name="actionbar_see_details">세부내용</string>
   <string name="actionbar_send_file">보내기</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">일반</string>
   <string name="prefs_category_more">더 중요함</string>
   <string name="prefs_accounts">계정</string>
diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml
index 2e843f2d..c342c643 100644
--- a/res/values-ku-rIQ/strings.xml
+++ b/res/values-ku-rIQ/strings.xml
@@ -3,6 +3,8 @@
   <string name="actionbar_upload">بارکردن</string>
   <string name="actionbar_upload_files">په‌ڕگەکان</string>
   <string name="actionbar_settings">ده‌ستكاری</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">گشتی</string>
   <string name="prefs_accounts">هەژمارەکان</string>
   <string name="prefs_help">یارمەتی</string>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 19b003ec..cde6e1a7 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -7,6 +7,8 @@
   <string name="actionbar_settings">Astellungen</string>
   <string name="actionbar_see_details">Detailer</string>
   <string name="actionbar_send_file">Schécken</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allgemeng</string>
   <string name="prefs_category_more">Méi</string>
   <string name="prefs_accounts">Accounten</string>
diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml
index 70bc85d5..c9ac6e35 100644
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Nustatymai</string>
   <string name="actionbar_see_details">Informacija</string>
   <string name="actionbar_send_file">Siųsti</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Bendras</string>
   <string name="prefs_category_more">Daugiau</string>
   <string name="prefs_accounts">Paskyros</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 88df8292..581b79cd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -6,6 +6,8 @@
   <string name="actionbar_mkdir">Jauna mape</string>
   <string name="actionbar_settings">Iestatījumi</string>
   <string name="actionbar_send_file">Sūtīt</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Vispārīgi</string>
   <string name="prefs_category_more">Vairāk</string>
   <string name="prefs_accounts">Konti</string>
diff --git a/res/values-mg/strings.xml b/res/values-mg/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-mg/strings.xml
+++ b/res/values-mg/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index e7b4906e..d8edec41 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -7,6 +7,8 @@
   <string name="actionbar_settings">Параметри</string>
   <string name="actionbar_see_details">Детали:</string>
   <string name="actionbar_send_file">Прати</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Општо</string>
   <string name="prefs_category_more">Повеќе</string>
   <string name="prefs_accounts">Сметки</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 75c6f22f..3ee64f03 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_upload_files">ഫയലുകൾ</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="sync_string_files">ഫയലുകൾ</string>
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index af534d2e..808ab65d 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -3,6 +3,8 @@
   <string name="actionbar_upload">Muat naik</string>
   <string name="actionbar_upload_files">Fail-fail</string>
   <string name="actionbar_settings">Set</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Umum</string>
   <string name="prefs_category_more">Lanjutan</string>
   <string name="prefs_accounts">Akaun</string>
diff --git a/res/values-mt-rMT/strings.xml b/res/values-mt-rMT/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-mt-rMT/strings.xml
+++ b/res/values-mt-rMT/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 7f998bf3..2d882a6b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="actionbar_upload_files">ဖိုင်များ</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_help">အကူအညီ</string>
   <string name="auth_username">သုံးစွဲသူအမည်</string>
   <string name="auth_password">စကားဝှက်</string>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index 55e2bb4c..2ad2386e 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Innstillinger</string>
   <string name="actionbar_see_details">Detaljer</string>
   <string name="actionbar_send_file">Send</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Generelt</string>
   <string name="prefs_category_more">Mer</string>
   <string name="prefs_accounts">Kontoer</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f79d9331..ee3f87db 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Instellingen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_send_file">Versturen</string>
+  <string name="actionbar_sort">Sorteren</string>
+  <string name="actionbar_sort_title">Sorteer op</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Nieuwste - Oudste</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Algemeen</string>
   <string name="prefs_category_more">Meer</string>
   <string name="prefs_accounts">Accounts</string>
diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml
index 528bff4f..d9a37a83 100644
--- a/res/values-nn-rNO/strings.xml
+++ b/res/values-nn-rNO/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Innstillingar</string>
   <string name="actionbar_see_details">Detaljar</string>
   <string name="actionbar_send_file">Send</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Generelt</string>
   <string name="prefs_category_more">Meir</string>
   <string name="prefs_accounts">Kontoar</string>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 84ca4981..0d3a45ba 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -3,6 +3,8 @@
   <string name="actionbar_upload">Amontcarga</string>
   <string name="actionbar_upload_files">Fichièrs</string>
   <string name="actionbar_settings">Configuracion</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Mai d\'aquò</string>
   <string name="prefs_accounts">Comptes</string>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index dc0b9e78..b84b0576 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -10,6 +10,8 @@
   <string name="actionbar_settings">ਸੈਟਿੰਗ</string>
   <string name="actionbar_see_details">ਵੇਰਵ</string>
   <string name="actionbar_send_file">ਭੇਜੋ</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">ਆਮ</string>
   <string name="prefs_accounts">ਅਕਾਊਂਟ</string>
   <string name="prefs_log_title">ਲਾਗ ਰੱਖਣਾ ਚਾਲੂ</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8c0a9878..0e84c681 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Ustawienia</string>
   <string name="actionbar_see_details">Szczegóły</string>
   <string name="actionbar_send_file">Wyślij</string>
+  <string name="actionbar_sort">Sortuj</string>
+  <string name="actionbar_sort_title">Sortuj według</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Nowsze - Starsze</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Ogólne</string>
   <string name="prefs_category_more">Więcej</string>
   <string name="prefs_accounts">Konta</string>
@@ -238,6 +246,7 @@
   <string name="preview_image_description">Podgląd</string>
   <string name="preview_image_error_unknown_format">Ten obrazek nie może zostać wyświetlony</string>
   <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego folderu %2$s</string>
+  <string name="prefs_instant_upload_path_title">Katalog wysyłania </string>
   <string name="share_link_no_support_share_api">Przepraszamy, ale współdzielenie nie jest włączone na Twoim serwerze. Proszę skontaktuj się z
 		administratorem.</string>
   <string name="share_link_file_no_exist">Nie można udostępnić. Proszę sprawdzić, czy plik istnieje</string>
@@ -263,8 +272,10 @@
   <string name="downloader_download_file_not_found">Ten plik nie jest już dostępny na serwerze</string>
   <string name="prefs_category_accounts">Konta</string>
   <string name="prefs_add_account">Dodaj konto</string>
+  <string name="auth_redirect_non_secure_connection_title">Bezpieczne połączenie jest przekierowywane przez niezabezpieczone trasy.</string>
   <string name="actionbar_logger">Logi</string>
   <string name="log_send_history_button">Wyślij historię</string>
+  <string name="log_mail_subject">Logi aplikacji ownCloud Android</string>
   <string name="log_progress_dialog_text">Ładuję dane...</string>
   <string name="saml_authentication_required_text">Wymagana autoryzacja</string>
   <string name="saml_authentication_wrong_pass">Złe hasło</string>
@@ -276,5 +287,6 @@
   <string name="move_file_invalid_overwrite">Plik istnieje już w folderze docelowym</string>
   <string name="move_file_error">Pojawił się błąd podczas próby przeniesienia tego pliku lub folderu</string>
   <string name="forbidden_permissions_move">aby przenieść ten plik</string>
+  <string name="prefs_category_instant_uploading">Automatyczne wysyłanie</string>
   <string name="prefs_category_security">Bezpieczeństwo</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3ffb84b8..ea2e5971 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Configurações</string>
   <string name="actionbar_see_details">Detalhes</string>
   <string name="actionbar_send_file">Enviar</string>
+  <string name="actionbar_sort">Classificar</string>
+  <string name="actionbar_sort_title">Classificar por</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Mais Recente - Mais Antigo</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Geral</string>
   <string name="prefs_category_more">Mais</string>
   <string name="prefs_accounts">Contas</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6c4aab17..1012a167 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Definições</string>
   <string name="actionbar_see_details">Detalhes</string>
   <string name="actionbar_send_file">Enviar</string>
+  <string name="actionbar_sort">Ordenar</string>
+  <string name="actionbar_sort_title">Ordenar por</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Mais Recente - Mais Antigo</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Geral</string>
   <string name="prefs_category_more">Mais</string>
   <string name="prefs_accounts">Contas</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b3ea7256..c043dff8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Setări</string>
   <string name="actionbar_see_details">Detalii</string>
   <string name="actionbar_send_file">Expediază</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Mai mult</string>
   <string name="prefs_accounts">Conturi</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 66ad7ad0..326f51a9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Настройки</string>
   <string name="actionbar_see_details">Подробно</string>
   <string name="actionbar_send_file">Отправить</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Основные</string>
   <string name="prefs_category_more">Больше</string>
   <string name="prefs_accounts">Учётные записи</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e64f5775..4a3e9e81 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -3,6 +3,8 @@
   <string name="actionbar_upload">උඩුගත කිරීම</string>
   <string name="actionbar_upload_files">ගොනු</string>
   <string name="actionbar_settings">සිටුවම්</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">සාමාන්‍යයෙන්</string>
   <string name="prefs_category_more">වැඩි</string>
   <string name="prefs_accounts">ගිණුම්</string>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index 76860435..2ab0c280 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Nastavenia</string>
   <string name="actionbar_see_details">Podrobnosti</string>
   <string name="actionbar_send_file">Odoslať</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Všeobecné</string>
   <string name="prefs_category_more">Viac</string>
   <string name="prefs_accounts">Účty</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dcdf6038..b4d46663 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Nastavitve</string>
   <string name="actionbar_see_details">Podrobnosti</string>
   <string name="actionbar_send_file">Pošlji</string>
+  <string name="actionbar_sort">Razvrsti</string>
+  <string name="actionbar_sort_title">Razvrsti po</string>
+  <string-array name="actionbar_sortby">
+    <item>Naraščajoče A – Z</item>
+    <item>Novejše – Starejše</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Splošno</string>
   <string name="prefs_category_more">Več</string>
   <string name="prefs_accounts">Računi</string>
@@ -238,6 +246,7 @@
   <string name="preview_image_description">Predogled slike</string>
   <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
   <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s</string>
+  <string name="prefs_instant_upload_path_title">Pot za pošiljanje</string>
   <string name="share_link_no_support_share_api">Souporaba je na strežniku onemogočena. Možnost lahko spreminjajo le
 		uporabniki s skrbniškimi dovoljenji.</string>
   <string name="share_link_file_no_exist">Souporaba ni mogoča. Preverite, ali datoteka obstaja.</string>
@@ -263,6 +272,7 @@
   <string name="downloader_download_file_not_found">Datoteka na strežniku ni več na voljo.</string>
   <string name="prefs_category_accounts">Računi</string>
   <string name="prefs_add_account">Dodaj račun</string>
+  <string name="auth_redirect_non_secure_connection_title">Varna povezava je preusmerjena preko ne-varne poti.</string>
   <string name="actionbar_logger">Dnevnik</string>
   <string name="log_send_history_button">Pošlji zgodovino</string>
   <string name="log_mail_subject">Dnevnik programa ownCloud</string>
@@ -277,5 +287,6 @@
   <string name="move_file_invalid_overwrite">Datoteka v ciljni mapi že obstaja.</string>
   <string name="move_file_error">Prišlo je do napake med premikanjem datoteke v mapo</string>
   <string name="forbidden_permissions_move">med premikanjem datoteke</string>
+  <string name="prefs_category_instant_uploading">Takojšnje pošiljanje v oblak</string>
   <string name="prefs_category_security">Varnost</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index adeb3e99..798c4b39 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_mkdir">Dosje e\'re</string>
   <string name="actionbar_settings">Parametrat</string>
   <string name="actionbar_send_file">Dërgo</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Përgjithshme</string>
   <string name="prefs_category_more">Më tepër</string>
   <string name="prefs_accounts">Llogarit</string>
diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml
index 973a5489..daac3e01 100644
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_settings">Podešavanja</string>
   <string name="actionbar_see_details">Detaljnije</string>
   <string name="actionbar_send_file">Pošalji</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Opšte</string>
   <string name="prefs_accounts">Nalozi</string>
   <string name="prefs_manage_accounts">Upravljaj nalozima</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2ef13736..5aadabb9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_upload_files">Датотеке</string>
   <string name="actionbar_settings">Поставке</string>
   <string name="actionbar_send_file">Пошаљи</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Опште</string>
   <string name="prefs_category_more">Више</string>
   <string name="prefs_accounts">Налози</string>
diff --git a/res/values-su/strings.xml b/res/values-su/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-su/strings.xml
+++ b/res/values-su/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c077786f..a649518b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Inställningar</string>
   <string name="actionbar_see_details">Detaljer</string>
   <string name="actionbar_send_file">Skicka</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Allmänt</string>
   <string name="prefs_category_more">Mer</string>
   <string name="prefs_accounts">Konton</string>
diff --git a/res/values-sw-rKE/strings.xml b/res/values-sw-rKE/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-sw-rKE/strings.xml
+++ b/res/values-sw-rKE/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 9cce7aeb..5a27ffd0 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">அமைப்புகள்</string>
   <string name="actionbar_see_details">விவரங்கள்</string>
   <string name="actionbar_send_file">அனுப்பவும்</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">பொது</string>
   <string name="prefs_category_more">மேலும்</string>
   <string name="prefs_accounts">கணக்குகள்</string>
diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml
index 8dd0c780..3c3e167a 100644
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_upload_files">கோப்புகள்</string>
   <string name="actionbar_settings">அமைப்புகள்</string>
   <string name="actionbar_see_details">விவரங்கள்</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">பொதுவான</string>
   <string name="prefs_category_more">மேலதிக</string>
   <string name="prefs_accounts">கணக்குகள்</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ac049826..834de750 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -3,6 +3,8 @@
   <string name="actionbar_mkdir">కొత్త సంచయం</string>
   <string name="actionbar_settings">అమరికలు</string>
   <string name="actionbar_send_file">పంపించు</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_more">మరిన్ని</string>
   <string name="prefs_help">సహాయం</string>
   <string name="auth_username">వాడుకరి పేరు</string>
diff --git a/res/values-tg-rTJ/strings.xml b/res/values-tg-rTJ/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-tg-rTJ/strings.xml
+++ b/res/values-tg-rTJ/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 0b141a18..6ed3f19c 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -7,6 +7,8 @@
   <string name="actionbar_settings">ตั้งค่า</string>
   <string name="actionbar_see_details">รายละเอียด</string>
   <string name="actionbar_send_file">ส่ง</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">ทั่วไป</string>
   <string name="prefs_category_more">มาก</string>
   <string name="prefs_accounts">บัญชี</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e5bfe93d..656397b7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Ayarlar</string>
   <string name="actionbar_see_details">Ayrıntılar</string>
   <string name="actionbar_send_file">Gönder</string>
+  <string name="actionbar_sort">Sırala</string>
+  <string name="actionbar_sort_title">Şuna göre sırala</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Yeniden - Eskiye</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Genel</string>
   <string name="prefs_category_more">Daha fazla</string>
   <string name="prefs_accounts">Hesaplar</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index e1140f87..12a54928 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -5,6 +5,8 @@
   <string name="actionbar_mkdir">يېڭى قىسقۇچ</string>
   <string name="actionbar_settings">تەڭشەكلەر</string>
   <string name="actionbar_send_file">يوللا</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">ئادەتتىكى</string>
   <string name="prefs_category_more">تېخىمۇ كۆپ</string>
   <string name="prefs_accounts">ھېساباتلار</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d927e39f..22ab60a4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -11,6 +11,14 @@
   <string name="actionbar_settings">Налаштування</string>
   <string name="actionbar_see_details">Деталі</string>
   <string name="actionbar_send_file">Надіслати</string>
+  <string name="actionbar_sort">Сортувати</string>
+  <string name="actionbar_sort_title">Сортувати за</string>
+  <string-array name="actionbar_sortby">
+    <item>А-Я</item>
+    <item>Новіші-Старіші</item>
+  </string-array>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Основне</string>
   <string name="prefs_category_more">Більше</string>
   <string name="prefs_accounts">Облікові записи</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 1532b7ac..a90a3021 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -2,6 +2,8 @@
 <resources>
   <string name="actionbar_settings">سیٹینگز</string>
   <string name="actionbar_send_file">بھجیں</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_more">مزید</string>
   <string name="prefs_help">مدد</string>
   <string name="auth_username">یوزر نیم</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 56e55a1d..69623e19 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="empty"></string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 122092d1..7e5fe75a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">Cài đặt</string>
   <string name="actionbar_see_details">Chi tiết</string>
   <string name="actionbar_send_file">Gởi</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">Tổng hợp</string>
   <string name="prefs_category_more">hơn</string>
   <string name="prefs_accounts">Tài khoản</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 79255f8d..1b6eab69 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">设置</string>
   <string name="actionbar_see_details">详细信息</string>
   <string name="actionbar_send_file">发送</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">常规</string>
   <string name="prefs_category_more">更多</string>
   <string name="prefs_accounts">账号</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index bd5f2e13..7e5ae525 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -7,6 +7,8 @@
   <string name="actionbar_mkdir">新資料夾</string>
   <string name="actionbar_settings">設定</string>
   <string name="actionbar_send_file">傳送</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">一般</string>
   <string name="prefs_category_more">更多</string>
   <string name="prefs_accounts">帳號</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 91041380..04938d38 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -11,6 +11,8 @@
   <string name="actionbar_settings">設定</string>
   <string name="actionbar_see_details">詳細資料</string>
   <string name="actionbar_send_file">寄出</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">一般</string>
   <string name="prefs_category_more">更多</string>
   <string name="prefs_accounts">帳號</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 97dcfde8..0f7892ee 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -85,6 +85,7 @@ import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
+import com.owncloud.android.utils.DisplayUtils;
 
 /**
  * This Activity is used to add an ownCloud account to the App
@@ -356,7 +357,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         
         /// step 2 - set properties of UI elements (text, visibility, enabled...)
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
-        mHostUrlInput.setText(mServerInfo.mBaseUrl);
+        // Convert IDN to Unicode
+        mHostUrlInput.setText(DisplayUtils.convertIdn(mServerInfo.mBaseUrl, false));
         if (mAction != ACTION_CREATE) {
             /// lock things that should not change
             mHostUrlInput.setEnabled(false);
@@ -737,6 +739,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         showRefreshButton(false);
         
         if (uri.length() != 0) {
+            // Handle internationalized domain names
+            uri = DisplayUtils.convertIdn(uri, true);
             mServerStatusText = R.string.auth_testing_connection;
             mServerStatusIcon = R.drawable.progress_small;
             showServerStatus();
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index d078b1e2..20330931 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -104,7 +104,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
 
                 if (obj != null && obj instanceof LongClickableCheckBoxPreference) {
                     mShowContextMenu = true;
-                    mAccountName = obj.toString();
+                    mAccountName = ((LongClickableCheckBoxPreference) obj).getKey();
 
                     Preferences.this.openContextMenu(listView);
 
@@ -406,7 +406,8 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
             for (Account a : accounts) {
                 LongClickableCheckBoxPreference accountPreference = new LongClickableCheckBoxPreference(this);
                 accountPreference.setKey(a.name);
-                accountPreference.setTitle(a.name);
+                // Handle internationalized domain names
+                accountPreference.setTitle(DisplayUtils.convertIdn(a.name, false));
                 mAccountsPrefCategory.addPreference(accountPreference);
 
                 // Check the current account that is being used
diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 682d2be0..8c4c492b 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -18,6 +18,7 @@
 
 package com.owncloud.android.utils;
 
+import java.net.IDN;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -25,6 +26,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
+import android.annotation.TargetApi;
+import android.os.Build;
+
 import com.owncloud.android.R;
 
 /**
@@ -235,4 +239,35 @@ public class DisplayUtils {
             return R.drawable.icon;
         }
     }
+    
+    /**
+     * Converts an internationalized domain name (IDN) in an URL to and from ASCII/Unicode.
+     * @param url the URL where the domain name should be converted
+     * @param toASCII if true converts from Unicode to ASCII, if false converts from ASCII to Unicode
+     * @return the URL containing the converted domain name
+     */
+    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
+    public static String convertIdn(String url, boolean toASCII) {
+        
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+            // Find host name after '//' or '@'
+            int hostStart = 0;
+            if  (url.indexOf("//") != -1) {
+                hostStart = url.indexOf("//") + "//".length();
+            } else if (url.indexOf("@") != -1) {
+                hostStart = url.indexOf("@") + "@".length();
+            }
+            
+            int hostEnd = url.substring(hostStart).indexOf("/");
+            // Handle URL which doesn't have a path (path is implicitly '/')
+            hostEnd = (hostEnd == -1 ? url.length() : hostStart + hostEnd);
+            
+            String host = url.substring(hostStart, hostEnd);
+            host = (toASCII ? IDN.toASCII(host) : IDN.toUnicode(host));
+            
+            return url.substring(0, hostStart) + host + url.substring(hostEnd);
+        } else {
+            return url;
+        }
+    }
 }