Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support

.travis.yml

@@ -3,9 +3,10 @@ jdk: oraclejdk7
 before_install:
   # Install base Android SDK
     - sudo apt-get update -qq
-    - sudo apt-get install -qq libstdc++6:i386 lib32z1
-    - export COMPONENTS=build-tools-18.1.0,android-14,android-17,android-19,sysimg-19,extra-android-support
-    - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
+    - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
+    - export COMPONENTS="build-tools-20.0.0,android-14,android-17,android-19,sysimg-19,extra-android-support"
+    - export LICENSES="android-sdk-license-5be876d5|android-sdk-license-598b93a6"
+    - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS --accept=$LICENSES
     - source ~/.android-sdk-installer/env
     - rm pom.xml
     - ./setup_env.sh

owncloud-android-library

@@ -1 +1 @@
-Subproject commit 8080e4904de8f042fdff17691674e900607c66a8
+Subproject commit 3c116514fb33992d050f7051e756b6c2244953b0

res/layout/list_item.xml

@@ -103,15 +103,34 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
     <ImageView
-        android:id="@+id/shareIcon"
+        android:id="@+id/sharedIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="4dp"
         android:layout_marginRight="4dp"
         android:src="@drawable/sharedlink" />
 
+    <ImageView
+        android:id="@+id/sharedWithMeIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="4dp"
+        android:src="@drawable/shared_with_me" />
+
+    </LinearLayout>
+
     <ImageView
         android:id="@+id/custom_checkbox"
         android:layout_width="wrap_content"

res/values-ar/strings.xml

@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">تم رفع %1$s  بنجاح </string>
   <string name="uploader_upload_failed_ticker">فشل الرفع</string>
   <string name="uploader_upload_failed_content_single">لم يكتمل رفع  %1$s </string>
+  <string name="uploader_upload_failed_credentials_error">فشل الرفع, تحتاج للدخول مرة أخرى</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>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">فشل التحميل</string>
   <string name="downloader_download_failed_content"> لم يكتمل تحميل %1$s</string>
   <string name="downloader_not_downloaded_yet">لم يتم تحميلها بعد</string>
+  <string name="downloader_download_failed_credentials_error">فشل التحميل, تحتاج للدخول مرة أخرى</string>
   <string name="common_choose_account">اختر حسابا</string>
   <string name="sync_fail_ticker">فشلت المزامنة.</string>
   <string name="sync_fail_content">لم تكتمل مزامنة %1$s  </string>
@@ -99,13 +101,14 @@
   <string name="sync_fail_in_favourites_content"> لا يمكن مزامنة جهات اتصال %1$d  ( %2$d تعارض) </string>
   <string name="sync_foreign_files_forgotten_ticker">تم نسيان بعض الملفات المحلية</string>
   <string name="sync_foreign_files_forgotten_content">%1$d لا يمكن نسخها داخل المجلد %2$s الملفات الخارجه من المجلد</string>
+  <string name="sync_foreign_files_forgotten_explanation">اعتبارا من اﻹصدار 1.3.16, الملفات المرفوعة من هذا الجهاز يتم نسخها إلى المجلد المحلي %1$s تفادياً لفقدان البيانات حينما تتم مزامنة ملف واحد مع عدة حسابات.\n\nنظراً لهذا التغيير، تم نسخ كل الملفات المرفوعة في اﻹصدارات السابقة إلى المجلد %2$s . لكن خطأً ما حال دون إتمام العملية أثناء مزامنة الحسابات. يمكنك إما ترك هذه الملفات و حذف الرابط إلى %3$s ، و إما نقل الملفات إلى المجلد %1$s و الإحتفاظ بالرابط إلى %4$s \n\nفيما يلي الملفات المحلية، و المفات الخارجية المرتبطة بها في %5$s</string>
   <string name="sync_current_folder_was_removed">لا يوجد مجلد %1$s بعد الان</string>
   <string name="foreign_files_move">نقل الكل</string>
   <string name="foreign_files_success">تم نقل جميع الملفات</string>
   <string name="foreign_files_fail">لم ينجح نقل بعض الملفات</string>
   <string name="foreign_files_local_text">محلي :%1$s</string>
   <string name="foreign_files_remote_text">خارجي : %1$s</string>
-  <string name="upload_query_move_foreign_files">لا يوجد مساحة كافية لنسخ الملفات المحددة إلى مجلد  %1$s . هل ترغب بنقلها بدلاَ من ذلك؟</string>
+  <string name="upload_query_move_foreign_files">لا يوجد مساحة كافية لنسخ الملفات المحددة لمجلد  %1$s . هل ترغب بنقلهم بدلاً من ذلك؟</string>
   <string name="pincode_enter_pin_code">يرجى إدخال كلمة السر</string>
   <string name="pincode_configure_your_pin">أدخل كلمة السر</string>
   <string name="pincode_configure_your_pin_explanation">سيتم طلب PIN في كل مرة يتم فيها تشغيل التطبيق</string>
@@ -164,9 +167,12 @@
   <string name="auth_unsupported_auth_method">الخادم لا يدعم طريقة التحقق هذه</string>
   <string name="auth_unsupported_multiaccount">%1$s لا يدعم الحسابات المتعددة </string>
   <string name="auth_fail_get_user_name">الخادم الخاص بك لم يعد الإتصال بهويتك الصحيحة, الرجاء الإتصال بالمسؤول\n\t</string>
+  <string name="auth_can_not_auth_against_server">لا يمكن المصادقة من الخادم</string>
   <string name="fd_keep_in_sync"> جعل الملف محدثا</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>
@@ -180,6 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">تمت  مزامنة محتويات الملفات من قبل</string>
   <string name="create_dir_fail_msg">لايمكن إنشاء المجلد</string>
   <string name="filename_forbidden_characters">رموز ممنوعة: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">إسم الملف لا يمكن أن يكون فارغاً</string>
   <string name="wait_a_moment">انتظر للحظة</string>
   <string name="filedisplay_unexpected_bad_get_content">خطا غير متوقع : الرجاء اختيار الملف من تطبيق آخر</string>
   <string name="filedisplay_no_file_selected">لم يتم اختيار أي ملف</string>
@@ -225,6 +232,7 @@
   <string name="conflict_overwrite">استبدال</string>
   <string name="conflict_dont_upload">عدم الرفع</string>
   <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="actionbar_failed_instant_upload">فشل في محاولة الرفع الفوري</string>
   <string name="failed_upload_headline_text">فشل في الرفع الفوري</string>
@@ -233,6 +241,7 @@
   <string name="failed_upload_headline_retryall_btn">اعادة كل المختارات</string>
   <string name="failed_upload_headline_delete_all_btn">حذف كل المختارات من قائمة انتظار الرفع</string>
   <string name="failed_upload_retry_text">اعادة المحاولة لرفع الصورة:</string>
+  <string name="failed_upload_load_more_images">تحميل المزيد من الصور</string>
   <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
   <string name="failed_upload_failure_text">رسالة خطا:</string>
   <string name="failed_upload_quota_exceeded_text">الرجاء التاكد من اعدادات الخادم, من الممكن انك تعديت الحد في quota</string>
@@ -244,4 +253,9 @@
   <string name="activity_chooser_send_file_title">أرسل</string>
   <string name="copy_link">نسخ الرابط</string>
   <string name="clipboard_text_copied">تم النسخ للحافظة</string>
+  <string name="error_cant_bind_to_operations_service">خطأ حرج: لا يمكن تنفيذ العمليات</string>
+  <string name="network_error_socket_exception">حدث خطأ أثناء الإتصال مع الخادم.</string>
+  <string name="network_error_socket_timeout_exception">حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية</string>
+  <string name="network_error_connect_timeout_exception">حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية</string>
+  <string name="network_host_not_available">تعذر إكمال العملية، الخادم غير متوفر</string>
 </resources>

res/values-ca/strings.xml

@@ -167,9 +167,12 @@
   <string name="auth_unsupported_auth_method">El serivdor no permet aquest mètode d\'autenticació</string>
   <string name="auth_unsupported_multiaccount">%1$s no permet comptes múltiples</string>
   <string name="auth_fail_get_user_name">El servidor no retorna una id d\'usuari correcta, contacteu amb l\'administrador.</string>
+  <string name="auth_can_not_auth_against_server">No es pot autenticar en aquest servidor</string>
   <string name="fd_keep_in_sync">Mantén el fitxer actualitzat</string>
   <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>
@@ -229,6 +232,7 @@
   <string name="conflict_overwrite">Sobrescriu</string>
   <string name="conflict_dont_upload">No el pugis</string>
   <string name="preview_image_description">Visualització prèvia d\'imatge</string>
+  <string name="preview_image_error_unknown_format">Aquesta imatge no es pot mostrar</string>
   <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
   <string name="actionbar_failed_instant_upload">La pujada instantània ha fallat</string>
   <string name="failed_upload_headline_text">Fallada de pujades instantànies</string>
@@ -237,6 +241,7 @@
   <string name="failed_upload_headline_retryall_btn">reintenta els seleccionats</string>
   <string name="failed_upload_headline_delete_all_btn">elimina tots els seleccionats de la cua de pujada</string>
   <string name="failed_upload_retry_text">intenta pujar de nou la imatge:</string>
+  <string name="failed_upload_load_more_images">Carrega més fotos</string>
   <string name="failed_upload_retry_do_nothing_text">no facis res, no estàs en lína per la pujada instantània</string>
   <string name="failed_upload_failure_text">Missatge d\'Error:</string>
   <string name="failed_upload_quota_exceeded_text">Comproveu la configuració del servidor, potser heu excedit la quota.</string>
@@ -248,7 +253,9 @@
   <string name="activity_chooser_send_file_title">Envia</string>
   <string name="copy_link">Copia l\'enllaç</string>
   <string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
+  <string name="error_cant_bind_to_operations_service">Error crític: no es poden realitzar operacions</string>
   <string name="network_error_socket_exception">Hi ha hagut un error mentre es connectava al servidor.</string>
   <string name="network_error_socket_timeout_exception">Hi ha hagut un error esperant al servidor, l\'operació no s\'ha pogut realitzar</string>
   <string name="network_error_connect_timeout_exception">Hi ha hagut un error esperant el servidor, l\'operació no s\'ha pogut realitzar</string>
+  <string name="network_host_not_available">La operació no s\'ha pogut completar, no es pot accedir al servidor</string>
 </resources>

res/values-cs-rCZ/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Některé soubory nebylo možno přesunout</string>
   <string name="foreign_files_local_text">Místní: %1$s</string>
   <string name="foreign_files_remote_text">Vzdálené: %1$s</string>
-  <string name="upload_query_move_foreign_files">Nedostatek místa pro zkopírování vybraných souborů do složky %1$s. Přejete si je místo kopírování přesunout?</string>
+  <string name="upload_query_move_foreign_files">Není dostatek místa pro kopírování vybraných souborů do adresáře %1$s. Přejete si je místo kopírování přesunout?</string>
   <string name="pincode_enter_pin_code">Zadejte PIN aplikace</string>
   <string name="pincode_configure_your_pin">Zadat PIN 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>
@@ -172,6 +172,7 @@
   <string name="common_rename">Přejmenovat</string>
   <string name="common_remove">Odstranit</string>
   <string name="confirmation_remove_alert">Opravdu chcete odstranit %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Opravdu chcete 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>

res/values-cy-rGB/strings.xml

@@ -70,7 +70,6 @@
   <string name="foreign_files_fail">Methwyd symud rhai ffeiliau</string>
   <string name="foreign_files_local_text">Lleol: %1$s</string>
   <string name="foreign_files_remote_text">Pell: %1$s</string>
-  <string name="upload_query_move_foreign_files">Does dim digon o le i gopïo\'r ffeiliau ddewiswyd i blygell %1$s . Would like to move them into instead? </string>
   <string name="pincode_enter_pin_code">Cyflwynwch PIN eich Ap</string>
   <string name="pincode_configure_your_pin">Cyflwynwch PIN eich Ap</string>
   <string name="pincode_configure_your_pin_explanation">Bydd cais am y PIN bob tro mae\'r ap yn cychwyn</string>

res/values-da/strings.xml

@@ -108,7 +108,6 @@
   <string name="foreign_files_fail">Visse filer kunne ikke flyttes</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Fjernplacering: %1$s</string>
-  <string name="upload_query_move_foreign_files">Der er ikke tilstrækkelig plads til at kopiere de valgte filer ind i %1$s mappen. Vil du flytte dem i stedet?</string>
   <string name="pincode_enter_pin_code">Indsæt venligst din App PIN</string>
   <string name="pincode_configure_your_pin">Indtast App PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN koden vil blive anmodet om hver gang applikationen bliver startet</string>

res/values-de-rCH/strings.xml

@@ -92,7 +92,6 @@
   <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie sie stattdessen verschieben?</string>
   <string name="pincode_enter_pin_code">Bitte geben Sie Ihre 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>

res/values-de-rDE/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie sie stattdessen verschieben?</string>
+  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie diese stattdessen verschieben?</string>
   <string name="pincode_enter_pin_code">Bitte geben Sie Ihre 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>

res/values-de/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchtest Du sie stattdessen verschieben?</string>
+  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchtest du diese stattdessen verschieben?</string>
   <string name="pincode_enter_pin_code">Bitte gib Deine App-PIN ein</string>
   <string name="pincode_configure_your_pin">Bitte gib Deine App-PIN ein</string>
   <string name="pincode_configure_your_pin_explanation">PIN-Abfrage erfolgt nach Starten der App.</string>

res/values-el/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="about_android">Εφαρμογή %1$s για Android</string>
+  <string name="about_android">Εφαρμογή %1$s Android</string>
   <string name="about_version">έκδοση %1$s</string>
   <string name="actionbar_sync">Ανανέωση λογαριασμού</string>
   <string name="actionbar_upload">Μεταφόρτωση</string>
@@ -14,12 +14,12 @@
   <string name="prefs_category_general">Γενικά</string>
   <string name="prefs_category_more">Περισσότερα</string>
   <string name="prefs_accounts">Λογαριασμοί</string>
-  <string name="prefs_manage_accounts">Διαχείριση λογαριασμών</string>
-  <string name="prefs_pincode">PIN για πρόσβαση στην εφαρμογή</string>
-  <string name="prefs_pincode_summary">Προστατέψτε την εφαρμογή</string>
-  <string name="prefs_instant_upload">Στιγμιαίες φορτώσεις εικόνων</string>
-  <string name="prefs_instant_upload_summary">Ανεβάστε απευθείας φωτογραφίες από την κάμερα.</string>
-  <string name="prefs_instant_video_upload">Στιγμιαίες φορτώσεις βίντεο</string>
+  <string name="prefs_manage_accounts">Διαχείριση Λογαριασμών</string>
+  <string name="prefs_pincode">PIN εφαρμογής</string>
+  <string name="prefs_pincode_summary">Προστατέψτε το δέκτη σας</string>
+  <string name="prefs_instant_upload">Στιγμιαίες μεταφορτώσεις εικόνων</string>
+  <string name="prefs_instant_upload_summary">Μεταφορτώστε απευθείας φωτογραφίες από την κάμερα</string>
+  <string name="prefs_instant_video_upload">Στιγμιαίες μεταφορτώσεις βίντεο</string>
   <string name="prefs_instant_video_upload_summary">Άμεση μεταφόρτωση των βίντεο από την φωτογραφική μηχανή</string>
   <string name="prefs_log_title">Ενεργοποίηση Καταγραφής Ιστορικού</string>
   <string name="prefs_log_summary">Χρησιμοποιείται για την καταγραφή προβλημάτων</string>
@@ -33,21 +33,21 @@
   <string name="recommend_subject">Δοκιμάστε %1$s στο κινητό σας!</string>
   <string name="recommend_text">Θέλω να σας προσκαλέσω να χρησιμοποιήσετε το %1$s στο κινητό σας!\nΚατεβάστε το εδώ: %2$s</string>
   <string name="auth_check_server">Έλεγχος Διακομιστή</string>
-  <string name="auth_host_url">Διεύθυνση εξυπηρέτη https://…</string>
+  <string name="auth_host_url">Διεύθυνση διακομιστή https://…</string>
   <string name="auth_username">Όνομα χρήστη</string>
   <string name="auth_password">Συνθηματικό</string>
   <string name="auth_register">Νέοι στο %1$s;</string>
   <string name="sync_string_files">Αρχεία</string>
   <string name="setup_btn_connect">Σύνδεση</string>
   <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
-  <string name="uploader_top_message">Επιλέξτε φάκελο μεταφορτώσεων.</string>
+  <string name="uploader_top_message">Επιλέξτε φάκελο μεταφορτώσεων:</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_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_error_forbidden_content">Ο %1$s δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
   <string name="uploader_info_uploading">Μεταφόρτωση</string>
   <string name="file_list_empty">Δεν υπάρχουν αρχεία σε αυτόν τον φάκελο.\nΝέα αρχεία μπορούν να προστεθούν με την επιλογή \"Μεταφόρτωση\" του μενού.</string>
   <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
@@ -57,62 +57,62 @@
   <string name="filedetails_modified">Τροποποιήθηκε:</string>
   <string name="filedetails_download">Λήψη</string>
   <string name="filedetails_sync_file">Ανανέωση αρχείου</string>
-  <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά την μεταφόρτωση</string>
+  <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά τη μεταφόρτωση</string>
   <string name="action_share_file">Διαμοιρασμός συνδέσμου</string>
   <string name="action_unshare_file">Ακύρωση διαμοιρασμού συνδέσμου</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_upload">Ακύρωση μεταφόρτωσης</string>
   <string name="common_cancel">Άκυρο</string>
   <string name="common_save_exit">Αποθήκευση &amp; Έξοδος</string>
   <string name="common_error">Σφάλμα</string>
   <string name="common_loading">Φόρτωση ...</string>
   <string name="common_error_unknown">Άγνωστο σφάλμα</string>
   <string name="about_title">Σχετικά</string>
-  <string name="change_password">Αλλαγή συνθηματικού</string>
+  <string name="change_password">Αλλαγή κωδικού πρόσβασης</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_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_failed_ticker">Η μεταφόρτωση απέτυχε</string>
   <string name="uploader_upload_failed_content_single">Η μεταφόρτωση του %1$s δεν ήταν δυνατόν να ολοκληρωθεί</string>
-  <string name="uploader_upload_failed_credentials_error">Η μεταφόρτωση απέτυχε, πρέπει να εισάγετε ξανά τον κωδικό σας</string>
+  <string name="uploader_upload_failed_credentials_error">Η μεταφόρτωση απέτυχε, πρέπει να επανασυνδεθείτε</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="downloader_not_downloaded_yet">Δεν έχει κατέβει ακόμα</string>
-  <string name="downloader_download_failed_credentials_error">Η λήψη απέτυχε, πρέπει να εισάγετε ξανά τον κωδικό σας</string>
+  <string name="downloader_download_failed_content">Η λήψη του %1$s δεν μπόρεσε να ολοκληρωθεί</string>
+  <string name="downloader_not_downloaded_yet">Δεν έχει ληφθεί ακόμα</string>
+  <string name="downloader_download_failed_credentials_error">Η λήψη απέτυχε, πρέπει να επανασυνδεθείτε</string>
   <string name="common_choose_account">Επιλογή λογαριασμού</string>
   <string name="sync_fail_ticker">Ο συγχρονισμός απέτυχε</string>
-  <string name="sync_fail_content">Ο συγχρονισμός του %1$s  δεν μπόρεσε να ολοκληρωθεί</string>
+  <string name="sync_fail_content">Ο συγχρονισμός του %1$s δεν μπόρεσε να ολοκληρωθεί</string>
   <string name="sync_fail_content_unauthorized">Λάθος κωδικός για %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Βρέθηκαν συγκρούσεις</string>
-  <string name="sync_conflicts_in_favourites_content">%1$d αρχεία σε αναμονή συγχρονισμού, δεν μπόρεσαν να συγχρονιστούν</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="sync_foreign_files_forgotten_ticker">Ορισμένα τοπικά αρχεία ξεχάστηκαν</string>
-  <string name="sync_foreign_files_forgotten_content">%1$d αρχεία από τον %2$s χώρο αποθήκευσης δεν είναι δυνατό να αντιγραφούν σε</string>
-  <string name="sync_foreign_files_forgotten_explanation">Από την έκδοση 1.3.16 και μετά, αρχεία που μεταφορτώνονται από αυτήν τη συσκευή αντιγράφονται στον τοπικό φάκελο %1$s για να αποτραπεί η απώλεια δεδομένων όταν ένα αρχείο είναι συγχρονισμένο με πολλαπλούς λογαριασμούς.\nΛόγω αυτής της αλλαγής, όλα τα αρχεία που μεταφορτώθηκαν με προηγούμενες εκδόσεις αυτής της εφαρμογής αντιγράφηκαν στον φάκελο %2$s. Ωστόσο, ένα σφάλμα εμπόδισε την ολοκλήρωση αυτής της εργασίας κατά το συγχρονισμό του λογαριασμού. Μπορείτε είτε να αφήσετε τα αρχεία όπως είναι και να καταργήσετε τη σύνδεση με το %3$s ή να μετακινήσετε τα αρχεία στον κατάλογο %1$s και να διατηρήσετε τη σύνδεση με το %4$s.\n\nΑπαριθμημένα πιο κάτω είναι το/τα τοπικό/ά αρχείο/α και το/τα απομακρυσμένο/α αρχείο/α στο %5$s με το/τα οποίο/α συνδέονταν.</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d αρχεία από τον %2$s χώρο αποθήκευσης δεν ήταν δυνατό να αντιγραφούν σε</string>
+  <string name="sync_foreign_files_forgotten_explanation">Από την έκδοση 1.3.16 και μετά, αρχεία που μεταφορτώνονται από αυτήν τη συσκευή αντιγράφονται στον τοπικό φάκελο %1$s για να αποτραπεί η απώλεια δεδομένων όταν ένα αρχείο είναι συγχρονισμένο με πολλαπλούς λογαριασμούς.\nΛόγω αυτής της αλλαγής, όλα τα αρχεία που μεταφορτώθηκαν με προηγούμενες εκδόσεις αυτής της εφαρμογής αντιγράφηκαν στον φάκελο %2$s. Ωστόσο, ένα σφάλμα εμπόδισε την ολοκλήρωση αυτής της εργασίας κατά το συγχρονισμό του λογαριασμού. Μπορείτε είτε να αφήσετε το(α) αρχείο(α) όπως είναι και να καταργήσετε τη σύνδεση με το %3$s ή να μετακινήσετε τα αρχεία στο φάκελο %1$s και να διατηρήσετε τη σύνδεση με το %4$s.\n\nΑπαριθμημένα πιο κάτω είναι το(α) τοπικό(ά) αρχείο(α) και το(α) απομακρυσμένο(α) αρχείο(α) στο %5$s με το(α) οποίο(α) συνδέονταν.</string>
   <string name="sync_current_folder_was_removed">Ο φάκελος %1$s δεν υπάρχει πια</string>
-  <string name="foreign_files_move">Μετακινηση ολων</string>
-  <string name="foreign_files_success">Ολα τα αρχεια μετακινηθηκαν</string>
-  <string name="foreign_files_fail">Μερικα αρχεια δεν μπορεσαν να μετακινηθουν</string>
-  <string name="foreign_files_local_text">Τοπικα: %1$s</string>
-  <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">Δεν υπαρχει αρκετος χωρος για να αντιγραφθουν τα επιλεγμενα αρχεια στον χωρο αποθηκευσης  %1$s. Θελετε να μετακινηθουν μερικα?</string>
-  <string name="pincode_enter_pin_code">Παρακαλώ, εισάγετε το PIN σας</string>
+  <string name="foreign_files_move">Μετακίνηση όλων</string>
+  <string name="foreign_files_success">Όλα τα αρχεία μετακινήθηκαν</string>
+  <string name="foreign_files_fail">Μερικά αρχεία δεν μπόρεσαν να μετακινηθούν</string>
+  <string name="foreign_files_local_text">Τοπικά: %1$s</string>
+  <string name="foreign_files_remote_text">Απομακρυσμένα: %1$s</string>
+  <string name="upload_query_move_foreign_files">Δεν υπάρχει αρκετός διαθέσιμος αποθηκευτικός χώρος για να αντιγραφούν τα επιλεγμένα αρχεία στον φάκελο %1$s. Θα θέλατε να τα μετακινήσετε αντί αυτού;</string>
+  <string name="pincode_enter_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">Παρακαλώ επαναεισάγετε το PIN της εφαρμογής</string>
+  <string name="pincode_configure_your_pin_explanation">Το PIN θα ζητείται κάθε φορά που εκκινείται η εφαρμογή</string>
+  <string name="pincode_reenter_your_pincode">Παρακαλώ επανεισάγετε το PIN της εφαρμογής</string>
   <string name="pincode_remove_your_pincode">Αφαιρέστε τον PIN της εφαρμογής</string>
   <string name="pincode_mismatch">Δεν ταιριάζουν τα PIN της εφαρμογής </string>
   <string name="pincode_wrong">Εσφαλμένο PIN της εφαρμογής</string>
@@ -127,96 +127,96 @@
   <string name="media_err_not_in_owncloud">Το αρχείο δεν βρίσκεται σε έγκυρο λογαριασμό</string>
   <string name="media_err_unsupported">Αυτή η μορφή κωδικοποιήσης πολυμέσων δεν υποστηρίζεται</string>
   <string name="media_err_io">Το αρχείο πολυμέσων δεν μπόρεσε να διαβαστεί</string>
-  <string name="media_err_malformed">Το αρχείο πολυμέσων δεν είναι σωστά κοδικοποιημένο</string>
+  <string name="media_err_malformed">Το αρχείο πολυμέσων δεν είναι κωδικοποιημένο σωστά </string>
   <string name="media_err_timeout">Λήξη χρόνου κατά την προσπάθεια αναπαραγωγής</string>
   <string name="media_err_invalid_progressive_playback">Το αρχείο πολυμέσων δεν μπορεί να μεταδοθεί</string>
   <string name="media_err_unknown">Το αρχείο πολυμέσων δεν μπορεί να αναπαραχθεί με την παρεχόμενη εφαρμογή αναπαραγωγής πολυμέσων</string>
   <string name="media_err_security_ex">Σφάλμα ασφαλείας κατά την προσπάθεια αναπαραγωγής του %1$s</string>
   <string name="media_err_io_ex">Σφάλμα εισόδου κατά την προσπάθεια αναπαραγωγής του %1$s</string>
-  <string name="media_err_unexpected">Απροσδόκτο σφάλμα κατά την προσπάθεια αναπαραγωγής του %1$s</string>
+  <string name="media_err_unexpected">Απροσδόκητο σφάλμα κατά την προσπάθεια αναπαραγωγής του %1$s</string>
   <string name="media_rewind_description">Κουμπί επαναφοράς</string>
   <string name="media_play_pause_description">Κουμπί αναπαραγωγής ή παύσης</string>
   <string name="media_forward_description">Κουμπί προώθησης</string>
-  <string name="auth_getting_authorization">Λήψη πιστοποιητικού...</string>
+  <string name="auth_getting_authorization">Λήψη πιστοποίησης...</string>
   <string name="auth_trying_to_login">Προσπάθεια σύνδεσης...</string>
   <string name="auth_no_net_conn_title">Δεν υπάρχει σύνδεση στο δίκτυο</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">Λανθασμένες ρυθμίσεις </string>
+  <string name="auth_not_configured_title">Λανθασμένες ρυθμίσεις διακομιστή</string>
   <string name="auth_account_not_new">Ένας λογαριασμός για τον ίδιο χρήστη και διακομιστή υπάρχει ήδη στη συσκευή</string>
   <string name="auth_account_not_the_same">Ο χρήστης που εισάγατε δεν ταιριάζει με το χρήστη αυτού του λογαριασμού</string>
-  <string name="auth_unknown_error_title">Παρουσιάστηκε άγνωστο σφάλμα</string>
-  <string name="auth_unknown_host_title">Δεν βρέθηκε υπολογιστής</string>
-  <string name="auth_incorrect_path_title">Δεν βρέθηκε παρουσία του εξυπηρετητή σας</string>
-  <string name="auth_timeout_title">Ο εξυπηρετητής αργεί πολύ να απαντήσει</string>
+  <string name="auth_unknown_error_title">Παρουσιάστηκε άγνωστο σφάλμα!</string>
+  <string name="auth_unknown_host_title">Δεν βρέθηκε κόμβος</string>
+  <string name="auth_incorrect_path_title">Δεν βρέθηκε εγκατεστημένος διακομιστής</string>
+  <string name="auth_timeout_title">Ο διακομιστής αργεί πολύ να απαντήσει</string>
   <string name="auth_incorrect_address_title">Κακώς διατυπωμένο URL</string>
   <string name="auth_ssl_general_error_title">Η αρχικοποίηση του SLL απέτυχε</string>
-  <string name="auth_ssl_unverified_server_title">Αδυναμία επιβεβαίωσης την ταυτότητα SSL του διακομιστή</string>
-  <string name="auth_bad_oc_version_title">Μη αναγνωρίσιμη έκδοση διακομιστή server σας</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_unauthorized">Λάθος όνομα χρήστη ή κωδικός</string>
   <string name="auth_oauth_error">Η πιστοποίηση απέτυχε</string>
   <string name="auth_oauth_error_access_denied">Ο διακομιστής πιστοποίησης αρνήθηκε την πρόσβαση</string>
   <string name="auth_wtf_reenter_URL">Απρόοπτη κατάσταση - παρακαλώ εισάγετε τη διεύθυνση URL του διακομιστή ξανά</string>
-  <string name="auth_expired_oauth_token_toast">Η εξουσιοδότησή σας έληξε. Παρακαλώ εξουσιοδοτείστε ξανά</string>
-  <string name="auth_expired_basic_auth_toast">Παρακαλώ είσάγετε τον τρέχοντα κωδικό</string>
+  <string name="auth_expired_oauth_token_toast">Η πιστοποιίησή σας έληξε. Παρακαλώ πιστοποιήστε ξανά</string>
+  <string name="auth_expired_basic_auth_toast">Παρακαλώ εισάγετε τον τρέχοντα κωδικό πρόσβασης</string>
   <string name="auth_expired_saml_sso_token_toast">Η συνεδρία σας έληξε. Παρακαλώ συνδεθείτε ξανά</string>
   <string name="auth_connecting_auth_server">Σύνδεση με το διακομιστή πιστοποίησης σε εξέλιξη...</string>
   <string name="auth_unsupported_auth_method">Ο διακομιστής δεν υποστηρίζει αυτή τη μέθοδο πιστοποίησης</string>
   <string name="auth_unsupported_multiaccount">Ο %1$s  δεν υποστηρίζει πολλαπλούς λογαριασμούς</string>
-  <string name="auth_fail_get_user_name">Ο διακομιστής σας δεν επιστρέφει το σωστό χαρακτηριστικό χρήστη, παρακαλώ επικοινωνήστε με έναν διαχειριστή\n</string>
-  <string name="auth_can_not_auth_against_server">Δεν είναι δυνατός ο έλεγχος ταυτότητας με αυτόν τον διακομιστή</string>
+  <string name="auth_fail_get_user_name">Ο διακομιστής σας δεν επιστρέφει το σωστό αναγνωριστικό χρήστη, παρακαλώ επικοινωνήστε με ένα διαχειριστή\n⇥</string>
+  <string name="auth_can_not_auth_against_server">Δεν είναι δυνατή η πιστοποίηση με αυτόν το διακομιστή</string>
   <string name="fd_keep_in_sync">Διατήρηση αρχείου σε ενημέρωση</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="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="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_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="create_dir_fail_msg">Η δημιουργία φακέλου απέτυχε</string>
   <string name="filename_forbidden_characters">Μη-επιτρεπόμενοι χαρακτήρες: / \\ &lt; &gt; : \" | ? *</string>
   <string name="filename_empty">Το όνομα αρχείου δεν μπορεί να είναι κενό.</string>
   <string name="wait_a_moment">Παρακαλούμε περιμένετε</string>
-  <string name="filedisplay_unexpected_bad_get_content">Απροσδόκητο σφάλμα, δοκιμάστε με άλλη εφαρμογή</string>
+  <string name="filedisplay_unexpected_bad_get_content">Απροσδόκητο σφάλμα - παρακαλώ επιλέξτε το αρχείο από μια άλλη εφαρμογή</string>
   <string name="filedisplay_no_file_selected">Δεν επιλέχθηκαν αρχεία </string>
   <string name="activity_chooser_title">Αποστολή συνδέσμου σε ...</string>
   <string name="oauth_check_onoff">Σύνδεση με oAuth2</string>
   <string name="oauth_login_connection">Σύνδεση με το διακομιστή oAuth2 σε εξέλιξη...</string>
-  <string name="ssl_validator_header">Η ταυτότητα της σελίδας δεν μπορεί να εγκριθεί</string>
-  <string name="ssl_validator_reason_cert_not_trusted">- Το πιστοποιητικό του διακομιστή δεν είναι αξιόπιστο</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_question">Θέλετε να θεωρείται έμπιστο το πιστοποιητικό αυτό ούτως ή άλλως;</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Η διεύθυνση URL δεν ταιριάζει με το όνομα του κόμβου στο πιστοποιητικό</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_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_ST">Πολιτεία:</string>
   <string name="ssl_validator_label_L">Τοποθεσία:</string>
-  <string name="ssl_validator_label_validity">Εγκυρότητα:</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_validity_to">Μέχρι:</string>
   <string name="ssl_validator_label_signature">Υπογραφή:</string>
   <string name="ssl_validator_label_signature_algorithm">Αλγόριθμος:</string>
   <string name="ssl_validator_null_cert">Δεν μπορεί να εμφανιστεί το πιστοποιητικό.</string>
-  <string name="ssl_validator_no_info_about_error">- Καμία πληροφορία σχετικά με το σφάλμα</string>
+  <string name="ssl_validator_no_info_about_error">- Καμμία πληροφορία σχετικά με το σφάλμα</string>
   <string name="placeholder_sentence">Αυτό είναι ένα σημείο κράτησης θέσης</string>
   <string name="placeholder_filename">placeholder.txt</string>
   <string name="placeholder_filetype">Εικόνα PNG</string>
@@ -224,38 +224,38 @@
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Μεταφόρτωση εικόνων μόνο μέσω WiFi</string>
-  <string name="instant_video_upload_on_wifi">Αποστολή βίντεο μόνο μέσω WiFi</string>
+  <string name="instant_video_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_message">Το απομακρυσμένο αρχείο %s δεν είναι συγχρονισμένο με το τοπικό αρχείο. Αν συνεχίσετε θα αντικατασταθεί το περιεχόμενο του αρχείου στο διακομιστή. </string>
   <string name="conflict_keep_both">Διατήρηση και των δύο</string>
   <string name="conflict_overwrite">Αντικατάσταση</string>
   <string name="conflict_dont_upload">Να μην μεταφορτωθεί</string>
   <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="actionbar_failed_instant_upload">Αποτυχημένη στιγμιαία φόρτωση</string>
-  <string name="failed_upload_headline_text">Αποτυχημένες στιγμιαίες φορτώσεις</string>
-  <string name="failed_upload_headline_hint">Σύνοψη όλων των αποτυχημένων φορτώσεων</string>
+  <string name="preview_image_error_unknown_format">Αυτή η εικόνα δεν μπορεί να προβληθεί</string>
+  <string name="error__upload__local_file_not_copied">Το %1$s δεν μπόρεσε να αντιγραφεί στον τοπικό φάκελο %2$s</string>
+  <string name="actionbar_failed_instant_upload">Αποτυχημένη Στιγμιαία Μεταφόρτωση</string>
+  <string name="failed_upload_headline_text">Αποτυχημένες στιγμιαίες μεταφορτώσεις</string>
+  <string name="failed_upload_headline_hint">Σύνοψη όλων των αποτυχημένων μεταφορτώσεων</string>
   <string name="failed_upload_all_cb">επιλογή όλων</string>
   <string name="failed_upload_headline_retryall_btn">επανάληψη για όλα τα επιλεγμένα</string>
   <string name="failed_upload_headline_delete_all_btn">διαγραφή όλων των επιλεγμένων από τη λίστα προς μεταφόρτωση</string>
   <string name="failed_upload_retry_text">επανάληψη προσπάθειας μεταφόρτωσης της εικόνας:</string>
-  <string name="failed_upload_load_more_images">Φόρτωση περισσότερων εικόνων</string>
+  <string name="failed_upload_load_more_images">Φόρτωση περισσότερων Εικόνων</string>
   <string name="failed_upload_retry_do_nothing_text">μην κάνετε τίποτε, δεν είστε συνδεμένος για άμεση μεταφόρτωση</string>
   <string name="failed_upload_failure_text">Μήνυμα Αποτυχίας:</string>
-  <string name="failed_upload_quota_exceeded_text">Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή σας, ίσως έχετε υπερβεί τη διαθέσιμη μερίδα σας.</string>
-  <string name="share_link_no_support_share_api">Λυπούμαστε, ο διαμοιρασμός δεν επιτρέπεται στον διακομιστή σας. Παρακαλούμε επικοινωνείστε με τον \n\t\tδιαχειριστή σας.</string>
+  <string name="failed_upload_quota_exceeded_text">Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή σας, ίσως έχετε υπερβεί το διαθέσιμο μερίδιό σας.</string>
+  <string name="share_link_no_support_share_api">Λυπούμαστε, ο διαμοιρασμός δεν επιτρέπεται στο διακομιστή σας. Παρακαλούμε επικοινωνείστε με το\n\t\tδιαχειριστή σας.</string>
   <string name="share_link_file_no_exist">Αδυναμία διαμοιρασμού αυτού του αρχείου ή φακέλου. Παρακαλώ βεβαιωθείτε ότι υπάρχει</string>
   <string name="share_link_file_error">Ένα σφάλμα προέκυψε κατά την προσπάθεια διαμοιρασμού αυτού του αρχείου ή φακέλου</string>
   <string name="unshare_link_file_no_exist">Ήταν αδύνατη η ακύρωση διαμοιρασμού αυτού του αρχείου ή φακέλου. Δεν υπάρχει.</string>
   <string name="unshare_link_file_error">Ένα σφάλμα προέκυψε κατά τη διάρκεια ακύρωσης διαμοιρασμού αυτού του αρχείου ή φακέλου</string>
   <string name="activity_chooser_send_file_title">Αποστολή</string>
   <string name="copy_link">Αντιγραφή συνδέσμου</string>
-  <string name="clipboard_text_copied">Αντιγραφθηκε στο clipboard</string>
+  <string name="clipboard_text_copied">Αντιγραφθηκε στο πρόχειρο</string>
   <string name="error_cant_bind_to_operations_service">Κρίσιμο σφάλμα: αδύνατη η εκτέλεση λειτουργειών</string>
-  <string name="network_error_socket_exception">Συνέβη σφάλμα κατά την σύνδεση με τον διακομιστή.</string>
-  <string name="network_error_socket_timeout_exception">Συνέβη σφάλμα κατά την αναμονή για τον διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
-  <string name="network_error_connect_timeout_exception">Συνέβη σφάλμα κατά την αναμονή για τον διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
+  <string name="network_error_socket_exception">Ένα σφάλμα προέκυψε κατά τη σύνδεση με το διακομιστή.</string>
+  <string name="network_error_socket_timeout_exception">Ένα σφάλμα προέκυψε κατά την αναμονή για το διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
+  <string name="network_error_connect_timeout_exception">Ένα σφάλμα προέκυψε κατά την αναμονή για το διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
   <string name="network_host_not_available">Η λειτουργία δεν ήταν δυνατό να ολοκληρωθεί, ο διακομιστής δεν είναι διαθέσιμος</string>
 </resources>

res/values-eo/strings.xml

@@ -1,8 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">Android-aplikaĵo %1$s</string>
+  <string name="about_version">eldono %1$s</string>
   <string name="actionbar_upload">Alŝuti dosieron</string>
   <string name="actionbar_upload_from_apps">Enhavo el aliaj aplikaĵoj</string>
   <string name="actionbar_upload_files">Dosieroj</string>
+  <string name="actionbar_open_with">Malfermi per</string>
   <string name="actionbar_mkdir">Nova dosierujo</string>
   <string name="actionbar_settings">Agordo</string>
   <string name="actionbar_see_details">Detaloj</string>
@@ -14,11 +17,15 @@
   <string name="prefs_pincode">PIN de App-aplikaĵo</string>
   <string name="prefs_pincode_summary">Protekti vian klienton</string>
   <string name="prefs_help">Helpo</string>
+  <string name="prefs_recommend">Rekomendi al amiko</string>
+  <string name="auth_check_server">Kontroli servilon</string>
+  <string name="auth_host_url">Servila adreso https://...</string>
   <string name="auth_username">Uzantonomo</string>
   <string name="auth_password">Pasvorto</string>
   <string name="sync_string_files">Dosieroj</string>
   <string name="setup_btn_connect">Konekti</string>
   <string name="uploader_btn_upload_text">Alŝuti</string>
+  <string name="uploader_top_message">Elektu alŝutan dosierujon:</string>
   <string name="uploader_wrn_no_account_title">Neniu konto troviĝis</string>
   <string name="uploader_wrn_no_account_text">Estas neniu $1%s-konto en via aparato. Bonvolu agordi konton unue.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Agordi</string>
@@ -35,6 +42,7 @@
   <string name="filedetails_download">Elŝuti</string>
   <string name="filedetails_renamed_in_upload_msg">La dosiero alinomiĝis al %1$s dum alŝuto</string>
   <string name="action_share_file">Konhavigi ligilon</string>
+  <string name="action_unshare_file">Malkunhavigi ligilon</string>
   <string name="common_yes">Jes</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">Akcepti</string>
@@ -43,6 +51,7 @@
   <string name="common_cancel">Nuligi</string>
   <string name="common_save_exit">Konservi kaj forlasi</string>
   <string name="common_error">Eraro</string>
+  <string name="common_loading">Ŝargante...</string>
   <string name="common_error_unknown">Nekonata eraro</string>
   <string name="about_title">Pri</string>
   <string name="change_password">Ŝanĝi la pasvorton</string>
@@ -56,19 +65,30 @@
   <string name="uploader_upload_succeeded_content_single">%1$s sukcese alŝutiĝis</string>
   <string name="uploader_upload_failed_ticker">Alŝuto malsukcesis</string>
   <string name="uploader_upload_failed_content_single">Alŝuto de %1s ne eblis plenumiĝi</string>
+  <string name="uploader_upload_failed_credentials_error">Alŝuto malsukcesis, vi devas reensaluti</string>
   <string name="downloader_download_in_progress_ticker">Elŝutante...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Elŝutante %2$s</string>
   <string name="downloader_download_succeeded_ticker">Elŝuto sukcesis</string>
   <string name="downloader_download_succeeded_content">%1$s sukcese elŝutiĝis</string>
   <string name="downloader_download_failed_ticker">Elŝuto malsukcesis</string>
   <string name="downloader_download_failed_content">Elŝuto de %1$s ne eblis plenumiĝi</string>
+  <string name="downloader_not_downloaded_yet">Ankoraŭ ne elŝutita</string>
+  <string name="downloader_download_failed_credentials_error">Elŝuto malsukcesis, vi devas reensaluti</string>
   <string name="common_choose_account">Elekti konton</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_fail_content_unauthorized">Nevalida pasvorto por %1$s</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="sync_foreign_files_forgotten_ticker">Iuj lokaj dosieroj forgesiĝis</string>
+  <string name="sync_current_folder_was_removed">La dosierujo %1$s ne plu ekzistas</string>
+  <string name="foreign_files_move">Movi ĉion</string>
+  <string name="foreign_files_success">Ĉiuj dosieroj moviĝis</string>
+  <string name="foreign_files_fail">Iuj dosieroj ne povis moviĝi</string>
+  <string name="foreign_files_local_text">Loka: %1$s</string>
+  <string name="foreign_files_remote_text">Malloka: %1$s</string>
   <string name="pincode_enter_pin_code">Bonvolu enigi vian PIN-on de aplikaĵo</string>
   <string name="pincode_configure_your_pin">Enigu PIN-on de aplikaĵo</string>
   <string name="pincode_reenter_your_pincode">Bonvolu reenigi PIN-on de aplikaĵo</string>
@@ -77,6 +97,9 @@
   <string name="pincode_wrong">Malĝusta PIN de aplikaĵo</string>
   <string name="pincode_removed">PIN de aplikaĵo foriĝis</string>
   <string name="pincode_stored">PIN de aplikaĵo konserviĝis</string>
+  <string name="media_state_playing">%1$s (ludanta)</string>
+  <string name="media_state_loading">%1$s (ŝarganta)</string>
+  <string name="auth_getting_authorization">Ekhavante rajtigon...</string>
   <string name="auth_trying_to_login">Provante ensaluti...</string>
   <string name="auth_no_net_conn_title">Neniu reta konekto</string>
   <string name="auth_nossl_plain_ok_title">Sekura konekto ne haveblas.</string>
@@ -92,9 +115,16 @@
   <string name="auth_bad_oc_version_title">Nerekonita eldono de servilo</string>
   <string name="auth_wrong_connection_title">Ne eblis starigi konekton</string>
   <string name="auth_secure_connection">Sekura konekto stariĝis</string>
+  <string name="auth_unauthorized">Malĝusta uzantonomo aŭ pasvorto</string>
+  <string name="auth_oauth_error">Malsukcesa rajtigo</string>
+  <string name="auth_expired_basic_auth_toast">Bonvolu enigi la nunan pasvorton</string>
+  <string name="auth_connecting_auth_server">Konektante al aŭtentiga servilo...</string>
+  <string name="auth_unsupported_auth_method">La servilo ne kongruas kun ĉi tiu aŭtentiga metodo</string>
   <string name="fd_keep_in_sync">Teni dosieron ĝisdatigita</string>
   <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 ĝia enhavo?</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>
@@ -106,9 +136,14 @@
   <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="filename_forbidden_characters">Malpermesataj signoj: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Dosieronomo ne povas malpleni</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="activity_chooser_title">Sendi ligilon al...</string>
+  <string name="oauth_check_onoff">Ensaluti per oAuth2</string>
+  <string name="oauth_login_connection">Konektante al oAuth2-servilo...</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>
@@ -130,12 +165,22 @@
   <string name="ssl_validator_label_signature">Subskribo:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
   <string name="placeholder_sentence">Ĉi tio estas lokokupilo</string>
+  <string name="placeholder_filetype">PNG-bildo</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_media_time">12:23:45</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>
+  <string name="preview_image_description">Antaŭvido de bildo</string>
+  <string name="preview_image_error_unknown_format">Ĉi tiu bildo ne povas montriĝi</string>
+  <string name="error__upload__local_file_not_copied">%1$s ne povis kopiiĝi al la loka dosierujo %2$s</string>
+  <string name="failed_upload_all_cb">elekti ĉion</string>
+  <string name="failed_upload_failure_text">Mesaĝo de malsukceso:</string>
   <string name="activity_chooser_send_file_title">Sendi</string>
+  <string name="copy_link">Kopii ligilon</string>
   <string name="clipboard_text_copied">Kopiita en la tondejon</string>
+  <string name="network_error_socket_exception">Eraro okazis dum konekto al la servilo.</string>
 </resources>

res/values-es-rAR/strings.xml

@@ -97,7 +97,6 @@
   <string name="foreign_files_fail">Algunos archivos no pudieron ser movidos</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados al directorio %1$s. Querés moverlos ahí?</string>
   <string name="pincode_enter_pin_code">Por favor, escribí el PIN de la aplicación</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>

res/values-es-rCL/strings.xml

@@ -79,7 +79,6 @@
   <string name="foreign_files_fail">algunos archivos no pueden ser transferidos</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remoto: %1$s</string>
-  <string name="upload_query_move_foreign_files">No hay espacio suficiente para copiar los archivos seleccionados en la %1$s carpeta. Le gustaria que los trasladaran en su lugar?</string>
   <string name="pincode_enter_pin_code">Por favor, ingreses su PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Ingrese su PIN de aplicación</string>
   <string name="pincode_configure_your_pin_explanation">El PIN será solicitado cada vez que la aplicación se inicie</string>

res/values-es-rMX/strings.xml

@@ -97,7 +97,6 @@
   <string name="foreign_files_fail">Algunos archivos no han podido ser movidos</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remoto: %1$s</string>
-  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. ¿Quiere moverlos en lugar de copiarlos?</string>
   <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Introduzca un PIN para la aplicación</string>
   <string name="pincode_configure_your_pin_explanation">Se solicitará el PIN cada vez que se inicie la aplicación</string>

res/values-es/strings.xml

@@ -7,7 +7,7 @@
   <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
   <string name="actionbar_upload_files">Archivos</string>
   <string name="actionbar_open_with">Abrir con</string>
-  <string name="actionbar_mkdir">Nueva carpeta</string>
+  <string name="actionbar_mkdir">Nueva Carpeta</string>
   <string name="actionbar_settings">Configuración</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="actionbar_send_file">Enviar</string>
@@ -29,8 +29,8 @@
   <string name="prefs_help">Ayuda</string>
   <string name="prefs_recommend">Recomendar a un amigo</string>
   <string name="prefs_feedback">Mensajes de retroalimentación</string>
-  <string name="prefs_imprint">Imprint</string>
-  <string name="recommend_subject">¡Prueba %1$s en tu teléfono inteligente!</string>
+  <string name="prefs_imprint">Imprimir</string>
+  <string name="recommend_subject">Prueba  %1$s en tu smarthphone!</string>
   <string name="recommend_text">\"¡Quiero invitarlo a usar %1$s en su smartphone!\nDescárguelo aquí: %2$s\"\n\t</string>
   <string name="auth_check_server">Compruebe el servidor.</string>
   <string name="auth_host_url">Dirección del servidor https://…</string>
@@ -58,8 +58,8 @@
   <string name="filedetails_download">Descargar</string>
   <string name="filedetails_sync_file">Actualizar archivo</string>
   <string name="filedetails_renamed_in_upload_msg">El fichero fue renombrado como %1$s durante la subida</string>
-  <string name="action_share_file">Compartir</string>
-  <string name="action_unshare_file">Descompartir</string>
+  <string name="action_share_file">Compartir con enlace</string>
+  <string name="action_unshare_file">Dejar de compartir</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">Aceptar</string>
@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">No se han podido mover algunos archivos</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remoto: %1$s</string>
-  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. ¿Quiere moverlos en lugar de copiarlos?</string>
+  <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados a la carpeta %1$s. ¿Desea moverlos en vez de copiarlos?</string>
   <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Introduzca un PIN para la aplicación</string>
   <string name="pincode_configure_your_pin_explanation">Se solicitará el PIN cada vez que se inicie la aplicación</string>
@@ -122,7 +122,7 @@
   <string name="media_state_playing">%1$s (reproduciendo)</string>
   <string name="media_state_loading">%1$s (cargando)</string>
   <string name="media_event_done">%1$s reproducción finalizada</string>
-  <string name="media_err_nothing_to_play">No se encuentra archivo de medio</string>
+  <string name="media_err_nothing_to_play">No se encontró el archivo multimedia</string>
   <string name="media_err_no_account">No se ha proporcionado cuenta</string>
   <string name="media_err_not_in_owncloud">El archivo no esta en una cuenta valida </string>
   <string name="media_err_unsupported">Codec No Soportado</string>
@@ -144,7 +144,7 @@
   <string name="auth_connection_established">Conexión establecida</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_account_not_new">Una cuenta para el mismo usuario y servidor ya existen en el dispositivo</string>
+  <string name="auth_account_not_new">Ya existe una cuenta en este dispositivo con los mismos datos de Usuario y Servidor</string>
   <string name="auth_account_not_the_same">El usuario introducido no concuerda con el usuario de esta cuenta</string>
   <string name="auth_unknown_error_title">Ocurrió un error desconocido</string>
   <string name="auth_unknown_host_title">No se pudo encontrar la dirección</string>
@@ -162,12 +162,12 @@
   <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduzca la URL del servidor de nuevo</string>
   <string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Por favor, autorice de nuevo</string>
   <string name="auth_expired_basic_auth_toast">Por favor, introduzca la contraseña actual.</string>
-  <string name="auth_expired_saml_sso_token_toast">Tu sesión ha expirado. Por favor, intenta conectarte de nuevo</string>
+  <string name="auth_expired_saml_sso_token_toast">Su sesión ha expirado. Favor de conectarse de nuevo</string>
   <string name="auth_connecting_auth_server">Conectando al servidor de autenticación...</string>
   <string name="auth_unsupported_auth_method">El servidor no soporta este método de autenticación</string>
   <string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
   <string name="auth_fail_get_user_name">Su servidor no está retornando una identificación de usuario correcta; contacte a un administrador\n\t</string>
-  <string name="auth_can_not_auth_against_server">No es posible autenticarse con este servidor</string>
+  <string name="auth_can_not_auth_against_server">No puede autenticarse en este servidor.</string>
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
@@ -211,7 +211,7 @@
   <string name="ssl_validator_label_ST">Estado:</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_from">Desde</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>
@@ -232,7 +232,7 @@
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
-  <string name="preview_image_error_unknown_format">Esta imagen no puede ser mostrada.</string>
+  <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
   <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
   <string name="actionbar_failed_instant_upload">Carga instantánea fallida</string>
   <string name="failed_upload_headline_text">Cargas instantáneas fallidas</string>

res/values-et-rEE/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Mõningaid faile ei saa ümber tõsta</string>
   <string name="foreign_files_local_text">Kohalik: %1$s</string>
   <string name="foreign_files_remote_text">Serveris: %1$s</string>
-  <string name="upload_query_move_foreign_files">Pole piisavalt ruumi kopeerimaks valitud faile kataloogi %1$s. Soovid kopeerimise asemel neid ümber tõsta?</string>
+  <string name="upload_query_move_foreign_files">Pole piisavalt ruumi kopeerimaks valitud faile kataloogi %1$s. Kas soovid kopeerimise asemel neid ümber tõsta?</string>
   <string name="pincode_enter_pin_code">Palun sisesta oma rakenduse PIN</string>
   <string name="pincode_configure_your_pin">Sisesta oma rakenduse PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN-i nõutakse iga kord, kui rakendus käivitatakse</string>
@@ -167,9 +167,12 @@
   <string name="auth_unsupported_auth_method">See server ei toeta seda autentimise viisi</string>
   <string name="auth_unsupported_multiaccount">%1$s ei toeta mitme konto kasutamist</string>
   <string name="auth_fail_get_user_name">Server ei tagasta korrektset kasutaja ID-d. Palun kontakteeru administraatoriga.\n⇥</string>
+  <string name="auth_can_not_auth_against_server">Ei suuda autoriseerida selle serveriga.</string>
   <string name="fd_keep_in_sync">Hoia faili ajakohasena</string>
   <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>
@@ -229,6 +232,7 @@
   <string name="conflict_overwrite">Kirjuta üle</string>
   <string name="conflict_dont_upload">Ära uuenda</string>
   <string name="preview_image_description">Pildi eelvaade</string>
+  <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
   <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi %2$s</string>
   <string name="actionbar_failed_instant_upload">Ebaõnnestunud kohene üleslaadimine</string>
   <string name="failed_upload_headline_text">Ebaõnnestunud kohesed üleslaadimised</string>
@@ -237,6 +241,7 @@
   <string name="failed_upload_headline_retryall_btn">proovi uuesti kõik valitud</string>
   <string name="failed_upload_headline_delete_all_btn">eemalda kõik valitud üleslaadimise järjekorrast</string>
   <string name="failed_upload_retry_text">proovi uuesti pilti üles laadida:</string>
+  <string name="failed_upload_load_more_images">Laadi rohkem pilte</string>
   <string name="failed_upload_retry_do_nothing_text">ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks</string>
   <string name="failed_upload_failure_text">Veateade:</string>
   <string name="failed_upload_quota_exceeded_text">Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud.</string>
@@ -248,7 +253,9 @@
   <string name="activity_chooser_send_file_title">Saada</string>
   <string name="copy_link">Kopeeri link</string>
   <string name="clipboard_text_copied">Kopeeritud lõikepuhvrisse</string>
+  <string name="error_cant_bind_to_operations_service">Viga: ei suutnud operatsiooni lõpetada</string>
   <string name="network_error_socket_exception">Serveriga ühendumisel tekkis tõrge.</string>
   <string name="network_error_socket_timeout_exception">Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus</string>
   <string name="network_error_connect_timeout_exception">Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus</string>
+  <string name="network_host_not_available">Toimingu lõpetamine ebaõnnestus, server pole saadaval</string>
 </resources>

res/values-fa/strings.xml

@@ -98,7 +98,6 @@
   <string name="foreign_files_fail">بعضی از فایل ها نمی توانند انتقال یابند</string>
   <string name="foreign_files_local_text">محلی: %1$s</string>
   <string name="foreign_files_remote_text">دور از دسترس:  %1$s</string>
-  <string name="upload_query_move_foreign_files">فضایی به اندازه ی کافی برای کپی کردن فایل ها در پوشه ی %1$s نیست.آیا می خواهید آنها را به جای دیگری انتقال دهید؟</string>
   <string name="pincode_enter_pin_code">لطفا PIN برنامه خودتان را وارد کنید</string>
   <string name="pincode_configure_your_pin">PIN برنامه را وارد کنید</string>
   <string name="pincode_configure_your_pin_explanation">هر زمان که برنامه آغاز شود PIN درخواست خواهد شد.</string>

res/values-fi-rFI/strings.xml

@@ -17,6 +17,8 @@
   <string name="prefs_manage_accounts">Tilien hallinta</string>
   <string name="prefs_pincode">Sovelluksen PIN-koodi</string>
   <string name="prefs_pincode_summary">Suojaa Asiakasohjelmasi</string>
+  <string name="prefs_instant_video_upload">Välittömät videolähetykset</string>
+  <string name="prefs_instant_video_upload_summary">Lähetä kameralla kuvatut videot välittömästi</string>
   <string name="prefs_log_title">Käytä lokitusta</string>
   <string name="prefs_log_summary_history">Tämä näyttää tallennetut lokit</string>
   <string name="prefs_log_delete_history_button">Poista historia</string>
@@ -33,6 +35,7 @@
   <string name="sync_string_files">Tiedostot</string>
   <string name="setup_btn_connect">Yhdistä</string>
   <string name="uploader_btn_upload_text">Lähetä</string>
+  <string name="uploader_top_message">Valitse lähetyskansio:</string>
   <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
   <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu %1$s-tiliä. Luo tili ensin.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
@@ -130,6 +133,7 @@
   <string name="auth_timeout_title">Palvelimen vastaus viipyy liian kauan</string>
   <string name="auth_incorrect_address_title">Väärin annettu osoite</string>
   <string name="auth_ssl_general_error_title">SSL:n alustus epäonnistui</string>
+  <string name="auth_ssl_unverified_server_title">SSL-palvelimen identiteettiä ei voitu varmistaa</string>
   <string name="auth_bad_oc_version_title">Tuntematon palvelimen versio</string>
   <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
   <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
@@ -143,6 +147,7 @@
   <string name="auth_connecting_auth_server">Yhdistetään tunnistautumispalvelimeen…</string>
   <string name="auth_unsupported_auth_method">Palvelin ei tue tätä tunnistautumistapaa</string>
   <string name="auth_unsupported_multiaccount">%1$s ei tue useita tilejä</string>
+  <string name="auth_can_not_auth_against_server">Tunnistautuminen palvelinta vastaan ei onnistu</string>
   <string name="fd_keep_in_sync">Pidä tiedosto ajan tasalla</string>
   <string name="common_rename">Nimeä uudelleen</string>
   <string name="common_remove">Poista</string>
@@ -203,13 +208,17 @@
   <string name="conflict_overwrite">Korvaa</string>
   <string name="conflict_dont_upload">Älä lähetä</string>
   <string name="preview_image_description">Kuvan esikatselu</string>
+  <string name="preview_image_error_unknown_format">Tätä kuvaa ei voi näyttää</string>
   <string name="failed_upload_all_cb">valitse kaikki</string>
   <string name="failed_upload_headline_retryall_btn">yritä uudelleen kaikkia valittuja</string>
+  <string name="failed_upload_load_more_images">Lataa lisää kuvia</string>
   <string name="failed_upload_failure_text">Virheviesti:</string>
   <string name="share_link_file_no_exist">Valitettavasti tämän tiedoston tai kansion jakaminen ei onnistu. Varmista että se on olemassa</string>
   <string name="share_link_file_error">Virhe tiedoston tai kansion jakamista yrittäessä</string>
   <string name="activity_chooser_send_file_title">Lähetä</string>
   <string name="copy_link">Kopioi linkki</string>
   <string name="clipboard_text_copied">Kopioitu leikepöydälle</string>
+  <string name="error_cant_bind_to_operations_service">Kriittinen virhe: toimintoja ei voi suorittaa</string>
   <string name="network_error_socket_exception">Virhe palvelimeen yhdistäessä</string>
+  <string name="network_host_not_available">Toimintoa ei voi suorittaa loppuun, palvelin ei ole käytettävissä</string>
 </resources>

res/values-fr/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Certains fichiers n\'ont pu être déplacés</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Distant: %1$s</string>
-  <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous les déplacer à la place ?</string>
+  <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous quand même les déplacer ?</string>
   <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
   <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité </string>
   <string name="pincode_configure_your_pin_explanation">Le code PIN vous sera demandé à chaque lancement de l\'application</string>

res/values-hu-rHU/strings.xml

@@ -98,7 +98,6 @@
   <string name="foreign_files_fail">Egyes fájlokat nem sikerült áthelyezni</string>
   <string name="foreign_files_local_text">Helyi: %1$s</string>
   <string name="foreign_files_remote_text">Távoli: %1$s</string>
-  <string name="upload_query_move_foreign_files">Nincs elég hely ahhoz, hogy a kiválasztott fájlokat a %1$s mappába másoljuk. Akkor inkább helyezzük át őket oda?</string>
   <string name="pincode_enter_pin_code">Kérem adja meg az alkalmazás PIN-kódját</string>
   <string name="pincode_configure_your_pin">Az alkalmazás PIN-kódja</string>
   <string name="pincode_configure_your_pin_explanation">A PIN-t kötelező lesz megadni az alkalmazás minden indításakor</string>

res/values-it/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Alcuni file non possono essere spostati</string>
   <string name="foreign_files_local_text">Locale: %1$s</string>
   <string name="foreign_files_remote_text">Remoto %1$s</string>
-  <string name="upload_query_move_foreign_files">Non c\'è spazio sufficiente per copiare i file selezionati nella cartella %1$s. Vuoi invece spostarli nella cartella?</string>
+  <string name="upload_query_move_foreign_files">Non c\'è spazio sufficiente per copiare i file selezionati nella cartella %1$s. Vuoi invece spostarli?</string>
   <string name="pincode_enter_pin_code">Inserisci il PIN dell\'applicazione</string>
   <string name="pincode_configure_your_pin">Inserisci il PIN di l\'applicazione</string>
   <string name="pincode_configure_your_pin_explanation">Il PIN sarà richiesto ad ogni avvio dell\'applicazione</string>

res/values-ja-rJP/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">一部のファイルは移動できませんでした</string>
   <string name="foreign_files_local_text">ローカル: %1$s</string>
   <string name="foreign_files_remote_text">リモート: %1$s</string>
-  <string name="upload_query_move_foreign_files">%1$s フォルダーに選択されたファイルをコピーするのに十分な空き領域がありません。コピーする代わりに、それらを移動させますか？</string>
+  <string name="upload_query_move_foreign_files">十分なスペースが無いため、選択されたファイルを %1$s フォルダーにコピーすることができません。コピーする代わりに、それらを移動させますか？</string>
   <string name="pincode_enter_pin_code">アプリのパスワードを入力してください</string>
   <string name="pincode_configure_your_pin">アプリのパスワードを入力してください</string>
   <string name="pincode_configure_your_pin_explanation">アプリ開始時に毎回PINが要求されます。</string>

res/values-ka-rGE/strings.xml

@@ -76,7 +76,6 @@
   <string name="foreign_files_fail">რამოდენიმე ფაილის გადატანა ვერ მოხერხდა</string>
   <string name="foreign_files_local_text">ლოკალური: %1$s</string>
   <string name="foreign_files_remote_text">დაშორებული: %1$s</string>
-  <string name="upload_query_move_foreign_files">ადგილი არ არის მონიშნული ფაილების დასაკოპირებლად %1$s ფოლდერში. გინდათ თქვენ გადაიტანოთ ისინი ამის მაგივრად?</string>
   <string name="pincode_enter_pin_code">გთხოვთ, ჩასვათ თქვენი აპლიკაციის PIN–ი</string>
   <string name="pincode_configure_your_pin">შეიყვანეთ თქვენი აპლიკაციის PIN–ი</string>
   <string name="pincode_configure_your_pin_explanation">PIN–ი მოთხოვნილი იქნება აპლიკაციის ყოველ ჩართვაზე</string>

res/values-ko/strings.xml

@@ -97,7 +97,6 @@
   <string name="foreign_files_fail">몇몇 파일을 옮기지 못했습니다.</string>
   <string name="foreign_files_local_text">로컬: %1$s</string>
   <string name="foreign_files_remote_text">원격: %1$s</string>
-  <string name="upload_query_move_foreign_files">선택한 파일을 %1$s폴더에 넣기에는 공간이 충분하지 않습니다. 다른곳으로 옮기시겠습니까?</string>
   <string name="pincode_enter_pin_code">앱 암호를 입력하십시오</string>
   <string name="pincode_configure_your_pin">앱 암호를 입력하십시오</string>
   <string name="pincode_configure_your_pin_explanation">앱을 시작할 때마다 암호를 물어봅니다</string>

res/values-ml-rIN/strings.xml

@@ -1,2 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="actionbar_upload_files">ഫയലുകൾ</string>
+  <string name="sync_string_files">ഫയലുകൾ</string>
+</resources>

res/values-nb-rNO/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Noen filer kunne ikke fjernes</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Ekstern: %1$s</string>
-  <string name="upload_query_move_foreign_files">Det er ikke nok plass til å kopiere de valgte filene til %1$s mappe. Vil du flytte dem i stedet?</string>
+  <string name="upload_query_move_foreign_files">Det er ikke nok plass til å kopiere de valgte filene inn i mappen %1$s. Vil du flytte dem i stedet? </string>
   <string name="pincode_enter_pin_code">Vennligst tast inn din App-PIN</string>
   <string name="pincode_configure_your_pin">Skriv inn din PIN kode</string>
   <string name="pincode_configure_your_pin_explanation">PIN koden vil bli ettersourt hver gang appen starter</string>

res/values-nl/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Een paar bestanden konden niet worden verplaatst</string>
   <string name="foreign_files_local_text">Lokaal: %1$s</string>
   <string name="foreign_files_remote_text">Extern: %1$s</string>
-  <string name="upload_query_move_foreign_files">Er is niet genoeg ruimte om de gekopieerde bestanden ook te plaatsen in map %1$s. Wilt u ze erheen verplaatsten? </string>
+  <string name="upload_query_move_foreign_files">Er is niet genoeg ruimte om de bestanden te gekopieëren in map %1$s. Wilt u ze erheen verplaatsten? </string>
   <string name="pincode_enter_pin_code">Voer 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>

res/values-pt-rBR/strings.xml

@@ -21,9 +21,9 @@
   <string name="prefs_instant_upload_summary">Enviar instantaneamente fotos tiradas com a camera</string>
   <string name="prefs_instant_video_upload">Envio instantâneo de vídeos</string>
   <string name="prefs_instant_video_upload_summary">Enviar instantaneamente vídeos feitos com a camera</string>
-  <string name="prefs_log_title">Habilitar conexão</string>
-  <string name="prefs_log_summary">Isto é usado para registrar os problemas</string>
-  <string name="prefs_log_title_history">História de Registro</string>
+  <string name="prefs_log_title">Habilitar Conexão</string>
+  <string name="prefs_log_summary">Isto é usado para registrar(log) os problemas</string>
+  <string name="prefs_log_title_history">História de Registro(log)</string>
   <string name="prefs_log_summary_history">Isso mostra os registros gravados</string>
   <string name="prefs_log_delete_history_button">Excluir Histórico</string>
   <string name="prefs_help">Ajuda</string>
@@ -40,7 +40,7 @@
   <string name="sync_string_files">Arquivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
-  <string name="uploader_top_message">Escolher pasta enviar:</string>
+  <string name="uploader_top_message">Escolher pasta para enviar:</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
   <string name="uploader_wrn_no_account_text">Não existem contas %1$s no seu dispositivo. Por favor, configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
@@ -82,7 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
   <string name="uploader_upload_failed_ticker">Falha no envio</string>
   <string name="uploader_upload_failed_content_single">Envio de %1$s não pôde ser finalizado</string>
-  <string name="uploader_upload_failed_credentials_error">Enviar falhou, você precisa reconectar</string>
+  <string name="uploader_upload_failed_credentials_error">O envio falhou, você precisa reconectar</string>
   <string name="downloader_download_in_progress_ticker">Baixando …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download bem sucedido</string>
@@ -90,7 +90,7 @@
   <string name="downloader_download_failed_ticker">Download falhou</string>
   <string name="downloader_download_failed_content">Download de %1$s não pôde ser concluído</string>
   <string name="downloader_not_downloaded_yet">Não baixado ainda</string>
-  <string name="downloader_download_failed_credentials_error">Baixar falhou, você precisa reconectar</string>
+  <string name="downloader_download_failed_credentials_error">O download falhou, você precisa reconectar</string>
   <string name="common_choose_account">Escolha a conta</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>
@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Alguns arquivos não puderam ser movidos</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remoto: %1$s</string>
-  <string name="upload_query_move_foreign_files">Não há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Ao invés disso, gostaria de movê-los?</string>
+  <string name="upload_query_move_foreign_files">Não existe espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Você gostaria de ao invés de copiar movê-los? </string>
   <string name="pincode_enter_pin_code">Por favor, insira o seu PIN de Aplicativo</string>
   <string name="pincode_configure_your_pin">Insira seu PIN de Aplicativo</string>
   <string name="pincode_configure_your_pin_explanation">O PIN (senha) será solicitado toda vez que o aplicativo for iniciado</string>
@@ -130,7 +130,7 @@
   <string name="media_err_malformed">Arquivo de mídia não corretamente codificado</string>
   <string name="media_err_timeout">Expirou o tempo durante a tentativa</string>
   <string name="media_err_invalid_progressive_playback">Arquivo de mídia não pode ser transmitido</string>
-  <string name="media_err_unknown">Arquivo de mídia não pode ser reproduzido com o estoque media player</string>
+  <string name="media_err_unknown">Arquivo de mídia não pode ser reproduzido com o stock media player</string>
   <string name="media_err_security_ex">Erro de segurança tentando reproduzir %1$s</string>
   <string name="media_err_io_ex">Erro de entrada tentando reproduzir %1$s</string>
   <string name="media_err_unexpected">Erro inesperado tentando reproduzir %1$s</string>
@@ -145,7 +145,7 @@
   <string name="auth_testing_connection">Testando conexão...</string>
   <string name="auth_not_configured_title">Configuração do servidor mal formada</string>
   <string name="auth_account_not_new">Uma conta para o mesmo usuário e servidor já existe no dispositivo</string>
-  <string name="auth_account_not_the_same">As informações que o usuário digitou não corresponde ao usuário da conta</string>
+  <string name="auth_account_not_the_same">As informações que o usuário digitou não correspondem ao usuário da conta</string>
   <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
   <string name="auth_unknown_host_title">Não pôde encontrar host</string>
   <string name="auth_incorrect_path_title">Instância de servidor não encontrada</string>
@@ -186,7 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">Conteúdo do arquivo já foi sincronizado</string>
   <string name="create_dir_fail_msg">A pasta não pode ser criada</string>
   <string name="filename_forbidden_characters">Caracteres proibidos: / \\ &lt; &gt; : \" | ? *</string>
-  <string name="filename_empty">O nome do arquivo não pode ficar estar vazio</string>
+  <string name="filename_empty">O nome do arquivo não pode estar vazio</string>
   <string name="wait_a_moment">Aguarde um momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, tente selecionar o arquivo com outro app</string>
   <string name="filedisplay_no_file_selected">Nenhum arquivo foi selecionado</string>

res/values-pt-rPT/strings.xml

@@ -108,7 +108,6 @@
   <string name="foreign_files_fail">Não foi possível mover alguns ficheiros</string>
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remoto: %1$s</string>
-  <string name="upload_query_move_foreign_files">Não existe espaço suficiente para copiar os ficheiros seleccionados para a pasta %1$s . Deseja move-los?</string>
   <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
   <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação</string>
   <string name="pincode_configure_your_pin_explanation">O PIN vai ser pedido todas as vezes que iniciar a aplicação.</string>
@@ -167,9 +166,12 @@
   <string name="auth_unsupported_auth_method">O servidor não suporta este método de autenticação</string>
   <string name="auth_unsupported_multiaccount">%1$s não suporta contas múltiplas</string>
   <string name="auth_fail_get_user_name">O seu servidor não transmite o ID correcto. Por favor contacte o administrador.</string>
+  <string name="auth_can_not_auth_against_server">Não foi possível autenticar no servidor</string>
   <string name="fd_keep_in_sync">manter ficheiro actualizado</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>
@@ -229,6 +231,7 @@
   <string name="conflict_overwrite">Sobrepor</string>
   <string name="conflict_dont_upload">Não enviar.</string>
   <string name="preview_image_description">Pré-Visualização da imagem</string>
+  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
   <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
   <string name="actionbar_failed_instant_upload">O envio rápido falhou</string>
   <string name="failed_upload_headline_text">Falharam os Uploads-Instantâneos</string>
@@ -237,6 +240,7 @@
   <string name="failed_upload_headline_retryall_btn">Tentar todos os seleccionados</string>
   <string name="failed_upload_headline_delete_all_btn">Eliminar todos os seleccionados da lista de envio</string>
   <string name="failed_upload_retry_text">Tentar envio da imagem:</string>
+  <string name="failed_upload_load_more_images">Carregar mais Fotos</string>
   <string name="failed_upload_retry_do_nothing_text">não fazer nada, nao está online para o Upload-Instantâneo</string>
   <string name="failed_upload_failure_text">Mensagem de erro:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor verifique a configuração do servidor, talvez tenha excedido a sua quota</string>
@@ -248,7 +252,9 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar ligação</string>
   <string name="clipboard_text_copied">Copiado para a área de transferência</string>
+  <string name="error_cant_bind_to_operations_service">Erro crítico: não é possível executar as operações</string>
   <string name="network_error_socket_exception">Ocorreu um erro durante a ligação ao servidos.</string>
   <string name="network_error_socket_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
   <string name="network_error_connect_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
+  <string name="network_host_not_available">A operação não foi concluída, o servidor está inacessível.</string>
 </resources>

res/values-ro/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="actionbar_sync">Refresh cont</string>
   <string name="actionbar_upload">Încarcă</string>
   <string name="actionbar_upload_from_apps">Conținut de la alte aplicații</string>
   <string name="actionbar_upload_files">Fișiere</string>
@@ -15,6 +16,7 @@
   <string name="prefs_pincode">PIN-ul aplicaţiei</string>
   <string name="prefs_pincode_summary">Protejaţi-vă clientul</string>
   <string name="prefs_instant_upload">Încărcare instanta de imagine</string>
+  <string name="prefs_instant_upload_summary">Încărca instantaneu imagini luate de camera</string>
   <string name="prefs_log_delete_history_button">Ştergeţi istoric</string>
   <string name="prefs_help">Ajutor</string>
   <string name="prefs_recommend">Recomandati unui prieten</string>
@@ -22,6 +24,7 @@
   <string name="auth_host_url">Adresa serverului https://...</string>
   <string name="auth_username">Nume utilizator</string>
   <string name="auth_password">Parolă</string>
+  <string name="auth_register">Nou la %1$s?</string>
   <string name="sync_string_files">Fișiere</string>
   <string name="setup_btn_connect">Conectare</string>
   <string name="uploader_btn_upload_text">Încărcare</string>
@@ -32,7 +35,9 @@
   <string name="uploader_wrn_no_account_quit_btn_text">Anulare</string>
   <string name="uploader_wrn_no_content_title">Nu exista conţinut pentru încărcare</string>
   <string name="uploader_wrn_no_content_text">Nu a fost primit nici un conţinut .Nu exista nimic de încărcat .</string>
+  <string name="uploader_error_forbidden_content">%1$s nu este permis sa acceseze conținutul shared</string>
   <string name="uploader_info_uploading">Încărcare</string>
+  <string name="file_list_empty">Nu există fișiere în acest dosar. \nNoile fișiere pot fi adăugate cu opțiunea de meniu \"Upload\" </string>
   <string name="filedetails_select_file">Selectati un fisier pentru a afisa informatia aditionala</string>
   <string name="filedetails_size">Mărime:</string>
   <string name="filedetails_type">Tip:</string>
@@ -40,6 +45,9 @@
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Descarcă</string>
   <string name="filedetails_sync_file">Împrospătare fişier</string>
+  <string name="filedetails_renamed_in_upload_msg">Fișierul a fost redenumit %1$s în timpul încărcării</string>
+  <string name="action_share_file">Share link</string>
+  <string name="action_unshare_file">Unshare link</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Nu</string>
   <string name="common_ok">OK</string>
@@ -62,15 +70,27 @@
   <string name="uploader_upload_succeeded_content_single">%1$s a fost încărcat cu succes</string>
   <string name="uploader_upload_failed_ticker">Încărcarea a eșuat</string>
   <string name="uploader_upload_failed_content_single">Încărcarea fișierului %1$s nu a putut fi încheiată</string>
+  <string name="uploader_upload_failed_credentials_error">Incărcarea a eşuat, trebuie să te logezi din nou</string>
   <string name="downloader_download_in_progress_ticker">Se descarcă...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Se descarcă %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descărcarea a reușit</string>
   <string name="downloader_download_succeeded_content">%1$s a fost descărcat cu succes</string>
   <string name="downloader_download_failed_ticker">Descărcarea a eșuat</string>
+  <string name="downloader_download_failed_content">Nu s-a putut face downloadarea completa a %1$s</string>
+  <string name="downloader_not_downloaded_yet">Nu s-a  descărcat încă</string>
+  <string name="downloader_download_failed_credentials_error">Descărcarea a eşuat, trebuie să te logezi din nou</string>
   <string name="common_choose_account">Alege cont</string>
   <string name="sync_fail_ticker">Sincronizarea a eșuat</string>
+  <string name="sync_fail_content">Sincronizarea %1$s nu a putut fi completata</string>
+  <string name="sync_conflicts_in_favourites_ticker">S-au gasit conflicte</string>
+  <string name="sync_foreign_files_forgotten_ticker">Unele fisiere locale au fost uitate</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d fisiere din  dosarul  %2$s nu a putut fi copiat in</string>
+  <string name="sync_foreign_files_forgotten_explanation">Începând cu versiunea 1.3.16, fișierele încărcate de acest aparat sunt copiate în dosarul local %1$s pentru a preveni pierderea de date atunci când un singur fișier este sincronizat cu conturi multiple.  \nDatorita acestei schimbari, toate fișierele încărcate în versiunile anterioare ale acestei aplicații au fost copiate în dosarul %2$s. Cu toate acestea, o eroare a împiedicat finalizarea acestei operațiuni în timpul sincronizarii contului. Poti fie sa lasi fișierul(le), așa cum sunt și sa  elimini link-ul spre \n%3$s, sau muți fișierul(le) în dosarul %1$s și păstrezi link-ul la %4$s.  Mai jos sunt listate fișierul(le) locale  și fișierul(le) la distanță  în %5$s unde au fost link-ate. </string>
+  <string name="foreign_files_move">Muta tot/toate</string>
   <string name="foreign_files_success">Toate fişierele au fost mutate</string>
   <string name="foreign_files_fail">Unele fişiere nu au putut fi mutate</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">La distanta: %1$s</string>
   <string name="pincode_enter_pin_code">Te rugăm să specifici PIN-ul aplicației</string>
   <string name="pincode_configure_your_pin">Introduceti PIN-ul aplicatiei</string>
   <string name="pincode_configure_your_pin_explanation">PIN-ul va fi solicitat ori de cate ori aplicaţia este pornita</string>
@@ -80,8 +100,24 @@
   <string name="pincode_wrong">PIN-ul aplicației este incorect</string>
   <string name="pincode_removed">PIN-ul aplicației a fost eliminat</string>
   <string name="pincode_stored">PIN-ul aplicației a fost memorat</string>
+  <string name="media_notif_ticker">%1$s  player de muzică</string>
+  <string name="media_state_playing">%1$s (cântă)</string>
+  <string name="media_state_loading">%1$s (încarcă)</string>
   <string name="media_err_nothing_to_play">Nu a fost găsit nici un fişier media</string>
+  <string name="media_err_no_account">Nu a fost dat nici un cont</string>
+  <string name="media_err_not_in_owncloud">Fişierul nu este într-un cont valid</string>
+  <string name="media_err_unsupported">Codec media fără suport</string>
+  <string name="media_err_io">Fişierul media nu a putut fi citit</string>
   <string name="media_err_malformed">Fişierul media nu a fost codat corect</string>
+  <string name="media_err_timeout">Timpul a expirat în  ce încerca să execute</string>
+  <string name="media_err_invalid_progressive_playback">Fișierul media nu poate fi transmis</string>
+  <string name="media_err_unknown">Fișierul media nu poate fi executat cu stock media player</string>
+  <string name="media_err_security_ex">Eroare de securitate în timp ce încerca să execute %1$s</string>
+  <string name="media_err_io_ex">Eroare de input în timp ce încerca să execute %1$s</string>
+  <string name="media_err_unexpected">Eroare neprevăzută în timp ce încerca să execute %1$s</string>
+  <string name="media_rewind_description">Butonul rewind</string>
+  <string name="media_play_pause_description">Buton de play sau pauză </string>
+  <string name="media_forward_description">Butonul pentru repede înainte</string>
   <string name="auth_trying_to_login">În curs de autentificare...</string>
   <string name="auth_no_net_conn_title">Nu exista conexiune</string>
   <string name="auth_nossl_plain_ok_title">Conexiune securizată indisponibilă</string>
@@ -89,8 +125,12 @@
   <string name="auth_testing_connection">Se testează conexiunea...</string>
   <string name="auth_not_configured_title">Configurație serverului incorectă</string>
   <string name="auth_unknown_error_title">A apărut o eroare necunoscută!</string>
+  <string name="auth_unknown_host_title">Nu a putut gasi host-ul</string>
   <string name="auth_incorrect_path_title">Instanța serverului nu a fost găsită</string>
+  <string name="auth_timeout_title">Server-ului i-a luat prea mult timp sa raspunda</string>
+  <string name="auth_incorrect_address_title">URL  scris gresit</string>
   <string name="auth_ssl_general_error_title">Inițializarea SSL a eșuat</string>
+  <string name="auth_ssl_unverified_server_title">Nu s-a putut verifica identitatea serverului SSL</string>
   <string name="auth_bad_oc_version_title">Versiune necunoscuta a serverului </string>
   <string name="auth_wrong_connection_title">Nu s-a putut stabili conexiunea</string>
   <string name="auth_secure_connection">Conexiune sigură stabilită</string>
@@ -101,22 +141,37 @@
   <string name="fd_keep_in_sync">Păstrează fișierul actualizat</string>
   <string name="common_rename">Redenumește</string>
   <string name="common_remove">Elimină</string>
+  <string name="confirmation_remove_alert">Doriti sigur sa stergeti %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Sigur vrei să elimini %1$s și conținutul său?</string>
   <string name="confirmation_remove_local">Doar local</string>
+  <string name="confirmation_remove_folder_local">Doar continut local</string>
   <string name="confirmation_remove_remote">Elimină de pe server</string>
+  <string name="confirmation_remove_remote_and_local">De la distanță și local</string>
   <string name="remove_success_msg">Eliminat cu succes</string>
   <string name="remove_fail_msg">Eliminarea nu a reușit</string>
   <string name="rename_dialog_title">Introduceţi un nou nume</string>
+  <string name="rename_local_fail_msg">Copia locala nu a putut fi renumita; incearca un nume diferit</string>
   <string name="rename_server_fail_msg">Redenumirea nu s-a putut realiza</string>
+  <string name="sync_file_fail_msg">Fisierul de la distanta nu a putut fi verificat</string>
+  <string name="sync_file_nothing_to_do_msg">Continutul fisierului este deja sincronizat</string>
   <string name="create_dir_fail_msg">Nu a putut fi creat directorul</string>
   <string name="wait_a_moment">Așteaptă un moment</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema neasteptata ; selectati fisierul dintr-o aplicatie diferita </string>
   <string name="filedisplay_no_file_selected">Nu a fost selectat nici un fișier</string>
+  <string name="activity_chooser_title">Trimite link la ...</string>
   <string name="ssl_validator_header">Nu s-a putut verifica identitatea site-ului</string>
   <string name="ssl_validator_reason_cert_not_trusted">Certificatul serverului nu este de incredere </string>
   <string name="ssl_validator_reason_cert_expired">Certificatul serverului a expirat</string>
+  <string name="ssl_validator_reason_hostname_not_verified">URL nu se potriveste cu numele gazda in certificat</string>
+  <string name="ssl_validator_question">Vrei să ai încredere în acest certificat, oricum?</string>
+  <string name="ssl_validator_not_saved">Certificatul nu a putut fi salvat.</string>
   <string name="ssl_validator_btn_details_see">Detalii</string>
   <string name="ssl_validator_btn_details_hide">Ascunde</string>
+  <string name="ssl_validator_label_subject">A emis:</string>
+  <string name="ssl_validator_label_issuer">Emis de:</string>
+  <string name="ssl_validator_label_CN">Nume comun</string>
   <string name="ssl_validator_label_O">Organizaţie</string>
+  <string name="ssl_validator_label_OU">Unitate organizationala</string>
   <string name="ssl_validator_label_C">Tara :</string>
   <string name="ssl_validator_label_ST">Stat:</string>
   <string name="ssl_validator_label_L">Locaţie:</string>
@@ -126,7 +181,24 @@
   <string name="ssl_validator_label_signature">Semnatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritm:</string>
   <string name="ssl_validator_no_info_about_error">- Nu exista nici o informaţie pentru aceasta eroare</string>
+  <string name="placeholder_sentence">Acesta este un substituent</string>
+  <string name="placeholder_filename">placeholder.txt</string>
+  <string name="instant_upload_on_wifi">Incarca poze doar via WiFi</string>
   <string name="instant_upload_path">/Încărcare instanta</string>
+  <string name="conflict_title">Actualizați conflictul</string>
+  <string name="conflict_message">Fișierul de la distanță %s nu este sincronizat cu fișierul local. Continuand, se va înlocui conținutul fișierului de pe server.</string>
+  <string name="conflict_keep_both">Pastreaza amandoua</string>
+  <string name="conflict_overwrite">Scrie peste</string>
   <string name="conflict_dont_upload">Nu încarcă</string>
+  <string name="error__upload__local_file_not_copied">%1$s nu a putut fi copiat in dosarul local %2$s </string>
+  <string name="share_link_no_support_share_api">Ne pare rău, partajarea nu este activată pe server. Vă rugăm să contactați administratorul dvs.</string>
+  <string name="share_link_file_no_exist">Acest fișier sau director nu se poate partaja. Vă rugăm, asigurați-vă că există</string>
+  <string name="share_link_file_error">A apărut o eroare în timp ce încerca să partajeze acest fișier sau folder</string>
+  <string name="unshare_link_file_error">A apărut o eroare în timp ce încerca să departajeze sau unshare acest fișier sau folder</string>
   <string name="activity_chooser_send_file_title">Expediază</string>
+  <string name="copy_link">Link copiat</string>
+  <string name="network_error_socket_exception">A apărut o eroare în timp ce se conecta la server</string>
+  <string name="network_error_socket_timeout_exception">A apărut o eroare în timp ce se aștepta pentru server, operațiunea nu s-a executat</string>
+  <string name="network_error_connect_timeout_exception">A apărut o eroare în timp ce se aștepta pentru server, operațiunea nu s-a executat</string>
+  <string name="network_host_not_available">Operațiunea nu a putut fi finalizată, serverul este indisponibil</string>
 </resources>

res/values-ru/strings.xml

@@ -7,7 +7,7 @@
   <string name="actionbar_upload_from_apps">Содержимое из других приложений</string>
   <string name="actionbar_upload_files">Файлы</string>
   <string name="actionbar_open_with">Открыть с помощью</string>
-  <string name="actionbar_mkdir">Новый каталог</string>
+  <string name="actionbar_mkdir">Новая папка</string>
   <string name="actionbar_settings">Настройки</string>
   <string name="actionbar_see_details">Подробно</string>
   <string name="actionbar_send_file">Отправить</string>
@@ -38,7 +38,7 @@
   <string name="auth_password">Пароль</string>
   <string name="auth_register">Незнакомы с %1$s?</string>
   <string name="sync_string_files">Файлы</string>
-  <string name="setup_btn_connect">Соединить</string>
+  <string name="setup_btn_connect">Подключиться</string>
   <string name="uploader_btn_upload_text">Загрузить</string>
   <string name="uploader_top_message">Выберете папку для загрузки</string>
   <string name="uploader_wrn_no_account_title">Учётная запись не найдена</string>
@@ -66,7 +66,7 @@
   <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_save_exit">Сохранить и выйти</string>
   <string name="common_error">Ошибка</string>
   <string name="common_loading">Идёт загрузка...</string>
   <string name="common_error_unknown">Неизвестная ошибка</string>
@@ -108,12 +108,12 @@
   <string name="foreign_files_fail">Некоторые файлы не могут быть перемещены</string>
   <string name="foreign_files_local_text">Локально: %1$s</string>
   <string name="foreign_files_remote_text">Удаленно: %1$s</string>
-  <string name="upload_query_move_foreign_files">Недостаточно места для копирования выделенных файлов в каталог %1$s. Переместить их в другое место?</string>
-  <string name="pincode_enter_pin_code">Вставьте PIN вашего приложения</string>
+  <string name="upload_query_move_foreign_files">Для копирования выбранных файлов в папку %1$s недостаточно свободного места. Скопировать в другое место?</string>
+  <string name="pincode_enter_pin_code">Вставьте  App PIN</string>
   <string name="pincode_configure_your_pin">Введите App PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN-код будет запрашиваться при каждом запуске приложения.</string>
   <string name="pincode_reenter_your_pincode">Повторите ввод App PIN</string>
-  <string name="pincode_remove_your_pincode">Удалить App PIN</string>
+  <string name="pincode_remove_your_pincode">Удалите App PIN</string>
   <string name="pincode_mismatch">Введённые App PIN не совпадают</string>
   <string name="pincode_wrong">Неверный App PIN</string>
   <string name="pincode_removed">App PIN удалён</string>
@@ -138,8 +138,8 @@
   <string name="media_play_pause_description">Воспроизведение или пауза</string>
   <string name="media_forward_description">Перемотка вперед</string>
   <string name="auth_getting_authorization">Происходит авторизация.....</string>
-  <string name="auth_trying_to_login">Попытка входа...</string>
-  <string name="auth_no_net_conn_title">Нет сетевого соединения</string>
+  <string name="auth_trying_to_login">Авторизация...</string>
+  <string name="auth_no_net_conn_title">Нет подключения к сети</string>
   <string name="auth_nossl_plain_ok_title">Защищённое соединение недоступно.</string>
   <string name="auth_connection_established">Соединение установлено</string>
   <string name="auth_testing_connection">Тестирование соединения...</string>

res/values-sk-rSK/strings.xml

@@ -31,13 +31,14 @@
   <string name="prefs_feedback">Spätná väzba</string>
   <string name="prefs_imprint">Podmienky používania</string>
   <string name="recommend_subject">Skúste %1$s na vašom telefóne!</string>
+  <string name="recommend_text">\"Pozývam vás k používaniu %1$s na vašom smartfóne!\nNa stiahnutie tu: %2$s\"\n\t</string>
   <string name="auth_check_server">Skontrolovať Server</string>
   <string name="auth_host_url">Adresa servera https://...</string>
   <string name="auth_username">Používateľské meno</string>
   <string name="auth_password">Heslo</string>
   <string name="auth_register">Ste nový v %1$s?</string>
   <string name="sync_string_files">Súbory</string>
-  <string name="setup_btn_connect">Pripoj</string>
+  <string name="setup_btn_connect">Pripojiť</string>
   <string name="uploader_btn_upload_text">Nahrať</string>
   <string name="uploader_top_message">Vyberte priečinok pre nahrávanie:</string>
   <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
@@ -48,7 +49,7 @@
   <string name="uploader_wrn_no_content_text">Nedodaný žiaden obsah. Nič na odoslanie.</string>
   <string name="uploader_error_forbidden_content">%1$s nemá práva pre prístup k zdieľanému obsahu</string>
   <string name="uploader_info_uploading">Nahrávanie</string>
-  <string name="file_list_empty">Priečinok neobsahuje súbory.\nNové súbory môžete pridať cez \"Upload\".</string>
+  <string name="file_list_empty">Priečinok neobsahuje súbory.\nNové súbory môžete pridať cez \"Nahrať\" v menu.</string>
   <string name="filedetails_select_file">Viac informácií získate kliknutím na súbor.</string>
   <string name="filedetails_size">Veľkosť:</string>
   <string name="filedetails_type">Typ:</string>
@@ -81,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s úspešne odoslaný</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="uploader_upload_failed_credentials_error">Nahrávanie zlyhalo. Prihláste sa znovu</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>
@@ -88,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Stiahnutie zlyhalo</string>
   <string name="downloader_download_failed_content">Sťahovanie %1$s nebolo dokončené</string>
   <string name="downloader_not_downloaded_yet">Ešte nie je stiahnuté</string>
+  <string name="downloader_download_failed_credentials_error">Sťahovanie zlyhalo. Prihláste sa znovu</string>
   <string name="common_choose_account">Zvoliť účet</string>
   <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
   <string name="sync_fail_content">Synchronizáciu %1$s nemožno dokončiť</string>
@@ -98,19 +101,19 @@
   <string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
   <string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
   <string name="sync_foreign_files_forgotten_content">%1$d súborov z %2$s priečinkov sa nepodarilo skopírovať do</string>
+  <string name="sync_foreign_files_forgotten_explanation">Od verzie 1.3.16 sú súbory nahrané z tohoto zariadenia, skopírovné do lokálneho priečinka %1$s, aby sa zabránilo strate dát, keď je jeden súbor synchronizovaný s viacerými účtami.\n\nPre túto zmenu, všetky súbory nahraté v predchádzajúcich verziách tejto aplikácie boli skopírované do priečinka %2$s. Je nám to ľúto, ale chyba zabránila dokončeniu tejto operácie počas synchronizácie účtu. Súbor(y) môžete ponechať v súčasnom stave a zmazať odkaz na priečinok %3$s, alebo presunúť súbor(y) do priečinka %1$s a zachovať odkaz na priečinok %4$s.\n\nNižšie je zoznam lokálnych súborov a vzdialených súborov z %5$s na ktoré odkazovali.</string>
   <string name="sync_current_folder_was_removed">Priečinok %1$s už existuje</string>
   <string name="foreign_files_move">Premiestniť všetko</string>
   <string name="foreign_files_success">Všetky súbory boli premiestnené</string>
   <string name="foreign_files_fail">Niektoré súbory nebolo možné premiestniť</string>
   <string name="foreign_files_local_text">Lokálne: %1$s</string>
   <string name="foreign_files_remote_text">Vzdialené: %1$s</string>
-  <string name="upload_query_move_foreign_files">Nie je dostatok miesta na kopírovanie vybraných súborov do priečinka %1$s. Želáte si miesto kopírovania zmeniť?</string>
   <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
   <string name="pincode_configure_your_pin">Zadajte PIN aplikácie</string>
   <string name="pincode_configure_your_pin_explanation">Pri každom spustení aplikácie bude vyžadovaný PIN</string>
   <string name="pincode_reenter_your_pincode">Zadajte znovu PIN aplikácie</string>
   <string name="pincode_remove_your_pincode">Zrušiť PIN pre aplikáciu</string>
-  <string name="pincode_mismatch">PIN sa neshodujú</string>
+  <string name="pincode_mismatch">PINy sa neshodujú</string>
   <string name="pincode_wrong">Nesprávny PIN aplikácie</string>
   <string name="pincode_removed">PIN aplikácie bol odstránený</string>
   <string name="pincode_stored">PIN aplikácie bol uložený</string>
@@ -144,7 +147,7 @@
   <string name="auth_account_not_the_same">Zadané prihlasovacie údaje používateľa sú nesprávne</string>
   <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
   <string name="auth_unknown_host_title">Nemožno nájsť hosta</string>
-  <string name="auth_incorrect_path_title">Servera inštancia nebola nájdená</string>
+  <string name="auth_incorrect_path_title">Inštancia servera nebola nájdená</string>
   <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
   <string name="auth_incorrect_address_title">Poškodená URL</string>
   <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
@@ -156,16 +159,19 @@
   <string name="auth_oauth_error">Neúspešná autorizácia</string>
   <string name="auth_oauth_error_access_denied">Prístup odmietnutý autorizačným serverom</string>
   <string name="auth_wtf_reenter_URL">Nečakaný stav; prosím, opätovne vložte URL adresu servera</string>
-  <string name="auth_expired_oauth_token_toast">Vaša autorizácia expirovala. Prosím autorizujte sa znovu prosím</string>
+  <string name="auth_expired_oauth_token_toast">Vaša autorizácia vypršala. Prosím, autorizujte sa znovu</string>
   <string name="auth_expired_basic_auth_toast">Prosím, zadajte aktuálne heslo</string>
-  <string name="auth_expired_saml_sso_token_toast">Vaše pripojenie expirovalo. Pripojte sa znovu prosím</string>
+  <string name="auth_expired_saml_sso_token_toast">Vaše pripojenie vypršalo. Pripojte sa znovu prosím</string>
   <string name="auth_connecting_auth_server">Pripájam sa na autentifikačný server...</string>
   <string name="auth_unsupported_auth_method">Server nepodporuje túto autentifikačnú metódu</string>
   <string name="auth_unsupported_multiaccount">%1$s nepodporuje viacero účtov</string>
   <string name="auth_fail_get_user_name">Váš server nevracia správne používateľské id, kontaktujte prosím správcu systému\n\t</string>
+  <string name="auth_can_not_auth_against_server">Nie je možné vykonať autentifikáciu na server</string>
   <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
+  <string name="confirmation_remove_alert">Naozaj chcete odstrániť %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Naozaj chcete odstrániť %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Iba lokálne</string>
   <string name="confirmation_remove_folder_local">Len lokálny obsah</string>
   <string name="confirmation_remove_remote">Zmazať zo servera</string>
@@ -179,6 +185,7 @@
   <string name="sync_file_nothing_to_do_msg">Obsah súboru je zosynchronizovaný</string>
   <string name="create_dir_fail_msg">Priečinok nie je možné vytvoriť</string>
   <string name="filename_forbidden_characters">Zakázané znaky: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Názov súboru nemôže byť prázdny</string>
   <string name="wait_a_moment">Počkať chvíľu</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočakávaný problém; skúste vybrať súbor inou aplikáciou</string>
   <string name="filedisplay_no_file_selected">Nebol vybraný súbor</string>
@@ -224,21 +231,30 @@
   <string name="conflict_overwrite">Prepísať</string>
   <string name="conflict_dont_upload">Nenahrávajte</string>
   <string name="preview_image_description">Ukážka obrazu</string>
-  <string name="actionbar_failed_instant_upload">Okamžité odoslanie zlyhalo</string>
-  <string name="failed_upload_headline_text">Zlyhané instantné nahratia</string>
+  <string name="preview_image_error_unknown_format">Obrázok nemožno zobraziť</string>
+  <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
+  <string name="actionbar_failed_instant_upload">Okamžité nahrávanie zlyhalo</string>
+  <string name="failed_upload_headline_text">Zlyhané okamžité nahrávania</string>
   <string name="failed_upload_headline_hint">Zhrnutie všetkých zlyhaných nahratí</string>
   <string name="failed_upload_all_cb">vybrať všetko</string>
   <string name="failed_upload_headline_retryall_btn">opakovať všetky vybrané</string>
   <string name="failed_upload_headline_delete_all_btn">zmazať všetky vybrané z radu pre nahratie</string>
   <string name="failed_upload_retry_text">opakovať nahratie obrazu:</string>
-  <string name="failed_upload_retry_do_nothing_text">nevykonať nič, nie ste online pre instantné nahratie</string>
+  <string name="failed_upload_load_more_images">Nahrať viac obrázkov</string>
+  <string name="failed_upload_retry_do_nothing_text">nevykonať nič, nie ste online pre okamžité nahratie</string>
   <string name="failed_upload_failure_text">Chybová správa:</string>
   <string name="failed_upload_quota_exceeded_text">Prosím skontrolujte nastavenie vášho servera, možno bola prekročená disková kvóta.</string>
-  <string name="share_link_file_no_exist">Nie je možné zdieľať tento súbor alebo adresár. Prosím uistite sa že existuje</string>
+  <string name="share_link_no_support_share_api">Je nám to ľúto, ale zdieľanie nie je na vašom serveri povolené. Prosím kontaktujte vášho\n\t\tadministrátora.</string>
+  <string name="share_link_file_no_exist">Nie je možné zdieľať tento súbor alebo priečinok. Prosím uistite sa že existuje</string>
   <string name="share_link_file_error">Pri pokuse o zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
   <string name="unshare_link_file_no_exist">Nie je možné zrušiť zdieľanie tohoto súboru alebo priečinka. Súbor alebo priečinok neexistuje.</string>
   <string name="unshare_link_file_error">Pri pokuse zrušiť zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
   <string name="activity_chooser_send_file_title">Odoslať</string>
   <string name="copy_link">Kopíruj odkaz</string>
-  <string name="clipboard_text_copied">Skopírované do \"clipboard\"</string>
+  <string name="clipboard_text_copied">Skopírované do schránky</string>
+  <string name="error_cant_bind_to_operations_service">Kritická chyba: operáciu nemožno vykonať</string>
+  <string name="network_error_socket_exception">Pri pokuse o pripojenie na server nastala chyba.</string>
+  <string name="network_error_socket_timeout_exception">Pri čakaní na odpoveď servera nastala chyba, operácia nemohla byť dokončená</string>
+  <string name="network_error_connect_timeout_exception">Pri čakaní na odpoveď servera nastala chyba, operácia nemohla byť dokončená</string>
+  <string name="network_host_not_available">Operácia nemohla byť dokončená, server je nedostupný</string>
 </resources>

res/values-sl/strings.xml

@@ -82,7 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s je uspešno poslan</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_credentials_error">Napaka pri nalaganju, ponovno se prijavite!</string>
+  <string name="uploader_upload_failed_credentials_error">Pošiljanje je spodletelo. Pred nadaljevanjem se je treba prijaviti.</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>
@@ -90,7 +90,7 @@
   <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="downloader_not_downloaded_yet">Prejem še ni zaključen</string>
-  <string name="downloader_download_failed_credentials_error">Napaka pri prenosu, ponovno se prijavite!</string>
+  <string name="downloader_download_failed_credentials_error">Prejemanje je spodletelo. Pred nadaljevanjem se je treba prijaviti.</string>
   <string name="common_choose_account">Izbor računa</string>
   <string name="sync_fail_ticker">Usklajevanje je spodletelo</string>
   <string name="sync_fail_content">Usklajevanja %1$s ni mogoče dokončati</string>
@@ -108,7 +108,6 @@
   <string name="foreign_files_fail">Nekaterih datotek ni mogoče premakniti</string>
   <string name="foreign_files_local_text">Krajevno: %1$s</string>
   <string name="foreign_files_remote_text">Oddaljeno: %1$s</string>
-  <string name="upload_query_move_foreign_files">Na strežniku ni dovolj prostora za kopiranje izbranih datotek v mapo %1$s. Ali želite datoteke raje premakniti na novo mesto? </string>
   <string name="pincode_enter_pin_code">Vnesite kodo PIN programa</string>
   <string name="pincode_configure_your_pin">Vnesite kodo PIN programa</string>
   <string name="pincode_configure_your_pin_explanation">Koda PIN bo zahtevana vsakič pred zagonom programa.</string>
@@ -167,12 +166,12 @@
   <string name="auth_unsupported_auth_method">Strežnik ne podpira tega načina overitve</string>
   <string name="auth_unsupported_multiaccount">%1$s ne omogoča podpore več računom</string>
   <string name="auth_fail_get_user_name">Strežnik ne vrača ustreznega ID uporabnika. Stopite v stik s skrbnikom sistema.\n\t</string>
-  <string name="auth_can_not_auth_against_server">Preverjanje pristnosti s tem strežnikom ni uspela</string>
+  <string name="auth_can_not_auth_against_server">Ni mogoče preveriti pristnosti strežnika</string>
   <string name="fd_keep_in_sync">Datoteka naj bo posodobljena</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
-  <string name="confirmation_remove_alert">Resnično želite odstraniti %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Resnično želite odstraniti %1$s in vsebino?</string>
+  <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Ali res želite odstraniti %1$s skupaj s celotno vsebino?</string>
   <string name="confirmation_remove_local">Le krajevno</string>
   <string name="confirmation_remove_folder_local">Le krajevno vsebino</string>
   <string name="confirmation_remove_remote">Odstrani s strežnika</string>
@@ -232,7 +231,7 @@
   <string name="conflict_overwrite">Prepiši</string>
   <string name="conflict_dont_upload">Ne pošlji</string>
   <string name="preview_image_description">Predogled slike</string>
-  <string name="preview_image_error_unknown_format">Slike se ne da prikazati</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="actionbar_failed_instant_upload">Spodletelo takojšnje pošiljanje</string>
   <string name="failed_upload_headline_text">Spodletela takojšnja pošiljanja</string>
@@ -254,8 +253,8 @@
   <string name="copy_link">Kopiraj povezavo</string>
   <string name="clipboard_text_copied">Kopirano v odložišče</string>
   <string name="error_cant_bind_to_operations_service">Kritična napaka: dejanj ni možno izvesti</string>
-  <string name="network_error_socket_exception">Pri povezavi s tem strežnikom je prišlo do napake.</string>
-  <string name="network_error_socket_timeout_exception">Med čakanjem na strežnik je prišlo do napake. Zahtevanega dejanja ni bilo moč izvesti.</string>
-  <string name="network_error_connect_timeout_exception">Med čakanjem na strežnik je prišlo do napake. Zahtevanega dejanja ni bilo moč izvesti.</string>
-  <string name="network_host_not_available">Zahtevanega dejanja se ne da izvesti ker strežnik ni dosegljiv.</string>
+  <string name="network_error_socket_exception">Med povezovanjem s strežnikom je prišlo do napake.</string>
+  <string name="network_error_socket_timeout_exception">Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni mogoče izvesti.</string>
+  <string name="network_error_connect_timeout_exception">Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni bilo mogoče končati.</string>
+  <string name="network_host_not_available">Zahtevanega dejanja ni bilo mogoče končati. Strežnik ni dosegljiv.</string>
 </resources>

res/values-sq/strings.xml

@@ -8,6 +8,8 @@
   <string name="prefs_category_general">Përgjithshme</string>
   <string name="prefs_category_more">Më tepër</string>
   <string name="prefs_accounts">Llogarit</string>
+  <string name="prefs_pincode">PIN-i Aplikacionit</string>
+  <string name="prefs_pincode_summary">Ruani klientin tuaj</string>
   <string name="prefs_help">Ndihmë</string>
   <string name="prefs_imprint">Stampoj</string>
   <string name="auth_username">Përdoruesi</string>
@@ -38,6 +40,7 @@
   <string name="delete_account">Fshi llogarin</string>
   <string name="create_account">Krijo llogari</string>
   <string name="upload_chooser_title">Ngarko nga...</string>
+  <string name="uploader_info_dirname">Emri i Skedarit</string>
   <string name="uploader_upload_in_progress_ticker">Ngarkim...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Ngarkim %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Ngarkimi me sukses.</string>
@@ -49,6 +52,17 @@
   <string name="downloader_download_succeeded_ticker">Shkarkimi me sukses</string>
   <string name="downloader_download_succeeded_content">%1$s u shkarkua me sukses</string>
   <string name="downloader_download_failed_ticker">Shkarkimi dështoj</string>
+  <string name="common_choose_account">Zgjidhni Llogarine</string>
+  <string name="pincode_enter_pin_code">Lutemi, vendosni PIN tuaj</string>
+  <string name="pincode_reenter_your_pincode">Lutemi, rivendosni PIN tuaj</string>
+  <string name="pincode_remove_your_pincode">Hiqni PIN in tuaj</string>
+  <string name="pincode_mismatch">PIN-et nuk jane te njejte</string>
+  <string name="pincode_wrong">PIN i gabuar</string>
+  <string name="pincode_removed">PIN-i u hoq</string>
+  <string name="pincode_stored">PIN-i u ruajt</string>
+  <string name="auth_no_net_conn_title">Nuk ka lidhje ne Rrjet</string>
+  <string name="auth_connection_established">Lidhja u vendos</string>
+  <string name="auth_testing_connection">Duke testuar lidhjen</string>
   <string name="auth_secure_connection">Lidhja e Sigurt vendos</string>
   <string name="common_rename">Riemërto</string>
   <string name="common_remove">Hiq</string>

res/values-sv/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Vissa filer kunde inte flyttas</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Fjärr: %1$s</string>
-  <string name="upload_query_move_foreign_files">Det finns inte tillräckligt med utrymme för att kopiera valda filer till mappen %1$s. Vill du flytta filerna istället? </string>
+  <string name="upload_query_move_foreign_files">Det finns inte tillräckligt med ledigt utrymme för att kopiera de valda filerna till %1$s mappen. Skulle du vilja flytta dem istället?</string>
   <string name="pincode_enter_pin_code">Ange din PIN</string>
   <string name="pincode_configure_your_pin">Ange applikation PIN</string>
   <string name="pincode_configure_your_pin_explanation">Din PIN måste anges varje gång du startar programmet.</string>

res/values-th-rTH/strings.xml

@@ -75,7 +75,6 @@
   <string name="foreign_files_fail">มีบางแฟ้มข้อมูลไม่สามารถย้ายได้</string>
   <string name="foreign_files_local_text">ต้นทาง: %1$s</string>
   <string name="foreign_files_remote_text">ปลายทาง: %1$s</string>
-  <string name="upload_query_move_foreign_files">ไม่มีพื้นที่เหลือเพียงพอสำหรับคัดลอกแฟ้มข้อมูลที่เลือกไว้ไปที่โฟลเดอร์ %1$s คุณต้องการย้ายมันแทนหรือไม่</string>
   <string name="pincode_enter_pin_code">กรุณาใส่ PIN แอปของคุณ</string>
   <string name="pincode_configure_your_pin">กรอกรหัส PIN ของ  App</string>
   <string name="pincode_configure_your_pin_explanation">หมายเลข PIN ดังกล่าวจะถูกร้องขอทุกครั้งที่เริ่มใช้งานแอปฯ</string>

res/values-tr/strings.xml

@@ -108,7 +108,7 @@
   <string name="foreign_files_fail">Bazı dosyalar taşınamadı</string>
   <string name="foreign_files_local_text">Yerel: %1$s</string>
   <string name="foreign_files_remote_text">Uzak: %1$s</string>
-  <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s klasörüne kopyalamak için yeterli alan yok. Bunun yerine dosyayı taşımak ister misiniz?</string>
+  <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s dizinine kopyalamak için yeterli alan yok. Bunun yerine dosyayı içine taşımak ister misiniz?</string>
   <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'inizi girin</string>
   <string name="pincode_configure_your_pin">Uygulama PIN\'inizi girin</string>
   <string name="pincode_configure_your_pin_explanation">PIN uygulama yeniden başladığında tekrar sorulacak</string>

res/values-uk/strings.xml

@@ -78,7 +78,6 @@
   <string name="foreign_files_fail">Деякі файли не можуть бути переміщені</string>
   <string name="foreign_files_local_text">Локально: %1$s</string>
   <string name="foreign_files_remote_text">Віддалено: %1$s</string>
-  <string name="upload_query_move_foreign_files">Недостатньо місця для копіювання обраних файлів у теку %1$s. Чи бажаєте ви перемістити їх замість копіювання?</string>
   <string name="pincode_enter_pin_code">Будь ласка, введіть свій програмний PIN</string>
   <string name="pincode_configure_your_pin">Введіть програмний PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN необхідно буде вводити щоразу при запуску цієї програми</string>

res/values-vi/strings.xml

@@ -98,7 +98,6 @@
   <string name="foreign_files_fail">Một vài tập tin không thể chuyển đi</string>
   <string name="foreign_files_local_text">Cục bộ: %1$s</string>
   <string name="foreign_files_remote_text">Từ xa: %1$s</string>
-  <string name="upload_query_move_foreign_files">Không đủ chỗ trống để chép các tập tin đã chọn vào thư mục %1$s. Bạn có muốn di chuyển chúng thay vì sao chép?</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_configure_your_pin">Nhập mã PIN ứng dụng App</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>

res/values-zh-rCN/strings.xml

@@ -7,7 +7,7 @@
   <string name="actionbar_upload_from_apps">来自其它app的内容</string>
   <string name="actionbar_upload_files">文件</string>
   <string name="actionbar_open_with">打开</string>
-  <string name="actionbar_mkdir">添加文件夹</string>
+  <string name="actionbar_mkdir">增加文件夹</string>
   <string name="actionbar_settings">设置</string>
   <string name="actionbar_see_details">详细信息</string>
   <string name="actionbar_send_file">发送</string>
@@ -96,13 +96,14 @@
   <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
   <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
+  <string name="sync_foreign_files_forgotten_content">%2$s 目录中的 %1$d 个文件不能被复制到</string>
+  <string name="sync_foreign_files_forgotten_explanation">从 1.3.16 版起，从此设备上传的文件将被复制到本地的 %1$s 文件夹，以防止某个单一文件在多个账户间同步而造成的数据损失。\n\n由于此项变化，此应用之前的版本上传的全部文件都已被复制到了 %2$s 文件夹。然而，账户同步期间有一个错误阻止了此操作的完成。您可能想保持文件不动，并移除指向 %3$s 的链接，或将文件移动到 %1$s 文件夹中并保持其到 %4$s 的链接。\n\n下面列出的是本地文件，以及它们被链接到的 %5$s 中的远程文件。</string>
   <string name="sync_current_folder_was_removed">文件夹%1$s 不存在</string>
   <string name="foreign_files_move">移动所有</string>
   <string name="foreign_files_success">所有文件已被移动</string>
   <string name="foreign_files_fail">某些文件无法被移动</string>
   <string name="foreign_files_local_text">本地: %1$s</string>
   <string name="foreign_files_remote_text">远程:%1$s</string>
-  <string name="upload_query_move_foreign_files">没有足够的空间来将选定的文件复制到%1$s文件夹. 是否使用使用移动来代替复制?</string>
   <string name="pincode_enter_pin_code">请输入您的App PIN码</string>
   <string name="pincode_configure_your_pin">输入 App PIN码</string>
   <string name="pincode_configure_your_pin_explanation">每次应用启动时都会请求PIN码</string>
@@ -152,6 +153,7 @@
   <string name="auth_oauth_error">认证不成功</string>
   <string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
   <string name="auth_wtf_reenter_URL">意外状态；请再次输入服务器的地址</string>
+  <string name="auth_expired_oauth_token_toast">你的授权已经过期。请重新授权。</string>
   <string name="auth_expired_basic_auth_toast">请输入当前密码：</string>
   <string name="auth_expired_saml_sso_token_toast">您的会话超时了，请重新连接</string>
   <string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
@@ -160,6 +162,8 @@
   <string name="fd_keep_in_sync">保证文件更新</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>
@@ -217,6 +221,8 @@
   <string name="conflict_overwrite">覆盖</string>
   <string name="conflict_dont_upload">不上传</string>
   <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="actionbar_failed_instant_upload">即时上传失败</string>
   <string name="failed_upload_headline_text">限时上传失败</string>
   <string name="failed_upload_headline_hint">限时上传失败汇总</string>
@@ -224,6 +230,7 @@
   <string name="failed_upload_headline_retryall_btn">重试全选</string>
   <string name="failed_upload_headline_delete_all_btn">从上传列表删除所有选定项</string>
   <string name="failed_upload_retry_text">重试上传图片</string>
+  <string name="failed_upload_load_more_images">加载更多图片</string>
   <string name="failed_upload_retry_do_nothing_text">不在线时不开启即时上传</string>
   <string name="failed_upload_failure_text">失败消息</string>
   <string name="failed_upload_quota_exceeded_text">请检查服务器设置。可能走出配额。</string>

res/values-zh-rTW/strings.xml

@@ -108,7 +108,6 @@
   <string name="foreign_files_fail">部份文件無法被移動</string>
   <string name="foreign_files_local_text">本地: %1$s</string>
   <string name="foreign_files_remote_text">遠端: %1$s</string>
-  <string name="upload_query_move_foreign_files">無足夠的空間可以複製檔案到 %1$s 目錄. 是否使用移動的方式來處理? </string>
   <string name="pincode_enter_pin_code">請輸入您的 App 密碼</string>
   <string name="pincode_configure_your_pin">輸入您的 App 密碼</string>
   <string name="pincode_configure_your_pin_explanation">這個密碼在你每次啟動這程式時都會被要求輸入</string>

res/values/strings.xml

@@ -113,7 +113,7 @@
     <string name="foreign_files_fail">"Some files could not be moved"</string>
     <string name="foreign_files_local_text">"Local: %1$s"</string>
     <string name="foreign_files_remote_text">"Remote: %1$s"</string>
-    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>
+    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     
     <string name="pincode_configure_your_pin">Enter your App PIN</string>

src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -186,6 +186,8 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag());
         cv.put(ProviderTableMeta.FILE_SHARE_BY_LINK, file.isShareByLink() ? 1 : 0);
         cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
+        cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
+        cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
         
         boolean sameRemotePath = fileExists(file.getRemotePath());
         if (sameRemotePath ||
@@ -285,6 +287,8 @@ public class FileDataStorageManager {
             cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag());
             cv.put(ProviderTableMeta.FILE_SHARE_BY_LINK, file.isShareByLink() ? 1 : 0);
             cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
+            cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
+            cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
 
             boolean existsByPath = fileExists(file.getRemotePath());
             if (existsByPath || fileExists(file.getFileId())) {
@@ -342,6 +346,8 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.FILE_ETAG, folder.getEtag());
         cv.put(ProviderTableMeta.FILE_SHARE_BY_LINK, folder.isShareByLink() ? 1 : 0);
         cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, folder.getPublicLink());
+        cv.put(ProviderTableMeta.FILE_PERMISSIONS, folder.getPermissions());
+        cv.put(ProviderTableMeta.FILE_REMOTE_ID, folder.getRemoteId());
         
         operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI).
                 withValues(cv).
@@ -750,6 +756,8 @@ public class FileDataStorageManager {
             file.setShareByLink(c.getInt(
                     c.getColumnIndex(ProviderTableMeta.FILE_SHARE_BY_LINK)) == 1 ? true : false);
             file.setPublicLink(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PUBLIC_LINK)));
+            file.setPermissions(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PERMISSIONS)));
+            file.setRemoteId(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID)));
                     
         }
         return file;
@@ -1092,6 +1100,8 @@ public class FileDataStorageManager {
                 cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag());
                 cv.put(ProviderTableMeta.FILE_SHARE_BY_LINK, file.isShareByLink() ? 1 : 0);
                 cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
+                cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
+                cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
 
                 boolean existsByPath = fileExists(file.getRemotePath());
                 if (existsByPath || fileExists(file.getFileId())) {

src/com/owncloud/android/datamodel/OCFile.java

@@ -65,6 +65,9 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private boolean mShareByLink;
     private String mPublicLink;
 
+    private String mPermissions;
+    private String mRemoteId;
+
 
     /**
      * Create new {@link OCFile} with given path.
@@ -104,6 +107,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mEtag = source.readString();
         mShareByLink = source.readInt() == 1;
         mPublicLink = source.readString();
+        mPermissions = source.readString();
+        mRemoteId = source.readString();
     }
 
     @Override
@@ -124,6 +129,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         dest.writeString(mEtag);
         dest.writeInt(mShareByLink ? 1 : 0);
         dest.writeString(mPublicLink);
+        dest.writeString(mPermissions);
+        dest.writeString(mRemoteId);
     }
     
     /**
@@ -334,6 +341,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mEtag = null;
         mShareByLink = false;
         mPublicLink = null;
+        mPermissions = null;
+        mRemoteId = null;
     }
 
     /**
@@ -518,4 +527,20 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         return (result != null) ? result : "";
     }
 
+    public String getPermissions() {
+        return mPermissions;
+    }
+
+    public void setPermissions(String permissions) {
+        this.mPermissions = permissions;
+    }
+
+    public String getRemoteId() {
+        return mRemoteId;
+    }
+
+    public void setRemoteId(String remoteId) {
+        this.mRemoteId = remoteId;
+    }
+
 }

src/com/owncloud/android/db/ProviderMeta.java

@@ -17,11 +17,11 @@
  */
 package com.owncloud.android.db;
 
-import com.owncloud.android.MainApp;
-
 import android.net.Uri;
 import android.provider.BaseColumns;
 
+import com.owncloud.android.MainApp;
+
 /**
  * Meta-Class that holds various static field information
  * 
@@ -31,7 +31,7 @@ import android.provider.BaseColumns;
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 6;
+    public static final int DB_VERSION = 7;
 
     private ProviderMeta() {
     }
@@ -68,6 +68,8 @@ public class ProviderMeta {
         public static final String FILE_ETAG = "etag";
         public static final String FILE_SHARE_BY_LINK = "share_by_link";
         public static final String FILE_PUBLIC_LINK = "public_link";
+        public static final String FILE_PERMISSIONS = "permissions";
+        public static final String FILE_REMOTE_ID = "remote_id";
 
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME
                 + " collate nocase asc";

src/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -416,6 +416,8 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         file.setMimetype(remote.getMimeType());
         file.setModificationTimestamp(remote.getModifiedTimestamp());
         file.setEtag(remote.getEtag());
+        file.setPermissions(remote.getPermissions());
+        file.setRemoteId(remote.getRemoteId());
         return file;
     }
     

src/com/owncloud/android/providers/FileContentProvider.java

@@ -93,6 +93,10 @@ public class FileContentProvider extends ContentProvider {
                 ProviderTableMeta.FILE_SHARE_BY_LINK);
         mFileProjectionMap.put(ProviderTableMeta.FILE_PUBLIC_LINK,
                 ProviderTableMeta.FILE_PUBLIC_LINK);
+        mFileProjectionMap.put(ProviderTableMeta.FILE_PERMISSIONS,
+                ProviderTableMeta.FILE_PERMISSIONS);
+        mFileProjectionMap.put(ProviderTableMeta.FILE_REMOTE_ID,
+                ProviderTableMeta.FILE_REMOTE_ID);
     }
 
     private static final int SINGLE_FILE = 1;
@@ -554,7 +558,9 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " INTEGER, "
                     + ProviderTableMeta.FILE_ETAG + " TEXT, " 
                     + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER, "
-                    + ProviderTableMeta.FILE_PUBLIC_LINK  + " TEXT );"
+                    + ProviderTableMeta.FILE_PUBLIC_LINK  + " TEXT, "
+                    + ProviderTableMeta.FILE_PERMISSIONS  + " TEXT null,"
+                    + ProviderTableMeta.FILE_REMOTE_ID  + " TEXT null);"
                     );
             
             // Create table ocshares
@@ -643,7 +649,7 @@ public class FileContentProvider extends ContentProvider {
             }
             if (!upgraded)
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
-            
+
             if (oldVersion < 6 && newVersion >= 6) {
                 Log_OC.i("SQL", "Entering in the #5 ADD in onUpgrade");
                 db.beginTransaction();
@@ -655,7 +661,7 @@ public class FileContentProvider extends ContentProvider {
                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_PUBLIC_LINK + " TEXT " +
                             " DEFAULT NULL");
-                    
+
                     // Create table ocshares
                     db.execSQL("CREATE TABLE " + ProviderTableMeta.OCSHARES_TABLE_NAME + "("
                             + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
@@ -673,6 +679,27 @@ public class FileContentProvider extends ContentProvider {
                             + ProviderTableMeta.OCSHARES_USER_ID + " INTEGER, "
                             + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER," 
                             + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );" );
+
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+            if (!upgraded)
+                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
+
+            if (oldVersion < 7 && newVersion >= 7) {
+                Log_OC.i("SQL", "Entering in the #7 ADD in onUpgrade");
+                db.beginTransaction();
+                try {
+                    db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
+                            " ADD COLUMN " + ProviderTableMeta.FILE_PERMISSIONS + " TEXT " +
+                            " DEFAULT NULL");
+
+                    db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
+                            " ADD COLUMN " + ProviderTableMeta.FILE_REMOTE_ID + " TEXT " +
+                            " DEFAULT NULL");
                     
                     upgraded = true;
                     db.setTransactionSuccessful();

src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -17,8 +17,10 @@
  */
 package com.owncloud.android.ui.adapter;
 
+import java.util.Vector;
+
 import android.accounts.Account;
-import android.content.Context;
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,9 +30,6 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-
-import java.util.Vector;
-
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -49,6 +48,8 @@ import com.owncloud.android.utils.DisplayUtils;
  * 
  */
 public class FileListListAdapter extends BaseAdapter implements ListAdapter {
+    private final static String PERMISSION_SHARED_WITH_ME = "S";
+
     private Context mContext;
     private OCFile mFile = null;
     private Vector<OCFile> mFiles = null;
@@ -113,7 +114,10 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
             fileName.setText(name);
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
-            fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
+            ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
+            ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
+            sharedWithMeIconV.setVisibility(View.GONE);
+
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
@@ -158,7 +162,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     }
                     checkBoxV.setVisibility(View.VISIBLE);
                 }
-                
+
+                fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
+
+                if (checkIfFileIsSharedWithMe(file)) {
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);
+                }
             } 
             else {
                 
@@ -168,13 +177,19 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));
                 checkBoxV.setVisibility(View.GONE);
                 view.findViewById(R.id.imageView3).setVisibility(View.GONE);
+
+                if (checkIfFileIsSharedWithMe(file)) {
+                    fileIcon.setImageResource(R.drawable.shared_with_me_folder);
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);
+                } else {
+                    fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
+                }
             }
-            
-            ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);
+
             if (file.isShareByLink()) {
-                shareIconV.setVisibility(View.VISIBLE);
+                sharedIconV.setVisibility(View.VISIBLE);
             } else {
-                shareIconV.setVisibility(View.INVISIBLE);
+                sharedIconV.setVisibility(View.GONE);
             }
         }
 
@@ -215,4 +230,15 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         notifyDataSetChanged();
     }
     
+    /**
+     * Check if parent folder does not include 'S' permission and if file/folder
+     * is shared with me
+     * 
+     * @param file: OCFile
+     * @return boolean: True if it is shared with me and false if it is not
+     */
+    private boolean checkIfFileIsSharedWithMe(OCFile file) {
+        return (mFile.getPermissions() != null && !mFile.getPermissions().contains(PERMISSION_SHARED_WITH_ME)
+                && file.getPermissions() != null && file.getPermissions().contains(PERMISSION_SHARED_WITH_ME));
+    }
 }

src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java

@@ -21,10 +21,6 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import com.owncloud.android.R;
-import com.owncloud.android.utils.DisplayUtils;
-
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,6 +31,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
+
 /**
  * This Adapter populates a ListView with all files and directories contained
  * in a local directory
@@ -136,7 +135,8 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
             view.findViewById(R.id.imageView2).setVisibility(View.INVISIBLE);   // not GONE; the alignment changes; ugly way to keep it
             view.findViewById(R.id.imageView3).setVisibility(View.GONE);
             
-            view.findViewById(R.id.shareIcon).setVisibility(View.GONE);
+            view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
+            view.findViewById(R.id.sharedWithMeIcon).setVisibility(View.GONE);
         }
 
         return view;

src/com/owncloud/android/utils/FileStorageUtils.java

@@ -97,7 +97,8 @@ public class FileStorageUtils {
         file.setMimetype(remote.getMimeType());
         file.setModificationTimestamp(remote.getModifiedTimestamp());
         file.setEtag(remote.getEtag());
-        
+        file.setPermissions(remote.getPermissions());
+        file.setRemoteId(remote.getRemoteId());
         return file;
     }
     
@@ -114,6 +115,8 @@ public class FileStorageUtils {
         file.setMimeType(ocFile.getMimetype());
         file.setModifiedTimestamp(ocFile.getModificationTimestamp());
         file.setEtag(ocFile.getEtag());
+        file.setPermissions(ocFile.getPermissions());
+        file.setRemoteId(ocFile.getRemoteId());
         return file;
     }