Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:39:24 +0000 (17:39 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:39:24 +0000 (17:39 +0100)
53 files changed:
1  2 
res/layout/ssl_untrusted_cert_layout.xml
res/values-ar/strings.xml
res/values-az/strings.xml
res/values-bg-rBG/strings.xml
res/values-bn-rBD/strings.xml
res/values-ca/strings.xml
res/values-cs-rCZ/strings.xml
res/values-da/strings.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-eo/strings.xml
res/values-es-rAR/strings.xml
res/values-es/strings.xml
res/values-et-rEE/strings.xml
res/values-eu/strings.xml
res/values-fi-rFI/strings.xml
res/values-fr/strings.xml
res/values-gl/strings.xml
res/values-he/strings.xml
res/values-hu-rHU/strings.xml
res/values-id/strings.xml
res/values-it/strings.xml
res/values-ja-rJP/strings.xml
res/values-ko/strings.xml
res/values-lb/strings.xml
res/values-lt-rLT/strings.xml
res/values-mk/strings.xml
res/values-nb-rNO/strings.xml
res/values-nl/strings.xml
res/values-oc/strings.xml
res/values-pl/strings.xml
res/values-pt-rBR/strings.xml
res/values-pt-rPT/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk-rSK/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-th-rTH/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/operations/RefreshFolderOperation.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java

@@@ -21,7 -21,7 +21,7 @@@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:gravity="center"
 -      android:padding="16dp"
 +      android:padding="@dimen/standard_padding"
      android:orientation="vertical" >
  
        <TextView
@@@ -29,7 -29,7 +29,7 @@@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"
 -              android:paddingBottom="16dp"
 +              android:paddingBottom="@dimen/standard_padding"
                android:text="@string/ssl_validator_header"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="@android:color/black"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                />
-                               
  
                                <TextView
                                android:id="@+id/label_signature"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"
                        />
-                                                                                                                                                                                               
-                                                               
                                <TextView
-                               android:id="@+id/value_signature"
-                               android:layout_width="wrap_content"
-                               android:layout_height="wrap_content"
+                                       android:id="@+id/label_certificate_fingerprint"
+                                       android:layout_width="wrap_content"
+                                       android:layout_height="wrap_content"
                                        android:paddingBottom="5dp"
-                               android:text=""
-                               android:textAppearance="?android:attr/textAppearanceSmall"
-                       />
+                                       android:text="@string/ssl_validator_label_certificate_fingerprint"
+                                       android:textAppearance="?android:attr/textAppearanceSmall"
+                               />
+                               <TextView
+                                       android:id="@+id/value_certificate_fingerprint"
+                                       android:layout_width="wrap_content"
+                                       android:layout_height="wrap_content"
+                                       android:paddingBottom="5dp"
+                                       android:text=""
+                                       android:textAppearance="?android:attr/textAppearanceSmall"
+                               />
                                
                </LinearLayout>
                
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
                android:layout_weight="0"
 -              android:paddingTop="16dp"
 +              android:paddingTop="@dimen/standard_padding"
          android:text="@string/ssl_validator_question"
          android:textAppearance="?android:attr/textAppearanceMedium"
          >
    <string name="favorite">المفضلة</string>
    <string name="common_rename">إعادة التسمية</string>
    <string name="common_remove">حذف</string>
 -  <string name="confirmation_remove_alert">هل تريد حقاً حذف %1$s ؟</string>
 +  <string name="confirmation_remove_file_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="folder_picker_choose_button_text">اختيار</string>
    <string name="prefs_category_security">الأمان</string>
    <string name="auth_host_address">عنوان الخادم</string>
+   <string name="share_dialog_title">مشاركة</string>
+   <string name="share_search">البحث</string>
  </resources>
@@@ -181,7 -181,7 +181,7 @@@ Aşağıda göstərilən %5$s-də olan 
    <string name="favorite">İstəkli</string>
    <string name="common_rename">Adı dəyiş</string>
    <string name="common_remove">Sil</string>
 -  <string name="confirmation_remove_alert">Siz həqiqətən %1$s silmək istəyirsiniz?</string>
 +  <string name="confirmation_remove_file_alert">Siz həqiqətən %1$s silmək istəyirsiniz?</string>
    <string name="confirmation_remove_folder_alert">Siz həqiqətəndə %1$s və onun kontentini silmək istəyirsiniz?</string>
    <string name="confirmation_remove_local">Yalnız daxili</string>
    <string name="confirmation_remove_folder_local">Yalnız daxili</string>
@@@ -285,6 -285,9 +285,9 @@@ inzibatçınızla əlaqə saxlayasını
    <string name="prefs_category_instant_uploading">Anında yükləmələr</string>
    <string name="prefs_category_security">Təhlükəsizlik</string>
    <string name="prefs_instant_video_upload_path_title">Video ünvanını yüklə</string>
+   <string name="subject_user_shared_with_you">%1$s paylaşdı \"%2$s\" sizinlə</string>
    <string name="auth_refresh_button">Qoşulmanı yenilə</string>
    <string name="auth_host_address">Server ünvanı</string>
+   <string name="share_dialog_title">Paylaşılır</string>
+   <string name="share_search">Axtarış</string>
  </resources>
    <string name="favorite">Любими</string>
    <string name="common_rename">Преименуване</string>
    <string name="common_remove">Премахване</string>
 -  <string name="confirmation_remove_alert">Наистина ли искате да изтриете %1$s ?</string>
 +  <string name="confirmation_remove_file_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="prefs_instant_video_upload_path_title">Качване на видео път</string>
    <string name="shared_subject_header">споделен</string>
    <string name="with_you_subject_header">с теб</string>
-   <string name="subject_token">%1$s споделен \"%2$s\" с теб</string>
+   <string name="subject_user_shared_with_you">%1$s споделен \"%2$s\" с теб</string>
    <string name="auth_refresh_button">Обнови връзката</string>
    <string name="auth_host_address">Адрес на сървъра</string>
    <string name="common_error_out_memory">Няма достатъчно памет</string>
    <string name="file_list__footer__files">%1$d файла</string>
    <string name="file_list__footer__files_and_folder">%1$d файла, 1 папка</string>
    <string name="file_list__footer__files_and_folders">%1$d файла, %2$d папки</string>
+   <string name="share_dialog_title">Споделяне</string>
+   <string name="share_search">Търсене</string>
  </resources>
    <string name="favorite">প্রিয়জন</string>
    <string name="common_rename">পূনঃনামকরণ</string>
    <string name="common_remove">অপসারণ</string>
 -  <string name="confirmation_remove_alert">আপনি কি সত্যিই %1$s অপসারণ করতে চান?</string>
 +  <string name="confirmation_remove_file_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="move_file_not_found">সরাতে ব্যার্থ হলো। ফাইলটি রয়েছে কিনা দেখুন।</string>
    <string name="prefs_category_security">নিরাপত্তা</string>
    <string name="auth_host_address">সার্ভার ঠিকানা</string>
+   <string name="share_dialog_title">ভাগাভাগিরত</string>
+   <string name="share_search">অনুসন্ধান</string>
  </resources>
    <string name="favorite">Preferits</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_file_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 local</string>
    <string name="folder_picker_choose_button_text">Escull</string>
    <string name="prefs_category_security">Seguretat</string>
    <string name="auth_host_address">Adreça del servidor</string>
+   <string name="share_dialog_title">Compartir</string>
+   <string name="share_search">Cerca</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Náhled seznamu</string>
    <string name="action_share_file">Sdílet odkaz</string>
    <string name="action_unshare_file">Zrušit sdílení odkazu</string>
+   <string name="action_share_with_users">Sdílet s uživateli</string>
    <string name="common_yes">Ano</string>
    <string name="common_no">Ne</string>
    <string name="common_ok">OK</string>
    <string name="unfavorite">Odebrat z oblíbených</string>
    <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_file_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í</string>
 -  <string name="confirmation_remove_remote">Ze serveru</string>
 +  <string name="confirmation_remove_file_remote">Ze serveru</string>
    <string name="confirmation_remove_remote_and_local">Vzdálený &amp; místní</string>
    <string name="remove_success_msg">Úspěšně odstraněno</string>
    <string name="remove_fail_msg">Odstranění nelze dokončit</string>
    <string name="ssl_validator_label_validity_to">Pro:</string>
    <string name="ssl_validator_label_signature">Podpis:</string>
    <string name="ssl_validator_label_signature_algorithm">Alogritmus:</string>
+   <string name="digest_algorithm_not_available">Tento algoritmus není na vašem telefonu dostupný.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Otisk:</string>
+   <string name="certificate_load_problem">Došlo k problému s načtením certifikátu.</string>
    <string name="ssl_validator_null_cert">Certifikát nemohl být zobrazen.</string>
    <string name="ssl_validator_no_info_about_error">- Žádné informace o této chybě</string>
    <string name="placeholder_sentence">Zástupný text</string>
@@@ -317,8 -321,8 +321,8 @@@ správce systému.</string
    <string name="sync_folder_failed_content">Synchronizaci adresáře %1$s nelze dokončit</string>
    <string name="shared_subject_header">sdílené</string>
    <string name="with_you_subject_header">s vámi</string>
-   <string name="subject_token">%1$s s vámi sdílí \"%2$s\"</string>
-   <string name="saml_subject_token">\"%1$s\" ti byl nasdílen</string>
+   <string name="subject_user_shared_with_you">%1$s s vámi sdílí \"%2$s\"</string>
+   <string name="subject_shared_with_you">\"%1$s\" ti byl nasdílen</string>
    <string name="auth_refresh_button">Obnovit připojení</string>
    <string name="auth_host_address">Adresa serveru</string>
    <string name="common_error_out_memory">Nedostatek paměti</string>
    <string name="file_list__footer__files">%1$d soubory(ů)</string>
    <string name="file_list__footer__files_and_folder">%1$d soubory(ů), 1 adresář</string>
    <string name="file_list__footer__files_and_folders">%1$d soubory(ů), %2$d adresáře(ů)</string>
+   <string name="share_dialog_title">Sdílení</string>
+   <string name="share_with_user_section_title">Sdílet s uživateli a skupinami</string>
+   <string name="share_no_users">Zatím nebyla s uživateli sdílena žádná data</string>
+   <string name="share_add_user_or_group">Přidat uživatele nebo skupinu</string>
+   <string name="share_search">Hledat</string>
+   <string name="search_users_and_groups_hint">Prohledat uživatele a skupiny</string>
+   <string name="share_group_clarification">%1$s (skupina)</string>
+   <string name="share_sharee_unavailable">Omlouváme se, verze vašeho serveru neumožňuje v klientské aplikaci sdílení dat mezi uživateli.
+ \nKontaktujte prosím svého administrátora</string>
  </resources>
    <string name="unfavorite">Fjern markering som foretrukket</string>
    <string name="common_rename">Omdøb</string>
    <string name="common_remove">Fjern</string>
 -  <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Er du sikker på at du vil fjerne %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Ønsker du virkelig at slette %1$s og dets indhold?</string>
    <string name="confirmation_remove_local">Kun lokal</string>
    <string name="confirmation_remove_folder_local">Kun lokal</string>
 -  <string name="confirmation_remove_remote">Fra server</string>
 +  <string name="confirmation_remove_file_remote">Fra server</string>
    <string name="confirmation_remove_remote_and_local">Fjernbeliggende og lokalt</string>
    <string name="remove_success_msg">Vellykket fjernelse</string>
    <string name="remove_fail_msg">Fjernelse kunne ikke fuldføres</string>
    <string name="prefs_instant_video_upload_path_title">Sti til videoupload</string>
    <string name="shared_subject_header">delt</string>
    <string name="with_you_subject_header">med dig</string>
-   <string name="subject_token">%1$s delte \"%2$s\" med dig</string>
-   <string name="saml_subject_token">\"%1$s\" er blevet delt med dig</string>
+   <string name="subject_user_shared_with_you">%1$s delte \"%2$s\" med dig</string>
+   <string name="subject_shared_with_you">\"%1$s\" er blevet delt med dig</string>
    <string name="auth_refresh_button">Genopfrisk forbindelsen</string>
    <string name="auth_host_address">Serveradresse</string>
    <string name="common_error_out_memory">Ikke tilstrækkelig hukommelse</string>
    <string name="file_list__footer__files">%1$d filer</string>
    <string name="file_list__footer__files_and_folder">%1$d filer, 1 mape</string>
    <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
+   <string name="share_dialog_title">Deling</string>
+   <string name="share_search">Søg</string>
  </resources>
    <string name="unfavorite">Nicht mehr favorisieren</string>
    <string name="common_rename">Umbenennen</string>
    <string name="common_remove">Löschen</string>
 -  <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
 +  <string name="confirmation_remove_file_alert">Möchten Sie %1$s wirklich löschen?</string>
    <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
    <string name="confirmation_remove_local">Nur lokal</string>
    <string name="confirmation_remove_folder_local">Nur lokal</string>
    <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
    <string name="shared_subject_header">geteilt</string>
    <string name="with_you_subject_header">Mit Ihnen</string>
-   <string name="subject_token">%1$s hat \"%2$s\" mit Ihnen geteilt</string>
-   <string name="saml_subject_token">\"%1$s\" wurde mit dir geteilt</string>
+   <string name="subject_user_shared_with_you">%1$s hat \"%2$s\" mit Ihnen geteilt</string>
+   <string name="subject_shared_with_you">\"%1$s\" wurde mit dir geteilt</string>
    <string name="auth_refresh_button">Verbindung aktualisieren</string>
    <string name="auth_host_address">Serveradresse</string>
    <string name="common_error_out_memory">Nicht genügend Speicher</string>
    <string name="file_list__footer__files">%1$d Dateien</string>
    <string name="file_list__footer__files_and_folder">%1$d Dateien, 1 Ordner</string>
    <string name="file_list__footer__files_and_folders">%1$d Dateien, %2$d Ordner</string>
+   <string name="share_dialog_title">Teilen</string>
+   <string name="share_search">Suche</string>
  </resources>
    <string name="unfavorite">Favorit entfernen</string>
    <string name="common_rename">Umbenennen</string>
    <string name="common_remove">Löschen</string>
 -  <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
 +  <string name="confirmation_remove_file_alert">Möchtest Du %1$s wirklich löschen?</string>
    <string name="confirmation_remove_folder_alert">Möchtest Du wirklich %1$s und dessen Inhalte entfernen?</string>
    <string name="confirmation_remove_local">Nur lokal</string>
    <string name="confirmation_remove_folder_local">Nur lokal</string>
    <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
    <string name="shared_subject_header">geteilt</string>
    <string name="with_you_subject_header">Mit Dir</string>
-   <string name="subject_token">%1$s hat \"%2$s\" mit Dir geteilt</string>
-   <string name="saml_subject_token">\"%1$s\" wurde mit dir geteilt</string>
+   <string name="subject_user_shared_with_you">%1$s hat \"%2$s\" mit Dir geteilt</string>
+   <string name="subject_shared_with_you">\"%1$s\" wurde mit dir geteilt</string>
    <string name="auth_refresh_button">Verbindung aktualisieren</string>
    <string name="auth_host_address">Serveradresse</string>
    <string name="common_error_out_memory">Nicht genügend Speicher</string>
    <string name="file_list__footer__files">%1$d Dateien</string>
    <string name="file_list__footer__files_and_folder">%1$d Dateien, 1 Ordner</string>
    <string name="file_list__footer__files_and_folders">%1$d Dateien, %2$d Ordner</string>
+   <string name="share_dialog_title">Teilen</string>
+   <string name="share_search">Suche</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Διάταξη Λίστας</string>
    <string name="action_share_file">Διαμοιρασμός συνδέσμου</string>
    <string name="action_unshare_file">Ακύρωση διαμοιρασμού συνδέσμου</string>
+   <string name="action_share_with_users">Διαμοιρασμός με χρήστες</string>
    <string name="common_yes">Ναι</string>
    <string name="common_no">Όχι</string>
    <string name="common_ok">ΟΚ</string>
    <string name="unfavorite">Κατάργηση από τα αγαπημένα</string>
    <string name="common_rename">Μετονομασία</string>
    <string name="common_remove">Αφαίρεση</string>
 -  <string name="confirmation_remove_alert">Θέλετε στ\' αλήθεια να αφαιρέσετε το  %1$s;</string>
 +  <string name="confirmation_remove_file_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_file_remote">Από το διακομιστή</string>
    <string name="confirmation_remove_remote_and_local">Απομακρυσμένα &amp; τοπικά</string>
    <string name="remove_success_msg">Αφαίρεση επιτυχής</string>
    <string name="remove_fail_msg">Η αφαίρεση απέτυχε</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="digest_algorithm_not_available">Ο αλγόριθμος digest δεν είναι διαθέσιμος στο τηλέφωνό σας.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Ψηφιακό αποτύπωμα:</string>
+   <string name="certificate_load_problem">Πρόβλημα φόρτωσης του πιστοποιητικού.</string>
    <string name="ssl_validator_null_cert">Δεν μπορεί να εμφανιστεί το πιστοποιητικό.</string>
    <string name="ssl_validator_no_info_about_error">- Καμμία πληροφορία σχετικά με το σφάλμα</string>
    <string name="placeholder_sentence">Αυτό είναι ένα σημείο κράτησης θέσης</string>
    <string name="sync_folder_failed_content">Ο συγχρονισμός του φακέλου %1$s δεν μπόρεσε να ολοκληρωθεί</string>
    <string name="shared_subject_header">διαμοιρασμένα</string>
    <string name="with_you_subject_header">με εσάς</string>
-   <string name="subject_token">Ο %1$s διαμοιράστηκε το \"%2$s\" με εσάς</string>
-   <string name="saml_subject_token">\"%1$s\" μοιράστηκε μαζί σας</string>
+   <string name="subject_user_shared_with_you">Ο %1$s διαμοιράστηκε το \"%2$s\" με εσάς</string>
+   <string name="subject_shared_with_you">\"%1$s\" μοιράστηκε μαζί σας</string>
    <string name="auth_refresh_button">Ανανέωση σύνδεσης</string>
    <string name="auth_host_address">Διεύθυνση διακομιστή</string>
    <string name="common_error_out_memory">Δεν υπάρχει αρκετή μνήμη</string>
    <string name="file_list__footer__files">%1$d αρχεία</string>
    <string name="file_list__footer__files_and_folder">%1$d αρχεία, 1 φάκελος</string>
    <string name="file_list__footer__files_and_folders">%1$d αρχεία, %2$d φάκελοι</string>
+   <string name="share_dialog_title">Διαμοιρασμός</string>
+   <string name="share_with_user_section_title">Διαμοιρασμός με χρήστες και ομάδες</string>
+   <string name="share_no_users">Δεν έχουν διαμοιραστεί ακόμα δεδομένα με τους χρήστες</string>
+   <string name="share_add_user_or_group">Προσθήκη χρήστη ή ομάδας</string>
+   <string name="share_search">Αναζήτηση</string>
+   <string name="search_users_and_groups_hint">Αναζήτηση χρηστών και ομάδων</string>
+   <string name="share_group_clarification">%1$s (ομάδα)</string>
+   <string name="share_sharee_unavailable">Δεν επιτρέπεται ο διαμοιρασμός μεταξύ χρηστών μέσω εφαρμογής, σε αυτή την έκδοση.
+ \nΕπικοινωνήστε με το διαχειριστή του συστήματος</string>
  </resources>
    <string name="unfavorite">Unfavourite</string>
    <string name="common_rename">Rename</string>
    <string name="common_remove">Remove</string>
 -  <string name="confirmation_remove_alert">Do you really want to remove %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Do you really want to remove %1$s?</string>
    <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents?</string>
    <string name="confirmation_remove_local">Local only</string>
    <string name="confirmation_remove_folder_local">Local only</string>
    <string name="prefs_category_instant_uploading">Instant Uploads</string>
    <string name="prefs_category_security">Security</string>
    <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
+   <string name="subject_user_shared_with_you">%1$s shared \"%2$s\" with you</string>
    <string name="auth_refresh_button">Refresh connection</string>
    <string name="auth_host_address">Server address</string>
    <string name="common_error_out_memory">Not enough memory</string>
+   <string name="share_dialog_title">Sharing</string>
+   <string name="share_search">Search</string>
  </resources>
    <string name="unfavorite">Nefavoratigi</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_file_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 loka</string>
    <string name="auth_host_address">Servila adreso</string>
    <string name="file_list__footer__file">1 dosiero</string>
    <string name="file_list__footer__files">%1$d dosieroj</string>
+   <string name="share_dialog_title">Kunhavigo</string>
+   <string name="share_search">Serĉi</string>
  </resources>
    <string name="favorite">Favorito</string>
    <string name="common_rename">Renombrar</string>
    <string name="common_remove">Borrar</string>
 -  <string name="confirmation_remove_alert">¿Realmente quieres eliminar %1$s?</string>
 +  <string name="confirmation_remove_file_alert">¿Realmente quieres eliminar %1$s?</string>
    <string name="confirmation_remove_folder_alert">¿Realmente deseas eliminar %1$s y todo su contenido?</string>
    <string name="confirmation_remove_local">Sólo local</string>
    <string name="confirmation_remove_folder_local">Sólo local</string>
    <string name="prefs_category_security">Seguridad</string>
    <string name="prefs_instant_video_upload_path_title">Dirección de subida del video</string>
    <string name="auth_host_address">Dirección del servidor</string>
+   <string name="share_dialog_title">Compartiendo</string>
+   <string name="share_search">Buscar</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Diseño de lista</string>
    <string name="action_share_file">Compartir con enlace</string>
    <string name="action_unshare_file">Dejar de compartir</string>
+   <string name="action_share_with_users">Compartir con usuarios</string>
    <string name="common_yes">Sí</string>
    <string name="common_no">No</string>
    <string name="common_ok">Aceptar</string>
    <string name="unfavorite">No-favorito</string>
    <string name="common_rename">Renombrar</string>
    <string name="common_remove">Borrar</string>
 -  <string name="confirmation_remove_alert">¿Realmente desea eliminar %1$s?</string>
 +  <string name="confirmation_remove_file_alert">¿Realmente desea eliminar %1$s?</string>
    <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar %1$s y todo su contenido?</string>
    <string name="confirmation_remove_local">Sólo local</string>
    <string name="confirmation_remove_folder_local">Sólo local</string>
 -  <string name="confirmation_remove_remote">Desde el servidor</string>
 +  <string name="confirmation_remove_file_remote">Desde el servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto &amp; local</string>
    <string name="remove_success_msg">Borrado correctamente</string>
    <string name="remove_fail_msg">El borrado no pudo ser completado</string>
    <string name="ssl_validator_label_validity_to">A:</string>
    <string name="ssl_validator_label_signature">Firma:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Firma:</string>
+   <string name="certificate_load_problem">Existe un problema al cargar el certificado.</string>
    <string name="ssl_validator_null_cert">No se ha podido mostrar el certificado</string>
    <string name="ssl_validator_no_info_about_error">- No hay información acerca del error</string>
    <string name="placeholder_sentence">Esto es un marcador de posición</string>
    <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s no se pudo completar</string>
    <string name="shared_subject_header">compartido</string>
    <string name="with_you_subject_header">con usted</string>
-   <string name="subject_token">%1$s compartió \"%2$s\" conmigo</string>
-   <string name="saml_subject_token">\"%1$s\" ha sido compartido con usted.</string>
+   <string name="subject_user_shared_with_you">%1$s compartió \"%2$s\" conmigo</string>
+   <string name="subject_shared_with_you">\"%1$s\" ha sido compartido con usted.</string>
    <string name="auth_refresh_button">Refrescar la conexión</string>
    <string name="auth_host_address">Dirección del servidor</string>
    <string name="common_error_out_memory">No hay suficiente memoria</string>
    <string name="file_list__footer__files">%1$d archivos</string>
    <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
    <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
+   <string name="share_dialog_title">Compartiendo</string>
+   <string name="share_with_user_section_title">Compartir con Usuarios y Grupos</string>
+   <string name="share_no_users">Aún no se ha compartido con ningún usuario.</string>
+   <string name="share_add_user_or_group">Añadir usuario o grupo</string>
+   <string name="share_search">Buscar</string>
+   <string name="search_users_and_groups_hint">Buscar usuarios y grupos</string>
+   <string name="share_group_clarification">%1$s (grupo)</string>
+   <string name="share_sharee_unavailable">Lo siento, compartir no está disponible en su servidor.\nPor favor, contacte con su administrador</string>
  </resources>
@@@ -199,11 -199,11 +199,11 @@@ Allpool on loend kohalikest failidest n
    <string name="unfavorite">Eemalda lemmik</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_file_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</string>
 -  <string name="confirmation_remove_remote">Serverist</string>
 +  <string name="confirmation_remove_file_remote">Serverist</string>
    <string name="confirmation_remove_remote_and_local">Kaugfail &amp; kohalik</string>
    <string name="remove_success_msg">Eemaldamine oli edukas</string>
    <string name="remove_fail_msg">Eemaldamine ebaõnnestus</string>
    <string name="prefs_instant_video_upload_path_title">Video üleslaadimise asukoht</string>
    <string name="shared_subject_header">jagatud</string>
    <string name="with_you_subject_header">sinuga</string>
-   <string name="subject_token">%1$s jagas sinuga \"%2$s\"</string>
-   <string name="saml_subject_token">\"%1$s\" on sinuga jagatud</string>
+   <string name="subject_user_shared_with_you">%1$s jagas sinuga \"%2$s\"</string>
+   <string name="subject_shared_with_you">\"%1$s\" on sinuga jagatud</string>
    <string name="auth_refresh_button">Värskenda ühendust</string>
    <string name="auth_host_address">Serveri aadress</string>
    <string name="common_error_out_memory">Mälu pole piisavalt</string>
    <string name="file_list__footer__files">%1$d faili</string>
    <string name="file_list__footer__files_and_folder">%1$d faili, 1 kaust</string>
    <string name="file_list__footer__files_and_folders">%1$d faili, %2$d kausta</string>
+   <string name="share_dialog_title">Jagamine</string>
+   <string name="share_search">Otsi</string>
  </resources>
@@@ -174,7 -174,7 +174,7 @@@ Mesedez, baimendu berriz</string
    <string name="favorite">Gogokoa</string>
    <string name="common_rename">Berrizendatu</string>
    <string name="common_remove">Ezabatu</string>
 -  <string name="confirmation_remove_alert">Ziur zaude %1$s ezabatu nahi duzula?</string>
 +  <string name="confirmation_remove_file_alert">Ziur zaude %1$s ezabatu nahi duzula?</string>
    <string name="confirmation_remove_folder_alert">Ziru zaude %1$s eta bere edukiak ezabatu nahi dituzula?</string>
    <string name="confirmation_remove_local">Bertakoa bakarrik</string>
    <string name="confirmation_remove_folder_local">Bertakoa bakarrik</string>
    <string name="prefs_category_security">Segurtasuna</string>
    <string name="prefs_instant_video_upload_path_title">Bideo Igoera Bidea</string>
    <string name="auth_host_address">Zerbitzariaren helbidea</string>
+   <string name="share_dialog_title">Partekatzea</string>
+   <string name="share_search">Bilatu</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Luettelon asettelu</string>
    <string name="action_share_file">Jaa linkki</string>
    <string name="action_unshare_file">Poista linkin jako</string>
+   <string name="action_share_with_users">Jaa käyttäjien kanssa</string>
    <string name="common_yes">Kyllä</string>
    <string name="common_no">Ei</string>
    <string name="common_ok">OK</string>
    <string name="unfavorite">Poista suosikeista</string>
    <string name="common_rename">Nimeä uudelleen</string>
    <string name="common_remove">Poista</string>
 -  <string name="confirmation_remove_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
    <string name="confirmation_remove_folder_alert">Haluatko varmasti poistaa kohteen %1$s ja sen sisällön?</string>
    <string name="confirmation_remove_local">Vain paikallinen</string>
    <string name="confirmation_remove_folder_local">Vain paikallinen</string>
 -  <string name="confirmation_remove_remote">Palvelimelta</string>
 +  <string name="confirmation_remove_file_remote">Palvelimelta</string>
    <string name="confirmation_remove_remote_and_local">Etä ja paikallinen</string>
    <string name="remove_success_msg">Poistettu onnistuneesti</string>
    <string name="remove_fail_msg">Poistamista ei voitu suorittaa loppuun asti</string>
    <string name="ssl_validator_label_validity_to">Päättyen:</string>
    <string name="ssl_validator_label_signature">Allekirjoitus:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmi:</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Sormenjälki:</string>
+   <string name="certificate_load_problem">Varmennetta ladatessa ilmeni ongelmia.</string>
    <string name="ssl_validator_null_cert">Varmennetta ei voi näyttää.</string>
    <string name="ssl_validator_no_info_about_error">- Ei lisätietoja virheestä</string>
    <string name="placeholder_filetype">PNG-kuva</string>
    <string name="copy_file_error">Tätä tiedostoa tai kansiota kopioitaessa tapahtui virhe</string>
    <string name="prefs_category_instant_uploading">Välittömät lähetykset</string>
    <string name="prefs_category_security">Tietoturva</string>
+   <string name="prefs_instant_video_upload_path_title">Videoiden lähetyspolku</string>
    <string name="sync_folder_failed_content">Kansion %1$s synkronointia ei voitu suorittaa kokonaan</string>
    <string name="shared_subject_header">jaettu</string>
    <string name="with_you_subject_header">kanssasi</string>
-   <string name="subject_token">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
-   <string name="saml_subject_token">\"%1$s\" on jaettu kanssasi</string>
+   <string name="subject_user_shared_with_you">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
+   <string name="subject_shared_with_you">\"%1$s\" on jaettu kanssasi</string>
    <string name="auth_refresh_button">Päivitä yhteys</string>
    <string name="auth_host_address">Palvelimen osoite</string>
    <string name="common_error_out_memory">Muistia ei ole riittävästi</string>
    <string name="file_list__footer__files">%1$d tiedostoa</string>
    <string name="file_list__footer__files_and_folder">%1$d tiedostoa, 1 kansio</string>
    <string name="file_list__footer__files_and_folders">%1$d tiedostoa, %2$d kansiota</string>
+   <string name="share_dialog_title">Jakaminen</string>
+   <string name="share_with_user_section_title">Jaa käyttäjien tai ryhmien kanssa</string>
+   <string name="share_add_user_or_group">Lisää käyttäjä tai ryhmä</string>
+   <string name="share_search">Etsi</string>
+   <string name="search_users_and_groups_hint">Etsi käyttäjiä ja ryhmiä</string>
+   <string name="share_group_clarification">%1$s (ryhmä)</string>
  </resources>
@@@ -85,6 -85,7 +85,7 @@@ Téléchargez-le ici : %2$s</string
    <string name="list_layout">Affichage en liste</string>
    <string name="action_share_file">Partager le lien</string>
    <string name="action_unshare_file">Ne plus partager ce lien</string>
+   <string name="action_share_with_users">Partager avec des utilisateurs</string>
    <string name="common_yes">Oui</string>
    <string name="common_no">Non</string>
    <string name="common_ok">OK</string>
@@@ -203,11 -204,11 +204,11 @@@ Ci-dessous la liste des fichiers locaux
    <string name="unfavorite">Retirer des favoris</string>
    <string name="common_rename">Renommer</string>
    <string name="common_remove">Supprimer</string>
 -  <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Voulez-vous vraiment supprimer %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
    <string name="confirmation_remove_local">Local seulement</string>
    <string name="confirmation_remove_folder_local">Local seulement</string>
 -  <string name="confirmation_remove_remote">Depuis le serveur</string>
 +  <string name="confirmation_remove_file_remote">Depuis le serveur</string>
    <string name="confirmation_remove_remote_and_local">Distant &amp; local</string>
    <string name="remove_success_msg">Suppression effectuée avec succès</string>
    <string name="remove_fail_msg">Suppression impossible</string>
    <string name="ssl_validator_label_validity_to">Au :</string>
    <string name="ssl_validator_label_signature">Signature :</string>
    <string name="ssl_validator_label_signature_algorithm">Algorithme :</string>
+   <string name="digest_algorithm_not_available">Cet algorithme de hachage n\'est pas disponible sur votre téléphone.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Empreinte numérique :</string>
+   <string name="certificate_load_problem">Le chargement du certificat pose problème.</string>
    <string name="ssl_validator_null_cert">Impossible d\'afficher le certificat.</string>
    <string name="ssl_validator_no_info_about_error">- Aucune information sur l\'erreur</string>
    <string name="placeholder_sentence">Ceci est un espace réservé</string>
    <string name="sync_folder_failed_content">La synchronisation du dossier %1$s n\'a pas pu être terminée</string>
    <string name="shared_subject_header">a partagé</string>
    <string name="with_you_subject_header">avec vous</string>
-   <string name="subject_token">%1$s a partagé \"%2$s\" avec vous</string>
-   <string name="saml_subject_token">\"%1$s\" a été partagé avec vous</string>
+   <string name="subject_user_shared_with_you">%1$s a partagé \"%2$s\" avec vous</string>
+   <string name="subject_shared_with_you">\"%1$s\" a été partagé avec vous</string>
    <string name="auth_refresh_button">Actualiser la connexion</string>
    <string name="auth_host_address">Adresse du serveur</string>
    <string name="common_error_out_memory">Mémoire insuffisante</string>
    <string name="file_list__footer__files">%1$d fichiers</string>
    <string name="file_list__footer__files_and_folder">%1$d fichiers, 1 dossier</string>
    <string name="file_list__footer__files_and_folders">%1$d fichiers, %2$d dossiers</string>
+   <string name="share_dialog_title">Partage</string>
+   <string name="share_with_user_section_title">Partager avec des Utilisateurs et des Groupes</string>
+   <string name="share_no_users">Aucune donnée partagée avec des utilisateurs pour le moment</string>
+   <string name="share_add_user_or_group">Ajouter un Utilisateur ou un Groupe</string>
+   <string name="share_search">Rechercher</string>
+   <string name="search_users_and_groups_hint">Chercher parmi les utilisateurs et groupes</string>
+   <string name="share_group_clarification">%1$s (groupe)</string>
+   <string name="share_sharee_unavailable">Désolé, la version du serveur ne permet pas aux applications d\'initier des partage avec d\'autres utilisateurs.
+ \nVeuillez contacter votre administrateur</string>
  </resources>
@@@ -72,6 -72,7 +72,7 @@@ Descárgueo de aquí: %2$s</string
    <string name="file_list_seconds_ago">segundos atrás</string>
    <string name="file_list_empty">Aquí non hai nada. Envíe algo!</string>
    <string name="file_list_loading">Cargando...</string>
+   <string name="file_list_no_app_for_file_type">Non se atopou un App para este tipo de ficheiro!</string>
    <string name="local_file_list_empty">Non hai ficheiros neste cartafol.</string>
    <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
    <string name="filedetails_size">Tamaño:</string>
    <string name="filedetails_created">Creado:</string>
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Descargar</string>
+   <string name="filedetails_sync_file">Sincronizar</string>
    <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado a %1$s durante o envío</string>
    <string name="list_layout">Deseño da lista</string>
    <string name="action_share_file">Ligazón para compartir</string>
    <string name="action_unshare_file">Deixar de compartir a ligazón</string>
+   <string name="action_share_with_users">Compartir con usuarios</string>
    <string name="common_yes">Si</string>
    <string name="common_no">Non</string>
    <string name="common_ok">Aceptar</string>
+   <string name="common_cancel_sync">Parar a sincronización</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Gardar e saír</string>
    <string name="common_error">Erro</string>
    <string name="unfavorite">Retirar de favoritos</string>
    <string name="common_rename">Renomear</string>
    <string name="common_remove">Retirar</string>
 -  <string name="confirmation_remove_alert">Confirma que quere retirar %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Confirma que quere retirar %1$s?</string>
    <string name="confirmation_remove_folder_alert">Confirma que quere retirar %1$s e o seu contido?</string>
    <string name="confirmation_remove_local">Só local</string>
    <string name="confirmation_remove_folder_local">Só local</string>
+   <string name="confirmation_remove_remote">Desde servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto e local</string>
    <string name="remove_success_msg">Retirado correctamente</string>
    <string name="remove_fail_msg">Non foi posíbel retiralo</string>
    <string name="move_file_invalid_overwrite">Este ficheiro xa existe no cartafol de destino</string>
    <string name="move_file_error">Produciuse un erro ao tentar mover este ficheiro ou cartafol.</string>
    <string name="forbidden_permissions_move">para mover este ficheiro</string>
+   <string name="copy_file_not_found">Non se puido copiar. Por favor comprobe que o ficheiro existe</string>
+   <string name="copy_file_invalid_into_descendent">Non é posible copiar un cartafol nun descendente seu</string>
    <string name="copy_file_invalid_overwrite">Este ficheiro xa existe no cartafol de destino</string>
+   <string name="copy_file_error">Oconteceu un erro mentras se intentaba copiar este ficheiro ou cartafol</string>
+   <string name="forbidden_permissions_copy">copiar este ficheiro</string>
    <string name="prefs_category_instant_uploading">Envío instantáneo</string>
    <string name="prefs_category_security">Seguridade</string>
    <string name="prefs_instant_video_upload_path_title">Enviar a ruta do vídeo</string>
+   <string name="sync_folder_failed_content">A sincronización do cartafol %1$s non se completou</string>
    <string name="shared_subject_header">compartido</string>
    <string name="with_you_subject_header">con vostede</string>
-   <string name="subject_token">%1$s compartiu «%2$s» con vostede</string>
-   <string name="saml_subject_token">«%1$s» foi compartido con vostede</string>
+   <string name="subject_user_shared_with_you">%1$s compartiu «%2$s» con vostede</string>
+   <string name="subject_shared_with_you">«%1$s» foi compartido con vostede</string>
    <string name="auth_refresh_button">Actualizar a conexión</string>
    <string name="auth_host_address">Enderezo do servidor</string>
    <string name="common_error_out_memory">Non hai memoria abondo</string>
    <string name="file_list__footer__files">%1$d ficheiros</string>
    <string name="file_list__footer__files_and_folder">%1$d ficheiros, 1 cartafol</string>
    <string name="file_list__footer__files_and_folders">%1$d ficheiros, %2$d cartafoles</string>
+   <string name="share_dialog_title">Compartindo</string>
+   <string name="share_with_user_section_title">Compartir con Usuarios e Grupos</string>
+   <string name="share_no_users">Aínda non hai datos compartidos con usuarios</string>
+   <string name="share_add_user_or_group">Engadir Usuario ou Grupo</string>
+   <string name="share_search">Buscar</string>
+   <string name="search_users_and_groups_hint">Buscar usuarios e grupos</string>
+   <string name="share_group_clarification">%1$s (grupo)</string>
+   <string name="share_sharee_unavailable">Sentímolo, pero a versión do seu servidor non permite compartir con usuarios desde o cliente.
+ \nPor favor contacte co seu administrador</string>
  </resources>
    <string name="favorite">מועדף</string>
    <string name="common_rename">שינוי שם</string>
    <string name="common_remove">הסרה</string>
 -  <string name="confirmation_remove_alert">האם באמת להסיר %1$s?</string>
 +  <string name="confirmation_remove_file_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="folder_picker_choose_button_text">בחירה</string>
    <string name="prefs_category_security">אבטחה</string>
    <string name="auth_host_address">כתובת שרת</string>
+   <string name="share_dialog_title">שיתוף</string>
+   <string name="share_search">חיפוש</string>
  </resources>
    <string name="unfavorite">Nem kedvenc</string>
    <string name="common_rename">Átnevezés</string>
    <string name="common_remove">Eltávolítás</string>
 -  <string name="confirmation_remove_alert">Tényleg el akarod távolítani %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Tényleg el akarod távolítani %1$s?</string>
    <string name="confirmation_remove_folder_alert">Tényleg el akarod távolítani a %1$s és tartalmát?</string>
    <string name="confirmation_remove_local">Csak a helyi példány</string>
    <string name="confirmation_remove_folder_local">Csak a helyi példány</string>
    <string name="file_list__footer__files">%1$d fájl</string>
    <string name="file_list__footer__files_and_folder">%1$d fájl, 1 könyvtár</string>
    <string name="file_list__footer__files_and_folders">%1$d fájl, %2$d könyvtár</string>
+   <string name="share_dialog_title">Megosztás</string>
+   <string name="share_search">Keresés</string>
  </resources>
    <string name="unfavorite">Hapus favorit</string>
    <string name="common_rename">Ubah nama</string>
    <string name="common_remove">Hapus</string>
 -  <string name="confirmation_remove_alert">Apakah Anda yakin ingin menghapus %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Apakah Anda yakin ingin menghapus %1$s?</string>
    <string name="confirmation_remove_folder_alert">Apakah Anda yakin ingin menghapus %1$s dan isinya?</string>
    <string name="confirmation_remove_local">Lokal saja</string>
    <string name="confirmation_remove_folder_local">Lokal saja</string>
 -  <string name="confirmation_remove_remote">Dari server</string>
 +  <string name="confirmation_remove_file_remote">Dari server</string>
    <string name="confirmation_remove_remote_and_local">Remot &amp; lokal</string>
    <string name="remove_success_msg">Penghapusan berhasil</string>
    <string name="remove_fail_msg">Penghapusan gagal</string>
    <string name="prefs_instant_video_upload_path_title">Unggah Lokasi Video</string>
    <string name="shared_subject_header">dibagikan</string>
    <string name="with_you_subject_header">kepada Anda</string>
-   <string name="subject_token">%1$s dibagikan \"%2$s\" kepada Anda</string>
-   <string name="saml_subject_token">\"%1$s\" telah membagikan dengan Anda</string>
+   <string name="subject_user_shared_with_you">%1$s dibagikan \"%2$s\" kepada Anda</string>
+   <string name="subject_shared_with_you">\"%1$s\" telah membagikan dengan Anda</string>
    <string name="auth_refresh_button">Menyegarkan sambungan</string>
    <string name="auth_host_address">Alamat server</string>
    <string name="common_error_out_memory">Memori tidak cukup</string>
    <string name="file_list__footer__files">%1$d berkas</string>
    <string name="file_list__footer__files_and_folder">%1$d berkas, 1 folder</string>
    <string name="file_list__footer__files_and_folders">%1$d berkas, %2$d folder</string>
+   <string name="share_dialog_title">Berbagi</string>
+   <string name="share_with_user_section_title">Bagikan dengan Pengguna dan Grup</string>
+   <string name="share_no_users">Tidak ada data yang dibagikan dengan pengguna</string>
+   <string name="share_add_user_or_group">Tambah Pengguna atau Grup</string>
+   <string name="share_search">Cari</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Struttura elenco</string>
    <string name="action_share_file">Condividi collegamento</string>
    <string name="action_unshare_file">Rimuovi condivisione collegamento</string>
+   <string name="action_share_with_users">Condividi con utenti</string>
    <string name="common_yes">Sì</string>
    <string name="common_no">No</string>
    <string name="common_ok">OK</string>
    <string name="unfavorite">Rimuovi dai preferiti</string>
    <string name="common_rename">Rinomina</string>
    <string name="common_remove">Rimuovi</string>
 -  <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Vuoi davvero rimuovere %1$s?</string>
    <string name="confirmation_remove_folder_alert">Vuoi davvero rimuovere %1$s e il suo contenuto?</string>
    <string name="confirmation_remove_local">Solo localmente</string>
    <string name="confirmation_remove_folder_local">Solo locale</string>
 -  <string name="confirmation_remove_remote">Dal server</string>
 +  <string name="confirmation_remove_file_remote">Dal server</string>
    <string name="confirmation_remove_remote_and_local">Remota e locale</string>
    <string name="remove_success_msg">Rimozione effettuata con successo</string>
    <string name="remove_fail_msg">La rimozione non può essere completata</string>
    <string name="ssl_validator_label_validity_to">A:</string>
    <string name="ssl_validator_label_signature">Firma:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
+   <string name="digest_algorithm_not_available">Questo algoritmo digest non è disponibile sul tuo telefono.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Impronta digitale:</string>
+   <string name="certificate_load_problem">Si è verificato un problema durante il caricamento del certificato.</string>
    <string name="ssl_validator_null_cert">Il certificato non può essere mostrato.</string>
    <string name="ssl_validator_no_info_about_error">- Nessuna informazione sull\'errore</string>
    <string name="placeholder_sentence">Questo è un segnaposto</string>
    <string name="sync_folder_failed_content">La sincronizzazione della cartella %1$s non può essere completata</string>
    <string name="shared_subject_header">condiviso</string>
    <string name="with_you_subject_header">con te</string>
-   <string name="subject_token">%1$s ha condiviso \"%2$s\" con te</string>
-   <string name="saml_subject_token">\"%1$s\" è stato condiviso con te</string>
+   <string name="subject_user_shared_with_you">%1$s ha condiviso \"%2$s\" con te</string>
+   <string name="subject_shared_with_you">\"%1$s\" è stato condiviso con te</string>
    <string name="auth_refresh_button">Aggiorna la connessione</string>
    <string name="auth_host_address">Indirizzo del server</string>
    <string name="common_error_out_memory">Memoria insufficiente</string>
    <string name="file_list__footer__files">%1$d file</string>
    <string name="file_list__footer__files_and_folder">%1$d file, 1 cartella</string>
    <string name="file_list__footer__files_and_folders">%1$d file, %2$d cartelle</string>
+   <string name="share_dialog_title">Condivisione</string>
+   <string name="share_with_user_section_title">Condividi con utenti e gruppi</string>
+   <string name="share_no_users">Ancora nessun dato condiviso con gli utenti </string>
+   <string name="share_add_user_or_group">Aggiungi utente o gruppo</string>
+   <string name="share_search">Cerca</string>
+   <string name="search_users_and_groups_hint">Cerca utenti e gruppi</string>
+   <string name="share_group_clarification">%1$s (gruppo)</string>
+   <string name="share_sharee_unavailable">Spiacenti, la versione del tuo server non consente la condivisione con utenti dai client.
+ \nContatta il tuo amministratore.</string>
  </resources>
@@@ -72,6 -72,7 +72,7 @@@
    <string name="file_list_seconds_ago">数秒前</string>
    <string name="file_list_empty">ここには何もありません。何かアップロードしてください。</string>
    <string name="file_list_loading">読込中...</string>
+   <string name="file_list_no_app_for_file_type">この種類のファイルに対応するアプリはありません!</string>
    <string name="local_file_list_empty">このフォルダーにはファイルがありません。</string>
    <string name="filedetails_select_file">ファイルをタップすると追加情報が表示されます。</string>
    <string name="filedetails_size">サイズ:</string>
    <string name="filedetails_created">作成:</string>
    <string name="filedetails_modified">更新:</string>
    <string name="filedetails_download">ダウンロード</string>
+   <string name="filedetails_sync_file">ファイルを同期</string>
    <string name="filedetails_renamed_in_upload_msg">アップロード中にファイル名を %1$s に変更しました</string>
    <string name="list_layout">リストレイアウト</string>
    <string name="action_share_file">URLで共有</string>
    <string name="action_unshare_file">未共有のリンク</string>
+   <string name="action_share_with_users">ユーザーと共有</string>
    <string name="common_yes">はい</string>
    <string name="common_no">いいえ</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">同期をキャンセル</string>
    <string name="common_cancel">キャンセル</string>
    <string name="common_save_exit">保存して終了</string>
    <string name="common_error">エラー</string>
    <string name="unfavorite">お気に入りを解除</string>
    <string name="common_rename">名前を変更</string>
    <string name="common_remove">削除</string>
 -  <string name="confirmation_remove_alert">本当に %1$s を削除しますか?</string>
 +  <string name="confirmation_remove_file_alert">本当に %1$s を削除しますか?</string>
    <string name="confirmation_remove_folder_alert">本当に %1$s およびそのコンテンツを削除してもよろしいですか?</string>
    <string name="confirmation_remove_local">ローカルのみ</string>
    <string name="confirmation_remove_folder_local">ローカルのみ</string>
+   <string name="confirmation_remove_remote">サーバーから</string>
+   <string name="confirmation_remove_remote_and_local">リモートとローカルの両方</string>
    <string name="remove_success_msg">削除に成功しました</string>
    <string name="remove_fail_msg">削除を完了できませんでした</string>
    <string name="rename_dialog_title">新しい名前を入力</string>
    <string name="ssl_validator_label_validity_to">先:</string>
    <string name="ssl_validator_label_signature">署名:</string>
    <string name="ssl_validator_label_signature_algorithm">アルゴリズム:</string>
+   <string name="digest_algorithm_not_available">このスマートフォンでは、ダイジェストアルゴリズムが利用できません。</string>
+   <string name="ssl_validator_label_certificate_fingerprint">フィンガープリント:</string>
+   <string name="certificate_load_problem">証明書の読み込みに問題がありました。</string>
    <string name="ssl_validator_null_cert">証明書が表示できません。</string>
    <string name="ssl_validator_no_info_about_error">-エラーについての詳細情報はありません</string>
    <string name="placeholder_sentence">これはプレースホルダです</string>
    <string name="conflict_title">ファイルが競合</string>
    <string name="conflict_message">どちらのファイルを保存したいですか?両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。</string>
    <string name="conflict_keep_both">両方を保持</string>
+   <string name="conflict_use_local_version">ローカルのもの</string>
+   <string name="conflict_use_server_version">サーバーのもの</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="move_file_invalid_overwrite">そのファイルは宛先フォルダーにすでに存在します。</string>
    <string name="move_file_error">このファイルまたはフォルダーを移動する際にエラーが発生しました</string>
    <string name="forbidden_permissions_move">このファイルを移動</string>
+   <string name="copy_file_not_found">コピーできません。ファイルがあるか確認してください。</string>
+   <string name="copy_file_invalid_into_descendent">フォルダーを子フォルダーへコピーすることはできません。</string>
    <string name="copy_file_invalid_overwrite">そのファイルは宛先フォルダーにすでに存在します。</string>
+   <string name="copy_file_error">このファイルまたはフォルダーをコピーする際にエラーが発生しました</string>
+   <string name="forbidden_permissions_copy">このファイルをコピー</string>
    <string name="prefs_category_instant_uploading">自動アップロード</string>
    <string name="prefs_category_security">セキュリティ</string>
    <string name="prefs_instant_video_upload_path_title">動画のアップロードパス</string>
+   <string name="sync_folder_failed_content">%1$s フォルダーの同期が完了しませんでした。</string>
    <string name="shared_subject_header">共有中</string>
    <string name="with_you_subject_header">あなたと</string>
-   <string name="subject_token">%1$s は \"%2$s\" をあなたと共有しました</string>
-   <string name="saml_subject_token">\"%1$s\" があなたと共有しました</string>
+   <string name="subject_user_shared_with_you">%1$s は \"%2$s\" をあなたと共有しました</string>
+   <string name="subject_shared_with_you">\"%1$s\" があなたと共有しました</string>
    <string name="auth_refresh_button">再接続中</string>
    <string name="auth_host_address">サーバーアドレス</string>
    <string name="common_error_out_memory">十分なメモリがありません</string>
    <string name="file_list__footer__files">%1$d ファイル</string>
    <string name="file_list__footer__files_and_folder">%1$d ファイル、1 フォルダー</string>
    <string name="file_list__footer__files_and_folders">%1$d ファイル、%2$d フォルダー</string>
+   <string name="share_dialog_title">共有</string>
+   <string name="share_with_user_section_title">ユーザーまたはグループに共有</string>
+   <string name="share_no_users">ユーザーと共有されているデータはありません</string>
+   <string name="share_add_user_or_group">ユーザーまたはグループを追加</string>
+   <string name="share_search">検索</string>
+   <string name="search_users_and_groups_hint">ユーザーとグループを検索</string>
+   <string name="share_group_clarification">%1$s (グループ)</string>
+   <string name="share_sharee_unavailable">申し訳ありませんが、このサーバーのバージョンではこのクライアントアプリ上で他のユーザーと共有することができません。
+         \n管理者に相談してしてください。</string>
  </resources>
    <string name="unfavorite">책갈피 해제</string>
    <string name="common_rename">이름 바꾸기</string>
    <string name="common_remove">삭제</string>
 -  <string name="confirmation_remove_alert">%1$s을(를) 삭제하시겠습니까?</string>
 +  <string name="confirmation_remove_file_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="prefs_instant_video_upload_path_title">동영상 업로드 경로</string>
    <string name="shared_subject_header">공유됨</string>
    <string name="with_you_subject_header">여러분과</string>
-   <string name="subject_token">%1$s 님이 \"%2$s\" 항목을 여러분과 공유하였습니다</string>
-   <string name="saml_subject_token">\"%1$s\"을(를) 여러분과 공유하였습니다</string>
+   <string name="subject_user_shared_with_you">%1$s 님이 \"%2$s\" 항목을 여러분과 공유하였습니다</string>
+   <string name="subject_shared_with_you">\"%1$s\"을(를) 여러분과 공유하였습니다</string>
    <string name="auth_refresh_button">연결 새로 고침</string>
    <string name="auth_host_address">서버 주소</string>
    <string name="common_error_out_memory">메모리 부족</string>
    <string name="file_list__footer__files">파일 %1$d개</string>
    <string name="file_list__footer__files_and_folder">파일 %1$d개, 폴더 1개</string>
    <string name="file_list__footer__files_and_folders">파일 %1$d개, 폴더 %2$d개</string>
+   <string name="share_dialog_title">공유</string>
+   <string name="share_with_user_section_title">Share with Users and Groups</string>
+   <string name="share_no_users">No data shared with users yet</string>
+   <string name="share_add_user_or_group">Add User or Group</string>
+   <string name="share_search">검색</string>
  </resources>
    <string name="auth_unsupported_auth_method">De Server ënnerstëtzt dës Authentifizéierungsmethod net</string>
    <string name="common_rename">Ëmbenennen</string>
    <string name="common_remove">Läschen</string>
 -  <string name="confirmation_remove_alert">Wëlls du %1$s wierklech läschen?</string>
 +  <string name="confirmation_remove_file_alert">Wëlls du %1$s wierklech läschen?</string>
    <string name="confirmation_remove_folder_alert">Wëlls du %1$s an de ganzen Inhalt wierklech läschen?</string>
    <string name="confirmation_remove_local">Nemme lokal</string>
    <string name="confirmation_remove_folder_local">Nemme lokal</string>
    <string name="prefs_category_instant_uploading">Direkt eropgeluede Fichieren</string>
    <string name="prefs_category_security">Sécherheet</string>
    <string name="prefs_instant_video_upload_path_title">Pad fir d\'Eropluede vun de Videoen</string>
+   <string name="subject_user_shared_with_you">%1$s huet \"%2$s\" mat dir gedeelt</string>
    <string name="auth_refresh_button">Connectioun opfrëschen</string>
    <string name="auth_host_address">Server-Adress</string>
+   <string name="share_search">Sichen</string>
  </resources>
    <string name="unfavorite">Nebemėgti</string>
    <string name="common_rename">Pervadinti</string>
    <string name="common_remove">Pašalinti</string>
 -  <string name="confirmation_remove_alert">Ar tikrai norite pašalinti %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Ar tikrai norite pašalinti %1$s?</string>
    <string name="confirmation_remove_folder_alert">Ar tikrai norite pašalinti %1$s ir ten esantį turinį?</string>
    <string name="confirmation_remove_local">Tik vietiniai</string>
    <string name="confirmation_remove_folder_local">Tik vietiniai</string>
    <string name="sync_folder_failed_content">%1$s sinchronizavimas negali būti užbaigtas.</string>
    <string name="shared_subject_header">Dalinamasi</string>
    <string name="with_you_subject_header">su jumis</string>
-   <string name="subject_token">%1$s dalinamasi \"%2$s\" su jumis</string>
-   <string name="saml_subject_token">\"%1$s\" dalinamasi su jumis</string>
+   <string name="subject_user_shared_with_you">%1$s dalinamasi \"%2$s\" su jumis</string>
+   <string name="subject_shared_with_you">\"%1$s\" dalinamasi su jumis</string>
    <string name="auth_refresh_button">Atnaujinti sujungimą</string>
    <string name="auth_host_address">Serverio adresas</string>
    <string name="common_error_out_memory">Nepakanka atminties</string>
    <string name="file_list__footer__files">%1$d failai</string>
    <string name="file_list__footer__files_and_folder">%1$d failai, 1 aplankas</string>
    <string name="file_list__footer__files_and_folders">%1$d failai, %2$d aplankai</string>
+   <string name="share_dialog_title">Dalijimasis</string>
+   <string name="share_search">Ieškoti</string>
  </resources>
    <string name="auth_account_does_not_exist">Сметката сеуште не постои на овој уред</string>
    <string name="common_rename">Преименувај</string>
    <string name="common_remove">Отстрани</string>
 -  <string name="confirmation_remove_alert">Дали навистина сакаш да ја отстраниш %1$s?</string>
 +  <string name="confirmation_remove_file_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="prefs_category_instant_uploading">Инстант прикачувања</string>
    <string name="prefs_category_security">Безбедност</string>
    <string name="prefs_instant_video_upload_path_title">Прикачи патека на видео</string>
+   <string name="subject_user_shared_with_you">%1$s сподели \"%2$s\" со тебе</string>
    <string name="auth_refresh_button">Освежи ја конекцијата</string>
    <string name="auth_host_address">Адреса на сервер</string>
+   <string name="share_dialog_title">Споделување</string>
+   <string name="share_search">Барај</string>
  </resources>
    <string name="unfavorite">Fjern favoritt</string>
    <string name="common_rename">Endre navn</string>
    <string name="common_remove">Fjern</string>
 -  <string name="confirmation_remove_alert">Vil du virkelig fjerne %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Vil du virkelig fjerne %1$s?</string>
    <string name="confirmation_remove_folder_alert">Vil du virkelig fjerne %1$s inkludert innholdet?</string>
    <string name="confirmation_remove_local">Kun lokalt</string>
    <string name="confirmation_remove_folder_local">Kun lokalt</string>
 -  <string name="confirmation_remove_remote">Fra server</string>
 +  <string name="confirmation_remove_file_remote">Fra server</string>
    <string name="confirmation_remove_remote_and_local">Ekstern &amp; lokal</string>
    <string name="remove_success_msg">Fjerning var vellykket</string>
    <string name="remove_fail_msg">Fjerning mislyktes</string>
    <string name="prefs_instant_video_upload_path_title">Sti til video-opplasting</string>
    <string name="shared_subject_header">delte</string>
    <string name="with_you_subject_header">med deg</string>
-   <string name="subject_token">%1$s delte \"%2$s\" med deg</string>
-   <string name="saml_subject_token">\"%1$s\" er blitt delt med deg</string>
+   <string name="subject_user_shared_with_you">%1$s delte \"%2$s\" med deg</string>
+   <string name="subject_shared_with_you">\"%1$s\" er blitt delt med deg</string>
    <string name="auth_refresh_button">Oppfrisk forbindelse</string>
    <string name="auth_host_address">Server-adresse</string>
    <string name="common_error_out_memory">Ikke nok minne</string>
    <string name="file_list__footer__files">%1$d filer</string>
    <string name="file_list__footer__files_and_folder">%1$d filer, 1 mappe</string>
    <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
+   <string name="share_dialog_title">Deling</string>
+   <string name="share_with_user_section_title">Del med brukere og grupper</string>
+   <string name="share_no_users">Ingen data delt med brukere ennå</string>
+   <string name="share_add_user_or_group">Legg til bruker eller gruppe</string>
+   <string name="share_search">Søk</string>
  </resources>
@@@ -85,6 -85,7 +85,7 @@@ Download hier: %2$s</string
    <string name="list_layout">Lijst layout</string>
    <string name="action_share_file">Deel link</string>
    <string name="action_unshare_file">Link niet meer delen</string>
+   <string name="action_share_with_users">Delen met gebruiker</string>
    <string name="common_yes">Ja</string>
    <string name="common_no">Nee</string>
    <string name="common_ok">OK</string>
@@@ -201,11 -202,11 +202,11 @@@ Hieronder staan de lokale bestanden en 
    <string name="unfavorite">Niet meer favoriet</string>
    <string name="common_rename">Hernoemen</string>
    <string name="common_remove">Verwijderen</string>
 -  <string name="confirmation_remove_alert">Wilt u %1$s werkelijk verwijderen?</string>
 +  <string name="confirmation_remove_file_alert">Wilt u %1$s werkelijk verwijderen?</string>
    <string name="confirmation_remove_folder_alert">Wilt u %1$s en de inhoud ervan werkelijk verwijderen?</string>
    <string name="confirmation_remove_local">Alleen lokaal</string>
    <string name="confirmation_remove_folder_local">Alleen lokaal</string>
 -  <string name="confirmation_remove_remote">Van server</string>
 +  <string name="confirmation_remove_file_remote">Van server</string>
    <string name="confirmation_remove_remote_and_local">Extern &amp; lokaal</string>
    <string name="remove_success_msg">Succesvol verwijderd</string>
    <string name="remove_fail_msg">Verwijdering kon niet voltooid worden</string>
    <string name="ssl_validator_label_validity_to">Aan:</string>
    <string name="ssl_validator_label_signature">Handtekening:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
+   <string name="digest_algorithm_not_available">Dit digest algoritme is niet beschikbaar op uw telefoon.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Vingerafdruk:</string>
+   <string name="certificate_load_problem">Er is een probleem met het laden van het certificaat.</string>
    <string name="ssl_validator_null_cert">Het certificaat kon niet worden getoond.</string>
    <string name="ssl_validator_no_info_about_error">- Geen informatie over de fout</string>
    <string name="placeholder_sentence">Dit is een plaatshouder</string>
    <string name="sync_folder_failed_content">Synchronisatie van map %1$s kon niet worden voltooid</string>
    <string name="shared_subject_header">gedeeld</string>
    <string name="with_you_subject_header">met u</string>
-   <string name="subject_token">%1$s deelde \"%2$s\" met u</string>
-   <string name="saml_subject_token">\"%1$s\" is gedeeld met u</string>
+   <string name="subject_user_shared_with_you">%1$s deelde \"%2$s\" met u</string>
+   <string name="subject_shared_with_you">\"%1$s\" is gedeeld met u</string>
    <string name="auth_refresh_button">Verversen verbinding</string>
    <string name="auth_host_address">Serveradres</string>
    <string name="common_error_out_memory">Niet voldoende geheugen</string>
    <string name="file_list__footer__files">%1$d bestanden</string>
    <string name="file_list__footer__files_and_folder">%1$d bestanden, 1 map</string>
    <string name="file_list__footer__files_and_folders">%1$d bestanden, %2$d mappen</string>
+   <string name="share_dialog_title">Delen</string>
+   <string name="share_with_user_section_title">Delen met gebruikers en groepen</string>
+   <string name="share_no_users">Nog geen gegevens met gebruikers gedeeld</string>
+   <string name="share_add_user_or_group">Toevoegen gebruiker of groep</string>
+   <string name="share_search">Zoeken</string>
+   <string name="search_users_and_groups_hint">Zoeken naar gebruikers en groepen</string>
+   <string name="share_group_clarification">%1$s (groep)</string>
+   <string name="share_sharee_unavailable">Sorry, uw serverversie staat niet toe om binnen de clients te delen met gebruikers.
+ Neem contact op met uw beheerder</string>
  </resources>
@@@ -80,13 -80,16 +80,16 @@@ Telecargatz-lo aicí : %2$s</string
    <string name="filedetails_created">Creat lo :</string>
    <string name="filedetails_modified">Modificat lo :</string>
    <string name="filedetails_download">Telecargar</string>
+   <string name="filedetails_sync_file">Sincronizar</string>
    <string name="filedetails_renamed_in_upload_msg">Lo fichièr es estat renomenat en %s pendent lo mandadís</string>
    <string name="list_layout">Afichatge en lista</string>
    <string name="action_share_file">Partejar lo ligam</string>
    <string name="action_unshare_file">Partejar pas mai aqueste ligam</string>
+   <string name="action_share_with_users">Partejar amb d\'Utilizaires</string>
    <string name="common_yes">Òc</string>
    <string name="common_no">Non</string>
    <string name="common_ok">D\'acòrdi</string>
+   <string name="common_cancel_sync">Anullar la sincronizacion</string>
    <string name="common_cancel">Anullar</string>
    <string name="common_save_exit">Salvar &amp; Quitar</string>
    <string name="common_error">Error</string>
@@@ -201,11 -204,11 +204,11 @@@ En rason d\'aquesta modificacion, tote
    <string name="unfavorite">Suprimir dels favorits</string>
    <string name="common_rename">Renomenar</string>
    <string name="common_remove">Suprimir</string>
 -  <string name="confirmation_remove_alert">Sètz segur que volètz suprimir %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Sètz segur que volètz suprimir %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Sètz segur que volètz suprimir %1$s e son contengut ?</string>
    <string name="confirmation_remove_local">Local solament</string>
    <string name="confirmation_remove_folder_local">Local solament</string>
 -  <string name="confirmation_remove_remote">Dempuèi lo servidor</string>
 +  <string name="confirmation_remove_file_remote">Dempuèi lo servidor</string>
    <string name="confirmation_remove_remote_and_local">Distant &amp; local</string>
    <string name="remove_success_msg">Supression efectuada amb succès</string>
    <string name="remove_fail_msg">Supression impossibla</string>
    <string name="prefs_category_instant_uploading">Mandadís immediat</string>
    <string name="prefs_category_security">Seguretat</string>
    <string name="prefs_instant_video_upload_path_title">Repertòri de mandadís de las vidèos</string>
+   <string name="sync_folder_failed_content">La sincronizacion del dorsièr %1$s a pas pogut èsser acabad</string>
    <string name="shared_subject_header">a partejat</string>
    <string name="with_you_subject_header">amb vos</string>
-   <string name="subject_token">%1$s a partejat \"%2$s\" amb vos</string>
-   <string name="saml_subject_token">\"%1$s\" es estat partejat amb vos</string>
+   <string name="subject_user_shared_with_you">%1$s a partejat \"%2$s\" amb vos</string>
+   <string name="subject_shared_with_you">\"%1$s\" es estat partejat amb vos</string>
    <string name="auth_refresh_button">Actualizar la connexion</string>
    <string name="auth_host_address">Adreça del servidor</string>
    <string name="common_error_out_memory">Memòria insufisenta</string>
    <string name="file_list__footer__files">%1$d fichièrs</string>
    <string name="file_list__footer__files_and_folder">%1$d fichièrs, 1 dorsièr</string>
    <string name="file_list__footer__files_and_folders">%1$d fichièrs, %2$d dorsièrs</string>
+   <string name="share_dialog_title">Partiment</string>
+   <string name="share_with_user_section_title">Partejar amb d\'utilizaires e de gropes</string>
+   <string name="share_no_users">Cap de donada es pas partejada amb d\'utilizaires pel moment</string>
+   <string name="share_add_user_or_group">Apondre un utilizaire o un grop</string>
+   <string name="share_search">Recercar</string>
+   <string name="search_users_and_groups_hint">Recercar d\'utilizaires e de gropes</string>
  </resources>
    <string name="unfavorite">Usuń z ulubionych</string>
    <string name="common_rename">Zmień nazwę</string>
    <string name="common_remove">Usuń</string>
 -  <string name="confirmation_remove_alert">Czy naprawdę chcesz usunąć %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Czy naprawdę chcesz usunąć %1$s?</string>
    <string name="confirmation_remove_folder_alert">Czy naprawdę chcesz usunąć %1$s i jego zawartość?</string>
    <string name="confirmation_remove_local">Tylko lokalnie</string>
    <string name="confirmation_remove_folder_local">Tylko lokalnie</string>
 -  <string name="confirmation_remove_remote">Z serwera</string>
 +  <string name="confirmation_remove_file_remote">Z serwera</string>
    <string name="remove_success_msg">Usunięto</string>
    <string name="remove_fail_msg">Nie można usunąć</string>
    <string name="rename_dialog_title">Wprowadź nową nazwę</string>
    <string name="prefs_instant_video_upload_path_title">Katalog wysyłania dla wideo</string>
    <string name="shared_subject_header">udostępniony</string>
    <string name="with_you_subject_header">z tobą</string>
+   <string name="subject_user_shared_with_you">%1$s wspólne \"%2$s\" z tobą</string>
    <string name="auth_refresh_button">Odśwież połączenie</string>
    <string name="auth_host_address">Adres Serwera</string>
    <string name="common_error_out_memory">Brak wystarczającej pamięci</string>
    <string name="file_list__footer__folders">%1$d folderów</string>
    <string name="file_list__footer__file">1 plik</string>
    <string name="file_list__footer__file_and_folder">1 plik , 1 folder</string>
+   <string name="share_dialog_title">Udostępnianie</string>
+   <string name="share_search">Wyszukaj</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">Lista de Layout</string>
    <string name="action_share_file">Compartilhar link</string>
    <string name="action_unshare_file">Descompartilhar o link</string>
+   <string name="action_share_with_users">Compartilhado com usuários</string>
    <string name="common_yes">Sim</string>
    <string name="common_no">Não</string>
    <string name="common_ok">OK</string>
    <string name="unfavorite">Nãofavorito</string>
    <string name="common_rename">Renomear</string>
    <string name="common_remove">Remover</string>
 -  <string name="confirmation_remove_alert">Você realmente deseja remover %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Você realmente deseja remover %1$s?</string>
    <string name="confirmation_remove_folder_alert">Você realmente deseja remover %1$s e seus conteúdos?</string>
    <string name="confirmation_remove_local">Somente local</string>
    <string name="confirmation_remove_folder_local">Somente local</string>
 -  <string name="confirmation_remove_remote">Do servidor</string>
 +  <string name="confirmation_remove_file_remote">Do servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto &amp; local</string>
    <string name="remove_success_msg">Removido com sucesso</string>
    <string name="remove_fail_msg">Erro ao remover</string>
    <string name="sync_folder_failed_content">A sincronização da pasta %1$s não pode ser finalizada</string>
    <string name="shared_subject_header">compartilhado</string>
    <string name="with_you_subject_header">com você</string>
-   <string name="subject_token">%1$s compartilhado \"%2$s\" com você</string>
-   <string name="saml_subject_token">\"%1$s\" foi compartilhado com você</string>
+   <string name="subject_user_shared_with_you">%1$s compartilhado \"%2$s\" com você</string>
+   <string name="subject_shared_with_you">\"%1$s\" foi compartilhado com você</string>
    <string name="auth_refresh_button">Reinicializar conexão</string>
    <string name="auth_host_address">Endereço do servidor</string>
    <string name="common_error_out_memory">Não há memoria suficiente</string>
    <string name="file_list__footer__files">%1$d arquivos</string>
    <string name="file_list__footer__files_and_folder">%1$d arquivos, 1 pasta</string>
    <string name="file_list__footer__files_and_folders">%1$d arquivos, %2$d pastas</string>
+   <string name="share_dialog_title">Compartilhamento</string>
+   <string name="share_with_user_section_title">Compartilhar com Usuários e Grupos</string>
+   <string name="share_no_users">Ainda não existe nenhum dado compartilhado com usuários</string>
+   <string name="share_add_user_or_group">Adicionar Usuário ou Grupo</string>
+   <string name="share_search">Perquisar</string>
+   <string name="search_users_and_groups_hint">Pesquisar usuários e grupos</string>
+   <string name="share_group_clarification">%1$s (grupo)</string>
+   <string name="share_sharee_unavailable">Desculpe, sua versão do servidor não permite compartilhamento com usuários que também são clientes.
+         \nEntre em contato com o administrador</string>
  </resources>
    <string name="unfavorite">Retirar Favorito</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_file_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">Apenas localmente</string>
 -  <string name="confirmation_remove_remote">Do servidor</string>
 +  <string name="confirmation_remove_file_remote">Do servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto &amp; local</string>
    <string name="remove_success_msg">Removido com sucesso</string>
    <string name="remove_fail_msg">Não foi possível remover</string>
    <string name="sync_folder_failed_content">Não foi possível completar a sincronização da pasta %1$s</string>
    <string name="shared_subject_header">partilhado</string>
    <string name="with_you_subject_header">consigo</string>
-   <string name="subject_token">%1$s partilhou \"%2$s\" consigo</string>
-   <string name="saml_subject_token">\"%1$s\" foi partilhado consigo</string>
+   <string name="subject_user_shared_with_you">%1$s partilhou \"%2$s\" consigo</string>
+   <string name="subject_shared_with_you">\"%1$s\" foi partilhado consigo</string>
    <string name="auth_refresh_button">Recarregar ligação</string>
    <string name="auth_host_address">Endereço do servidor</string>
    <string name="common_error_out_memory">Falta de memória</string>
    <string name="file_list__footer__files">%1$d ficheiros</string>
    <string name="file_list__footer__files_and_folder">%1$d ficheiros, 1 pasta</string>
    <string name="file_list__footer__files_and_folders">%1$d ficheiros, %2$d pastas</string>
+   <string name="share_dialog_title">Partilha</string>
+   <string name="share_with_user_section_title">Partilhar com Utilizadores e Grupos</string>
+   <string name="share_no_users">Ainda não foram partilhados os dados com os utilizadores</string>
+   <string name="share_add_user_or_group">Adicionar Utilziador ou Grupo</string>
+   <string name="share_search">Procurar</string>
  </resources>
    <string name="unfavorite">Defavoritați</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_file_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 local</string>
 -  <string name="confirmation_remove_remote">De pe server</string>
 +  <string name="confirmation_remove_file_remote">De pe server</string>
    <string name="confirmation_remove_remote_and_local">Ambele</string>
    <string name="remove_success_msg">Eliminat cu succes</string>
    <string name="remove_fail_msg">Eliminarea nu a reușit</string>
    <string name="prefs_instant_video_upload_path_title">Calea de încărcare Video</string>
    <string name="shared_subject_header">partajat</string>
    <string name="with_you_subject_header">cu tine</string>
-   <string name="subject_token">%1$s a partajat fișierul \"%2$s\" cu tine</string>
-   <string name="saml_subject_token">„%1$s” a fost partajat cu dumneavoastră</string>
+   <string name="subject_user_shared_with_you">%1$s a partajat fișierul \"%2$s\" cu tine</string>
+   <string name="subject_shared_with_you">„%1$s” a fost partajat cu dumneavoastră</string>
    <string name="auth_refresh_button">Reîmprospătează conexiunea</string>
    <string name="auth_host_address">Adresa server-ului</string>
    <string name="common_error_out_memory">Memorie insuficientă </string>
    <string name="file_list__footer__files">%1$d fișiere</string>
    <string name="file_list__footer__files_and_folder">%1$d fișiere, 1 folder</string>
    <string name="file_list__footer__files_and_folders">%1$d fișiere, %2$d foldere</string>
+   <string name="share_dialog_title">Partajare</string>
+   <string name="share_search">Căutare</string>
  </resources>
    <string name="unfavorite">Убрать из избранного</string>
    <string name="common_rename">Переименовать</string>
    <string name="common_remove">Удалить</string>
 -  <string name="confirmation_remove_alert">Вы действительно хотите удалить %1$s?</string>
 +  <string name="confirmation_remove_file_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="prefs_instant_video_upload_path_title">Путь для загрузки Видео</string>
    <string name="shared_subject_header">поделился</string>
    <string name="with_you_subject_header">с вами</string>
-   <string name="subject_token">%1$s предоставил вам доступ к \"%2$s\"</string>
-   <string name="saml_subject_token">Вам предоставлен доступ к \"%1$s\"</string>
+   <string name="subject_user_shared_with_you">%1$s предоставил вам доступ к \"%2$s\"</string>
+   <string name="subject_shared_with_you">Вам предоставлен доступ к \"%1$s\"</string>
    <string name="auth_refresh_button">Обновить соединение</string>
    <string name="auth_host_address">Адрес сервера</string>
    <string name="common_error_out_memory">Недостаточно памяти</string>
    <string name="file_list__footer__files">%1$d файлов</string>
    <string name="file_list__footer__files_and_folder">%1$d файлов, 1 каталог</string>
    <string name="file_list__footer__files_and_folders">%1$d файлов, %2$d каталогов</string>
+   <string name="share_dialog_title">Общий доступ</string>
+   <string name="share_with_user_section_title">Поделиться с пользователями или группами</string>
+   <string name="share_no_users">Нет данных используемых совместно с другими пользователями</string>
+   <string name="share_add_user_or_group">Добавить пользователя или группу</string>
+   <string name="share_search">Найти</string>
  </resources>
@@@ -71,6 -71,7 +71,7 @@@
    <string name="file_list_seconds_ago">pred sekundami</string>
    <string name="file_list_empty">Žiadny súbor. Nahrajte niečo!</string>
    <string name="file_list_loading">Načítavam...</string>
+   <string name="file_list_no_app_for_file_type">Nenašla sa aplikácia pre tento typ súboru!</string>
    <string name="local_file_list_empty">V tomto priečinku nie sú žiadne súbory.</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_created">Vytvorený:</string>
    <string name="filedetails_modified">Zmenený:</string>
    <string name="filedetails_download">Stiahnuť</string>
+   <string name="filedetails_sync_file">Synchronizovať</string>
    <string name="filedetails_renamed_in_upload_msg">Súbor bol premenovaný na %1$s počas nahrávania</string>
    <string name="list_layout">Rozvrhnutie zoznamu</string>
    <string name="action_share_file">Zdieľať linku</string>
    <string name="action_unshare_file">Zrušiť zdieľanie odkazu</string>
+   <string name="action_share_with_users">Zdieľať s používateľmi</string>
    <string name="common_yes">Áno</string>
    <string name="common_no">Nie</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Zrušiť synchronizáciu</string>
    <string name="common_cancel">Zrušiť</string>
    <string name="common_save_exit">Uložiť a ukončiť</string>
    <string name="common_error">Chyba</string>
    <string name="unfavorite">Odobrať z obľúbených</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_file_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">Iba lokálne</string>
 -  <string name="confirmation_remove_remote">Zo servera</string>
 +  <string name="confirmation_remove_file_remote">Zo servera</string>
    <string name="confirmation_remove_remote_and_local">Vzdialene aj lokálne</string>
    <string name="remove_success_msg">Úspešne odstránené</string>
    <string name="remove_fail_msg">Odstránenie zlyhalo</string>
    <string name="ssl_validator_label_validity_to">Do: </string>
    <string name="ssl_validator_label_signature">Podpis:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
+   <string name="digest_algorithm_not_available">Algoritmus digest nie je na vašom telefóne dostupný.</string>
+   <string name="ssl_validator_label_certificate_fingerprint">Odtlačok:</string>
+   <string name="certificate_load_problem">Nastal problém s načítaním certifikátu.</string>
    <string name="ssl_validator_null_cert">Certifikát nemohol byť zobrazený.</string>
    <string name="ssl_validator_no_info_about_error">- Žiadne informácie o tejto chybe</string>
    <string name="placeholder_sentence">Toto je \"placeholder\"</string>
    <string name="prefs_category_instant_uploading">Okamžité nahratie</string>
    <string name="prefs_category_security">Zabezpečenie</string>
    <string name="prefs_instant_video_upload_path_title">Cesta pre nahrávanie videí</string>
+   <string name="sync_folder_failed_content">Synchronizáciu priečinka %1$s nebolo možné dokončiť</string>
    <string name="shared_subject_header">zdieľané</string>
    <string name="with_you_subject_header">s vami</string>
-   <string name="subject_token">%1$s vám zdieľal \"%2$s\"</string>
-   <string name="saml_subject_token">\"%1$s\" bol s vami nazdieľaný</string>
+   <string name="subject_user_shared_with_you">%1$s vám zdieľal \"%2$s\"</string>
+   <string name="subject_shared_with_you">\"%1$s\" bol s vami nazdieľaný</string>
    <string name="auth_refresh_button">Obnoviť pripojenie</string>
    <string name="auth_host_address">Adresa servera</string>
    <string name="common_error_out_memory">Nedostatok pamäte</string>
    <string name="file_list__footer__files">%1$d súb.</string>
    <string name="file_list__footer__files_and_folder">%1$d súb., 1 priečinok</string>
    <string name="file_list__footer__files_and_folders">%1$d súb., %2$d prieč.</string>
+   <string name="share_dialog_title">Zdieľanie</string>
+   <string name="share_with_user_section_title">Zdieľať s používateľmi alebo skupinami</string>
+   <string name="share_no_users">Zatiaľ s používateľmi nezdieľate žiadne dáta.</string>
+   <string name="share_add_user_or_group">Pridať používateľa alebo skupinu</string>
+   <string name="share_search">Hľadať</string>
+   <string name="search_users_and_groups_hint">Vyhľadať používateľov alebo skupiny</string>
+   <string name="share_group_clarification">%1$s (skupina)</string>
+   <string name="share_sharee_unavailable">Je nám ľúto, vaša verzia servera neumožňuje zdieľanie s používateľmi alebo skupinami.
+ \nProsím, obráťte sa na svojho správcu</string>
  </resources>
    <string name="unfavorite">Odstrani priljubljeno</string>
    <string name="common_rename">Preimenuj</string>
    <string name="common_remove">Odstrani</string>
 -  <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s?</string>
 +  <string name="confirmation_remove_file_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</string>
 -  <string name="confirmation_remove_remote">S strežnika</string>
 +  <string name="confirmation_remove_file_remote">S strežnika</string>
    <string name="confirmation_remove_remote_and_local">Oddaljeno &amp; krajevno</string>
    <string name="remove_success_msg">Odstranitev je uspešno končana</string>
    <string name="remove_fail_msg">Odstranjevanje je spodletelo</string>
    <string name="prefs_instant_video_upload_path_title">Pot videa za pošiljanje</string>
    <string name="shared_subject_header">v souporabi</string>
    <string name="with_you_subject_header">z vami</string>
-   <string name="subject_token">Uporabnik %1$s je omogočil souporabo \"%2$s\" z vami</string>
-   <string name="saml_subject_token">\"%1$s\" je oddan v souporabo z vami</string>
+   <string name="subject_user_shared_with_you">Uporabnik %1$s je omogočil souporabo \"%2$s\" z vami</string>
+   <string name="subject_shared_with_you">\"%1$s\" je oddan v souporabo z vami</string>
    <string name="auth_refresh_button">Osveži povezavo</string>
    <string name="auth_host_address">Naslov strežnika</string>
    <string name="common_error_out_memory">Ni dovolj pomnilnika</string>
    <string name="file_list__footer__files">%1$d datotek</string>
    <string name="file_list__footer__files_and_folder">%1$d datotek, 1 mapa</string>
    <string name="file_list__footer__files_and_folders">%1$d datotek, %2$d map</string>
+   <string name="share_dialog_title">Souporaba</string>
+   <string name="share_search">Poišči</string>
  </resources>
    <string name="unfavorite">Неомиљени</string>
    <string name="common_rename">Преименуј</string>
    <string name="common_remove">Уклони</string>
 -  <string name="confirmation_remove_alert">Желите да уклоните %1$s?</string>
 +  <string name="confirmation_remove_file_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="prefs_instant_video_upload_path_title">Путања отпремања видеа</string>
    <string name="shared_subject_header">дељено</string>
    <string name="with_you_subject_header">са вама</string>
-   <string name="subject_token">%1$s подели „%2$s“ са вама</string>
+   <string name="subject_user_shared_with_you">%1$s подели „%2$s“ са вама</string>
    <string name="auth_refresh_button">Освежи везу</string>
    <string name="auth_host_address">Адреса сервера</string>
    <string name="common_error_out_memory">Нема довољно меморије</string>
    <string name="file_list__footer__files">%1$d фајлова</string>
    <string name="file_list__footer__files_and_folder">%1$d фајлова, 1 фасцикла</string>
    <string name="file_list__footer__files_and_folders">%1$d фајлова, %2$d фасцикли</string>
+   <string name="share_dialog_title">Дељење</string>
+   <string name="share_search">Тражи</string>
  </resources>
    <string name="unfavorite">Avfavoritisera</string>
    <string name="common_rename">Byt namn</string>
    <string name="common_remove">Radera</string>
 -  <string name="confirmation_remove_alert">Vill du verkligen ta bort %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Vill du verkligen ta bort %1$s?</string>
    <string name="confirmation_remove_folder_alert">Vill du verkligen ta bort %1$s och dess innehåll?</string>
    <string name="confirmation_remove_local">Endast lokalt</string>
    <string name="confirmation_remove_folder_local">Endast lokalt</string>
    <string name="prefs_category_instant_uploading">Direktuppladning</string>
    <string name="prefs_category_security">Säkerhet</string>
    <string name="prefs_instant_video_upload_path_title">Uppladdnings-sökväg för video</string>
+   <string name="subject_user_shared_with_you">%1$s delade \"%2$s\" med dig</string>
    <string name="auth_host_address">Serveradress</string>
+   <string name="share_dialog_title">Dela</string>
+   <string name="share_search">Sök</string>
  </resources>
@@@ -84,6 -84,7 +84,7 @@@
    <string name="list_layout">เค้าโครงรายการ</string>
    <string name="action_share_file">แชร์ลิงค์</string>
    <string name="action_unshare_file">ยกเลิกการแชร์ลิงค์</string>
+   <string name="action_share_with_users">แชร์กับผู้ใช้</string>
    <string name="common_yes">ตกลง</string>
    <string name="common_no">ไม่ตกลง</string>
    <string name="common_ok">ตกลง</string>
    <string name="unfavorite">ออกจากรายการโปรด</string>
    <string name="common_rename">เปลี่ยนชื่อ</string>
    <string name="common_remove">ลบออก</string>
 -  <string name="confirmation_remove_alert">คุณต้องการที่จะลบ %1$s?</string>
 +  <string name="confirmation_remove_file_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_file_remote">จากเซิฟเวอร์</string>
    <string name="confirmation_remove_remote_and_local">รีโมท &amp; ต้นทาง</string>
    <string name="remove_success_msg">ลบเรียบร้อยแล้ว</string>
    <string name="remove_fail_msg">ไม่สามารถลบได้</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="digest_algorithm_not_available">อัลกอริทึมย่อยนี้ไม่สามารถใช้งานบนโทรศัพท์ของคุณ</string>
+   <string name="ssl_validator_label_certificate_fingerprint">ลายนิ้วมือ:</string>
+   <string name="certificate_load_problem">มีปัญหาในการโหลดใบรับรอง</string>
    <string name="ssl_validator_null_cert">ไม่สามารถแสดงใบรับรอง</string>
    <string name="ssl_validator_no_info_about_error">- ไม่มีข้อมูลเกี่ยวกับข้อผิดพลาด</string>
    <string name="placeholder_sentence">นี่คือ placeholder</string>
    <string name="sync_folder_failed_content">ประสานข้อมูลโฟลเดอร์ %1$s ไม่สำเร็จ</string>
    <string name="shared_subject_header">ถูกแชร์</string>
    <string name="with_you_subject_header">กับคุณ</string>
-   <string name="subject_token">%1$s ได้แชร์ \"%2$s\" กับคุณ</string>
-   <string name="saml_subject_token">\"%1$s\" ได้ถูกแชร์กับคุณ</string>
+   <string name="subject_user_shared_with_you">%1$s ได้แชร์ \"%2$s\" กับคุณ</string>
+   <string name="subject_shared_with_you">\"%1$s\" ได้ถูกแชร์กับคุณ</string>
    <string name="auth_refresh_button">ฟื้นฟูการเชื่อมต่อ</string>
    <string name="auth_host_address">ที่อยู่เซิร์ฟเวอร์</string>
    <string name="common_error_out_memory">หน่วยความจำไม่พอ</string>
    <string name="file_list__footer__files">%1$d ไฟล์</string>
    <string name="file_list__footer__files_and_folder">%1$d ไฟล์, 1 โฟลเดอร์</string>
    <string name="file_list__footer__files_and_folders">%1$d ไฟล์, %2$d โฟลเดอร์</string>
+   <string name="share_dialog_title">การแชร์ข้อมูล</string>
+   <string name="share_with_user_section_title">แชร์ไปยังผู้ใช้หรือกลุ่ม</string>
+   <string name="share_no_users">ยังไม่มีข้อมูลที่แชร์กับผู้ใช้ในตอนนี้</string>
+   <string name="share_add_user_or_group">เพิ่มผู้ใช่หรือกลุ่ม</string>
+   <string name="share_search">ค้นหา</string>
+   <string name="search_users_and_groups_hint">ค้นหาผู้ใช้และกลุ่ม</string>
+   <string name="share_group_clarification">%1$s (กลุ่ม)</string>
+   <string name="share_sharee_unavailable">ขออภัย รุ่นเซิร์ฟเวอร์ของคุณไม่อนุญาตให้แชร์กับผู้ใช้ภายในไคลเอนต์
+ \nกรุณาติดต่อผู้ดูแลระบบ</string>
  </resources>
    <string name="unfavorite">Favoriden kaldır</string>
    <string name="common_rename">Yeniden adlandır</string>
    <string name="common_remove">Kaldır</string>
 -  <string name="confirmation_remove_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
 +  <string name="confirmation_remove_file_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
    <string name="confirmation_remove_folder_alert">Gerçekten %1$s ve içeriğini kaldırmak istediğinizden emin misiniz?</string>
    <string name="confirmation_remove_local">Sadece yerel</string>
    <string name="confirmation_remove_folder_local">Sadece yerel</string>
 -  <string name="confirmation_remove_remote">Sunucudan</string>
 +  <string name="confirmation_remove_file_remote">Sunucudan</string>
    <string name="confirmation_remove_remote_and_local">Uzak ve yerel</string>
    <string name="remove_success_msg">Kaldırma başarılı</string>
    <string name="remove_fail_msg">Kaldırma başarısız</string>
    <string name="prefs_instant_video_upload_path_title">Video Yükleme Yolu</string>
    <string name="shared_subject_header">sizinle</string>
    <string name="with_you_subject_header">paylaştı</string>
-   <string name="subject_token">%1$s, sizinle \"%2$s\" paylaşımını yaptı</string>
-   <string name="saml_subject_token">\"%1$s\" sizinle paylaşıldı</string>
+   <string name="subject_user_shared_with_you">%1$s, sizinle \"%2$s\" paylaşımını yaptı</string>
+   <string name="subject_shared_with_you">\"%1$s\" sizinle paylaşıldı</string>
    <string name="auth_refresh_button">Bağlantıyı yenile</string>
    <string name="auth_host_address">Sunucu adresi</string>
    <string name="common_error_out_memory">Yeterli hafıza yok</string>
    <string name="file_list__footer__files">%1$d dosya</string>
    <string name="file_list__footer__files_and_folder">%1$d dosya, 1 klasör</string>
    <string name="file_list__footer__files_and_folders">%1$d dosya, %2$d klasör</string>
+   <string name="share_dialog_title">Paylaşım</string>
+   <string name="share_search">Ara</string>
  </resources>
    <string name="unfavorite">Прибрати з вибраного</string>
    <string name="common_rename">Перейменувати</string>
    <string name="common_remove">Видалити</string>
 -  <string name="confirmation_remove_alert">Ви дійсно бажаєте видалити %1$s?</string>
 +  <string name="confirmation_remove_file_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="prefs_instant_video_upload_path_title">Шлях завантаження відео</string>
    <string name="shared_subject_header">поширений</string>
    <string name="with_you_subject_header">з Вами</string>
-   <string name="subject_token">%1$s поділився \"%2$s\" з вами</string>
-   <string name="saml_subject_token">З Вами поділилися \"%1$s\"</string>
+   <string name="subject_user_shared_with_you">%1$s поділився \"%2$s\" з вами</string>
+   <string name="subject_shared_with_you">З Вами поділилися \"%1$s\"</string>
    <string name="auth_refresh_button">Оновити з\'єднання</string>
    <string name="auth_host_address">Ареса серверу</string>
    <string name="common_error_out_memory">Недостатньо пам\'яті</string>
    <string name="file_list__footer__files">%1$d файлів</string>
    <string name="file_list__footer__files_and_folder">%1$d файлів, 1 тека</string>
    <string name="file_list__footer__files_and_folders">%1$d файлів, %2$d тек</string>
+   <string name="share_dialog_title">Спільний доступ</string>
+   <string name="share_search">Пошук</string>
  </resources>
    <string name="unfavorite">取消收藏</string>
    <string name="common_rename">重命名</string>
    <string name="common_remove">删除</string>
 -  <string name="confirmation_remove_alert">你确定要删除 %1$s 吗?</string>
 +  <string name="confirmation_remove_file_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_file_remote">来自服务器</string>
    <string name="confirmation_remove_remote_and_local">远程 &amp; 本地</string>
    <string name="remove_success_msg">成功删除</string>
    <string name="remove_fail_msg">无法完成删除</string>
    <string name="prefs_instant_video_upload_path_title">视频上传路径</string>
    <string name="shared_subject_header">已共享</string>
    <string name="with_you_subject_header">与你</string>
-   <string name="subject_token">%1$s和你分享了“%2$s”</string>
-   <string name="saml_subject_token">已与你分享“%1$s”</string>
+   <string name="subject_user_shared_with_you">%1$s和你分享了“%2$s”</string>
+   <string name="subject_shared_with_you">已与你分享“%1$s”</string>
    <string name="auth_refresh_button">刷新连接</string>
    <string name="auth_host_address">服务器地址</string>
    <string name="common_error_out_memory">内存不足</string>
    <string name="file_list__footer__files">%1$d 个文件</string>
    <string name="file_list__footer__files_and_folder">%1$d 个文件,1 个文件夹</string>
    <string name="file_list__footer__files_and_folders">%1$d 个文件,%2$d 个文件夹</string>
+   <string name="share_dialog_title">共享</string>
+   <string name="share_search">搜索</string>
  </resources>
    <string name="unfavorite">不喜愛的</string>
    <string name="common_rename">重新命名</string>
    <string name="common_remove">移除</string>
 -  <string name="confirmation_remove_alert">您真的要移除 %1$s ?</string>
 +  <string name="confirmation_remove_file_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_file_remote">來自伺服器</string>
    <string name="confirmation_remove_remote_and_local">遠端 &amp; 本地</string>
    <string name="remove_success_msg">成功地移除</string>
    <string name="remove_fail_msg">刪除失敗</string>
    <string name="prefs_instant_video_upload_path_title">影片上傳路徑</string>
    <string name="shared_subject_header">以分享的</string>
    <string name="with_you_subject_header">與你</string>
-   <string name="subject_token">%1$s 分享了 \"%2$s\" 給您</string>
-   <string name="saml_subject_token">\"%1$s\" 已經與您分享</string>
+   <string name="subject_user_shared_with_you">%1$s 分享了 \"%2$s\" 給您</string>
+   <string name="subject_shared_with_you">\"%1$s\" 已經與您分享</string>
    <string name="auth_refresh_button">重新連線</string>
    <string name="auth_host_address">伺服器位址</string>
    <string name="common_error_out_memory">記憶體不足</string>
    <string name="file_list__footer__files">%1$d 個檔案</string>
    <string name="file_list__footer__files_and_folder">%1$d 個檔案, 1 個資料夾</string>
    <string name="file_list__footer__files_and_folders">%1$d 個檔案, %2$d 個資料夾</string>
+   <string name="share_dialog_title">分享</string>
+   <string name="share_with_user_section_title">與用戶或群組分享</string>
+   <string name="share_no_users">目前沒有任何您分享的內容</string>
+   <string name="share_add_user_or_group">新增使用者或是群組</string>
+   <string name="share_search">搜尋</string>
  </resources>
diff --combined res/values/strings.xml
@@@ -23,7 -23,8 +23,7 @@@
      <!-- TODO re-enable when "Accounts" is available in Navigation Drawer -->
      <!--<string name="drawer_item_accounts">Accounts</string>-->
      <string name="drawer_item_all_files">All files</string>
 -    <!-- TODO re-enable when "On Device" is available
 -    <string name="drawer_item_on_device">On device</string>-->
 +    <string name="drawer_item_on_device">On device</string>
      <string name="drawer_item_settings">Settings</string>
      <string name="drawer_item_logs">Logs</string>
        <string name="drawer_close">Close</string>
      <string name="unfavorite">Unfavorite</string>
      <string name="common_rename">Rename</string>
      <string name="common_remove">Remove</string>
 -    <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>
 +    <string name="confirmation_remove_file_alert">"Do you really want to remove %1$s?"</string>
      <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents?"</string>
      <string name="confirmation_remove_local">Local only</string>
      <string name="confirmation_remove_folder_local">Local only</string>
 -    <string name="confirmation_remove_remote">From server</string>
 +    <string name="confirmation_remove_file_remote">From server</string>
      <string name="confirmation_remove_remote_and_local">Remote &amp; local</string>
      <string name="remove_success_msg">"Removal succeeded"</string>
      <string name="remove_fail_msg">"Removal failed"</string>
      <string name="ssl_validator_label_validity_to">To:</string>
      <string name="ssl_validator_label_signature">Signature:</string>
      <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
+     <string name="digest_algorithm_not_available">This digest algorithm is not available on your phone.</string>
+     <string name="ssl_validator_label_certificate_fingerprint">Fingerprint:</string>
+     <string name="certificate_load_problem">There is a problem loading the certificate.</string>
      <string name="ssl_validator_null_cert">The certificate could not be shown.</string>
      <string name="ssl_validator_no_info_about_error">- No information about the error</string>
  
      <string name="placeholder_filesize">389 KB</string>
      <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">Upload pictures via WiFi only</string>
 -    <string name="instant_video_upload_on_wifi">Upload videos via WiFi only</string>
 +    
 +    <string name="instant_upload_on_wifi">Upload pictures via wifi only</string>
 +    <string name="instant_upload_on_charging">Upload when charging only</string>
 +    <string name="instant_video_upload_on_wifi">Upload videos via wifi only</string>
 +    <string name="instant_video_upload_on_charging">Upload when charging only</string>
      <string name="instant_upload_path">/InstantUpload</string>
      <string name="conflict_title">File conflict</string>
      <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
  
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
 -    <string name="prefs_instant_upload_path_title">Upload Path</string>
 +    <string name="prefs_instant_upload_path_title">Upload path</string>
  
        <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
                administrator.</string>
      <string name="prefs_category_instant_uploading">Instant Uploads</string>
        <string name="prefs_category_security">Security</string>
  
 -      <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 +      <string name="prefs_instant_video_upload_path_title">Upload video path</string>
 +    <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
      <string name="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>
  
        <string name="shared_subject_header">shared</string>
      <string name="file_list__footer__files">%1$d files</string>
      <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
      <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
 +    <string name="action_switch_grid_view">Switch to grid view</string>
 +    <string name="action_switch_list_view">Switch to list view</string>
 +    <string name="common_category">Common</string>
 +    <string name="pref_cache_size">Cache size</string>
 +    <string name="prefs_instant_behaviour_dialogTitle">Upload file to server and ...</string>
 +    <string name="prefs_instant_behaviour_title">Behaviour</string>
 +    <string name="upload_copy_files">Copy file</string>
 +    <string name="upload_move_files">Move file</string>
 +
 +    <string name="pref_behaviour_entries_do_nothing">do nothing</string>
 +    <string name="pref_behaviour_entries_copy">copy file to OC folder</string>
 +    <string name="pref_behaviour_entries_move">move file to OC folder</string>
 +    <string name="pref_behaviour_entries_delete">delete origin file</string>
 +    <string name="confirmation_remove_files_alert">Do you really want to remove selected items?</string>
 +    <string name="confirmation_remove_folders_alert">Do you really want to remove a folder and its content?</string>
 +    <string name="confirmation_remove_files">selected items</string>
 +    <string name="error_log_exit">Exit</string>
 +    <string name="error_log_send">Send Log</string>
 +    <string name="error_log_title">Error Log</string>
 +    <string name="action_stream_file">Stream file with external player</string>
 +    <string name="stream_expose_password">Do you want to stream this file with an external app?\n\nCAUTION: This may expose your password!</string>
 +    <string name="set_picture_as">Set picture as</string>
  
      <string name="share_dialog_title">Sharing</string>
      <string name="share_with_user_section_title">Share with Users and Groups</string>
  
      <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
          \nPlease contact your administrator</string>
 +    <string name="changelog">https://github.com/owncloud/android/raw/beta/CHANGELOG.md</string>
  
  </resources>
@@@ -50,6 -50,8 +50,8 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.lib.resources.files.FileUtils;
  import com.owncloud.android.lib.resources.shares.OCShare;
  import com.owncloud.android.lib.resources.shares.ShareType;
+ import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
+ import com.owncloud.android.lib.resources.status.OCCapability;
  import com.owncloud.android.utils.FileStorageUtils;
  
  import java.io.FileInputStream;
@@@ -142,9 -144,10 +144,9 @@@ public class FileDataStorageManager 
      }
  
  
 -    public Vector<OCFile> getFolderContent(OCFile f/*, boolean onlyOnDevice*/) {
 +    public Vector<OCFile> getFolderContent(OCFile f, boolean onlyOnDevice) {
          if (f != null && f.isFolder() && f.getFileId() != -1) {
 -            // TODO Enable when "On Device" is recovered ?
 -            return getFolderContent(f.getFileId()/*, onlyOnDevice*/);
 +            return getFolderContent(f.getFileId(), onlyOnDevice);
  
          } else {
              return new Vector<OCFile>();
      }
  
  
 -    public Vector<OCFile> getFolderImages(OCFile folder/*, boolean onlyOnDevice*/) {
 -        Vector<OCFile> ret = new Vector<OCFile>();
 +    public Vector<OCFile> getFolderImages(OCFile folder, boolean onlyOnDevice) {
 +        Vector<OCFile> ret = new Vector<OCFile>(); 
          if (folder != null) {
              // TODO better implementation, filtering in the access to database instead of here
 -            // TODO Enable when "On Device" is recovered ?
 -            Vector<OCFile> tmp = getFolderContent(folder/*, onlyOnDevice*/);
 -            OCFile current = null;
 +            Vector<OCFile> tmp = getFolderContent(folder, onlyOnDevice);
 +            OCFile current = null; 
              for (int i=0; i<tmp.size(); i++) {
                  current = tmp.get(i);
                  if (current.isImage()) {
          File localFolder = new File(localFolderPath);
          if (localFolder.exists()) {
              // stage 1: remove the local files already registered in the files database
 -            // TODO Enable when "On Device" is recovered ?
 -            Vector<OCFile> files = getFolderContent(folder.getFileId()/*, false*/);
 +            Vector<OCFile> files = getFolderContent(folder.getFileId(), false);
              if (files != null) {
                  for (OCFile file : files) {
                      if (file.isFolder()) {
          return ret;
      }
  
 -
 -    private Vector<OCFile> getFolderContent(long parentId/*, boolean onlyOnDevice*/) {
 +    
 +    private Vector<OCFile> getFolderContent(long parentId, boolean onlyOnDevice) {
  
          Vector<OCFile> ret = new Vector<OCFile>();
  
          if (c.moveToFirst()) {
              do {
                  OCFile child = createFileInstance(c);
 -                // TODO Enable when "On Device" is recovered ?
 -                // if (child.isFolder() || !onlyOnDevice || onlyOnDevice && child.isDown()){
 -                ret.add(child);
 -                // }
 +                 if (child.isFolder() || !onlyOnDevice || onlyOnDevice && child.isDown()){
 +                    ret.add(child);
 +                 }
              } while (c.moveToNext());
          }
  
                      + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
              String [] whereArgs = new String[]{ "", mAccount.name };
  
 -            // TODO Enable when "On Device" is recovered ?
 -            Vector<OCFile> files = getFolderContent(folder /*, false*/);
 -
 +            Vector<OCFile> files = getFolderContent(folder, false);
 +            
              for (OCFile file : files) {
                  whereArgs[0] = file.getRemotePath();
                  preparedOperations.add(
          return shares;
      }
  
 -    public void triggerMediaScan(String path) {
 +    public static void triggerMediaScan(String path) {
          Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
          intent.setData(Uri.fromFile(new File(path)));
          MainApp.getAppContext().sendBroadcast(intent);
          }
  
      }
+     public OCCapability saveCapabilities(OCCapability capability){
+         // Prepare capabilities data
+         ContentValues cv = new ContentValues();
+         cv.put(ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME, mAccount.name);
+         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_MAYOR, capability.getVersionMayor());
+         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_MINOR, capability.getVersionMinor());
+         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_MICRO, capability.getVersionMicro());
+         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_STRING, capability.getVersionString());
+         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_EDITION, capability.getVersionEdition());
+         cv.put(ProviderTableMeta.CAPABILITIES_CORE_POLLINTERVAL, capability.getCorePollinterval());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_API_ENABLED, capability.getFilesSharingApiEnabled().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_ENABLED,
+                 capability.getFilesSharingPublicEnabled().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_PASSWORD_ENFORCED,
+                 capability.getFilesSharingPublicPasswordEnforced().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED,
+                 capability.getFilesSharingPublicExpireDateEnabled().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS,
+                 capability.getFilesSharingPublicExpireDateDays());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED,
+                 capability.getFilesSharingPublicExpireDateEnforced().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SEND_MAIL,
+                 capability.getFilesSharingPublicSendMail().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_UPLOAD,
+                 capability.getFilesSharingPublicUpload().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_USER_SEND_MAIL,
+                 capability.getFilesSharingUserSendMail().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_RESHARING, capability.getFilesSharingResharing().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_OUTGOING,
+                 capability.getFilesSharingFederationOutgoing().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING,
+                 capability.getFilesSharingFederationIncoming().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING, capability.getFilesBigFileChuncking().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE, capability.getFilesUndelete().getValue());
+         cv.put(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING, capability.getFilesVersioning().getValue());
+         if (capabilityExists(mAccount.name)) {
+             if (getContentResolver() != null) {
+                 getContentResolver().update(ProviderTableMeta.CONTENT_URI_CAPABILITIES, cv,
+                         ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME + "=?",
+                         new String[]{mAccount.name});
+             } else {
+                 try {
+                     getContentProviderClient().update(ProviderTableMeta.CONTENT_URI_CAPABILITIES,
+                             cv, ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME + "=?",
+                             new String[]{mAccount.name});
+                 } catch (RemoteException e) {
+                     Log_OC.e(TAG,
+                             "Fail to insert insert file to database "
+                                     + e.getMessage());
+                 }
+             }
+         } else {
+             Uri result_uri = null;
+             if (getContentResolver() != null) {
+                 result_uri = getContentResolver().insert(
+                         ProviderTableMeta.CONTENT_URI_CAPABILITIES, cv);
+             } else {
+                 try {
+                     result_uri = getContentProviderClient().insert(
+                             ProviderTableMeta.CONTENT_URI_CAPABILITIES, cv);
+                 } catch (RemoteException e) {
+                     Log_OC.e(TAG,
+                             "Fail to insert insert capability to database "
+                                     + e.getMessage());
+                 }
+             }
+             if (result_uri != null) {
+                 long new_id = Long.parseLong(result_uri.getPathSegments()
+                         .get(1));
+                 capability.setId(new_id);
+                 capability.setAccountName(mAccount.name);
+             }
+         }
+         return capability;
+     }
+     private boolean capabilityExists(String accountName) {
+         Cursor c = getCapabilityCursorForAccount(accountName);
+         boolean exists = false;
+         if (c != null) {
+             exists = c.moveToFirst();
+             c.close();
+         }
+         return exists;
+     }
+     private Cursor getCapabilityCursorForAccount(String accountName){
+         Cursor c = null;
+         if (getContentResolver() != null) {
+             c = getContentResolver()
+                     .query(ProviderTableMeta.CONTENT_URI_CAPABILITIES,
+                             null,
+                             ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME + "=? ",
+                             new String[]{accountName}, null);
+         } else {
+             try {
+                 c = getContentProviderClient().query(
+                         ProviderTableMeta.CONTENT_URI_CAPABILITIES,
+                         null,
+                         ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME + "=? ",
+                         new String[]{accountName}, null);
+             } catch (RemoteException e) {
+                 Log_OC.e(TAG,
+                         "Couldn't determine capability existance, assuming non existance: "
+                                 + e.getMessage());
+             }
+         }
+         return c;
+     }
+     public OCCapability getCapability(String accountName){
+         OCCapability capability = null;
+         Cursor c = getCapabilityCursorForAccount(accountName);
+         if (c.moveToFirst()) {
+             capability = createCapabilityInstance(c);
+         }
+         c.close();
+         return capability;
+     }
+     private OCCapability createCapabilityInstance(Cursor c) {
+         OCCapability capability = null;
+         if (c != null) {
+             capability = new OCCapability();
+             capability.setId(c.getLong(c.getColumnIndex(ProviderTableMeta._ID)));
+             capability.setAccountName(c.getString(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME)));
+             capability.setVersionMayor(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_VERSION_MAYOR)));
+             capability.setVersionMinor(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_VERSION_MINOR)));
+             capability.setVersionMicro(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_VERSION_MICRO)));
+             capability.setVersionString(c.getString(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_VERSION_STRING)));
+             capability.setVersionEdition(c.getString(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_VERSION_EDITION)));
+             capability.setCorePollinterval(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_CORE_POLLINTERVAL)));
+             capability.setFilesSharingApiEnabled(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_API_ENABLED))));
+             capability.setFilesSharingPublicEnabled(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_ENABLED))));
+             capability.setFilesSharingPublicPasswordEnforced(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_PASSWORD_ENFORCED))));
+             capability.setFilesSharingPublicExpireDateEnabled(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED))));
+             capability.setFilesSharingPublicExpireDateDays(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS)));
+             capability.setFilesSharingPublicExpireDateEnforced(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED))));
+             capability.setFilesSharingPublicSendMail(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SEND_MAIL))));
+             capability.setFilesSharingPublicUpload(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_UPLOAD))));
+             capability.setFilesSharingUserSendMail(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_USER_SEND_MAIL))));
+             capability.setFilesSharingResharing(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_RESHARING))));
+             capability.setFilesSharingFederationOutgoing(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_OUTGOING))));
+             capability.setFilesSharingFederationIncoming(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING))));
+             capability.setFilesBigFileChuncking(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING))));
+             capability.setFilesUndelete(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE))));
+             capability.setFilesVersioning(CapabilityBooleanType.fromValue(c.getInt(c
+                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING))));
+         }
+         return capability;
+     }
  }
@@@ -1,6 -1,8 +1,8 @@@
  /**
   *   ownCloud Android client application
   *
+  *   @author Bartek Przybylski
+  *   @author David A. Velasco
   *   Copyright (C) 2012  Bartek Przybylski
   *   Copyright (C) 2015 ownCloud Inc.
   *
@@@ -20,6 -22,8 +22,8 @@@
  
  package com.owncloud.android.datamodel;
  
+ import android.content.ContentResolver;
+ import android.net.Uri;
  import android.os.Parcel;
  import android.os.Parcelable;
  import android.webkit.MimeTypeMap;
@@@ -31,11 -35,13 +35,11 @@@ import java.io.File
  import third_parties.daveKoeller.AlphanumComparator;
  public class OCFile implements Parcelable, Comparable<OCFile> {
  
 -    public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
 -        @Override
 +    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
          public OCFile createFromParcel(Parcel source) {
              return new OCFile(source);
          }
  
 -        @Override
          public OCFile[] newArray(int size) {
              return new OCFile[size];
          }
  
      private boolean mIsDownloading;
  
 +    private boolean mShowGridView;
 +
      private String mEtagInConflict;    // Save file etag in the server, when there is a conflict. No conflict =  null
  
      private boolean mShareWithSharee;
  
+     /**
+      * URI to the local path of the file contents, if stored in the device; cached after first call
+      * to {@link #getStorageUri()}
+      */
+     private Uri mLocalUri;
  
      /**
       * Create new {@link OCFile} with given path.
      }
  
      /**
+      * The URI to the file contents, if stored locally
+      *
+      * @return A URI to the local copy of the file, or NULL if not stored in the device
+      */
+     public Uri getStorageUri() {
+         if (mLocalPath == null || mLocalPath.length() == 0) {
+             return null;
+         }
+         if (mLocalUri == null) {
+             Uri.Builder builder = new Uri.Builder();
+             builder.scheme(ContentResolver.SCHEME_FILE);
+             builder.path(mLocalPath);
+             mLocalUri = builder.build();
+         }
+         return mLocalUri;
+     }
+     /**
       * Can be used to set the path where the file is stored
       *
       * @param storage_path to set
       */
      public void setStoragePath(String storage_path) {
          mLocalPath = storage_path;
+         mLocalUri = null;
      }
  
      /**
@@@ -35,6 -35,8 +35,8 @@@ import com.owncloud.android.files.servi
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+ import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
+ import com.owncloud.android.lib.resources.status.OCCapability;
  import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
  import com.owncloud.android.ui.activity.ComponentsGetter;
  
@@@ -200,7 -202,10 +202,10 @@@ public class FileMenuFilter 
          }
  
          // SHARE FILE, with Users
-         if (!shareAllowed ||  mFile == null) {
+         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
+         boolean shareApiEnabled  = capability != null &&
+                 (capability.getFilesSharingApiEnabled().isTrue() || capability.getFilesSharingApiEnabled().isUnknown());
+         if (!shareAllowed ||  mFile == null || !shareApiEnabled ) {
              toHide.add(R.id.action_share_with_users);
          } else {
              toShow.add(R.id.action_share_with_users);
              toShow.add(R.id.action_unfavorite_file);
          }
  
 +        // STREAM
 +        if (mFile != null && !mFile.isDown() && (mFile.isAudio() || mFile.isVideo())){
 +            toShow.add(R.id.action_stream_file);
 +        } else {
 +            toHide.add(R.id.action_stream_file);
 +        }
 +
 +        // SET PICTURE AS
 +        if (mFile == null || !mFile.isImage()){
 +            toHide.add(R.id.action_set_as_wallpaper);
 +        } else {
 +            toShow.add(R.id.action_set_as_wallpaper);
 +        }
 +
      }
  
  }
@@@ -187,6 -187,7 +187,7 @@@ public class RefreshFolderOperation ext
          
          if (OCFile.ROOT_PATH.equals(mLocalFolder.getRemotePath()) && !mSyncFullAccount) {
              updateOCVersion(client);
          }
          
          result = checkForChanges(client);
                  result = fetchAndSyncRemoteFolder(client);
              } else {
                  fetchFavoritesToSyncFromLocalData();
 -                mChildren = mStorageManager.getFolderContent(mLocalFolder/*, false*/);
 +                mChildren = mStorageManager.getFolderContent(mLocalFolder, false);
              }
  
              if (result.isSuccess()) {
          RemoteOperationResult result = update.execute(client);
          if (result.isSuccess()) {
              mIsShareSupported = update.getOCVersion().isSharedSupported();
+             // Update Capabilities for this account
+             if (update.getOCVersion().isVersionWithCapabilitiesAPI()) {
+                 updateCapabilities(client);
+             } else {
+                 Log_OC.d(TAG, "Capabilities API disabled");
+             }
+         }
+     }
+     private void updateCapabilities(OwnCloudClient client){
+         GetCapabilitiesOperarion getCapabilities = new GetCapabilitiesOperarion();
+         RemoteOperationResult  result = getCapabilities.execute(mStorageManager,mContext);
+         if (!result.isSuccess()){
+             Log_OC.d(TAG, "Update Capabilities unsuccessfully");
          }
      }
  
-     
      private RemoteOperationResult checkForChanges(OwnCloudClient client) {
          mRemoteFolderChanged = true;
          RemoteOperationResult result = null;
          mFilesToSyncContents.clear();
  
          // get current data about local contents of the folder to synchronize
 -        // TODO Enable when "On Device" is recovered ?
 -        List<OCFile> localFiles = mStorageManager.getFolderContent(mLocalFolder/*, false*/);
 +        List<OCFile> localFiles = mStorageManager.getFolderContent(mLocalFolder, false);
          Map<String, OCFile> localFilesMap = new HashMap<String, OCFile>(localFiles.size());
          for (OCFile file : localFiles) {
              localFilesMap.put(file.getRemotePath(), file);
  
  
      private void fetchFavoritesToSyncFromLocalData() {
 -        List<OCFile> children = mStorageManager.getFolderContent(mLocalFolder);
 +        List<OCFile> children = mStorageManager.getFolderContent(mLocalFolder, false);
          for (OCFile child : children) {
              if (!child.isFolder() && child.isFavorite()) {
                  SynchronizeFileOperation operation = new SynchronizeFileOperation(
  package com.owncloud.android.ui.preview;
  
  import android.accounts.Account;
 +import android.accounts.AuthenticatorException;
 +import android.accounts.OperationCanceledException;
  import android.app.Activity;
 +import android.content.ActivityNotFoundException;
  import android.graphics.Bitmap;
  import android.graphics.BitmapFactory;
  import android.media.MediaMetadataRetriever;
 +import android.os.AsyncTask;
  import android.support.v7.app.AlertDialog;
  import android.content.ComponentName;
  import android.content.Context;
@@@ -40,8 -36,6 +40,6 @@@ import android.media.MediaPlayer
  import android.media.MediaPlayer.OnCompletionListener;
  import android.media.MediaPlayer.OnErrorListener;
  import android.media.MediaPlayer.OnPreparedListener;
- import android.net.Uri;
- import android.os.Build;
  import android.os.Bundle;
  import android.os.IBinder;
  import android.view.LayoutInflater;
@@@ -56,16 -50,9 +54,16 @@@ import android.widget.ImageView
  import android.widget.Toast;
  import android.widget.VideoView;
  
 +import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.datamodel.ThumbnailsCacheManager;
  import com.owncloud.android.files.FileMenuFilter;
 +import com.owncloud.android.lib.common.OwnCloudAccount;
 +import com.owncloud.android.lib.common.OwnCloudClient;
 +import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 +import com.owncloud.android.lib.common.OwnCloudCredentials;
 +import com.owncloud.android.lib.common.accounts.AccountUtils;
  import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.media.MediaControlView;
  import com.owncloud.android.media.MediaService;
@@@ -75,9 -62,6 +73,9 @@@ import com.owncloud.android.ui.dialog.C
  import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
  import com.owncloud.android.ui.fragment.FileFragment;
  
 +import java.io.IOException;
 +import java.util.concurrent.ExecutionException;
 +
  
  /**
   * This fragment shows a preview of a downloaded media file (audio or video).
@@@ -101,7 -85,6 +99,7 @@@ public class PreviewMediaFragment exten
      private ImageView mImagePreview;
      private VideoView mVideoPreview;
      private int mSavedPlaybackPosition;
 +    private String mUri;
  
      private MediaServiceBinder mMediaServiceBinder = null;
      private MediaControlView mMediaController = null;
      public View onCreateView(LayoutInflater inflater, ViewGroup container,
                               Bundle savedInstanceState) {
          super.onCreateView(inflater, container, savedInstanceState);
-         Log_OC.e(TAG, "onCreateView");
+         Log_OC.v(TAG, "onCreateView");
  
  
          mView = inflater.inflate(R.layout.file_preview, container, false);
      @Override
      public void onActivityCreated(Bundle savedInstanceState) {
          super.onActivityCreated(savedInstanceState);
-         Log_OC.e(TAG, "onActivityCreated");
+         Log_OC.v(TAG, "onActivityCreated");
  
          OCFile file = getFile();
          if (savedInstanceState == null) {
              if (mAccount == null) {
                  throw new IllegalStateException("Instanced with a NULL ownCloud Account");
              }
 -            if (!file.isDown()) {
 -                throw new IllegalStateException("There is no local file to preview");
 -            }
 -
          }
          else {
              file = (OCFile) savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
              mAutoplay = savedInstanceState.getBoolean(PreviewMediaFragment.EXTRA_PLAYING);
  
          }
 -        if (file != null && file.isDown()) {
 +        if (file != null) {
              if (file.isVideo()) {
                  mVideoPreview.setVisibility(View.VISIBLE);
                  mImagePreview.setVisibility(View.GONE);
      @Override
      public void onSaveInstanceState(Bundle outState) {
          super.onSaveInstanceState(outState);
-         Log_OC.e(TAG, "onSaveInstanceState");
+         Log_OC.v(TAG, "onSaveInstanceState");
  
          outState.putParcelable(PreviewMediaFragment.EXTRA_FILE, getFile());
          outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);
      @Override
      public void onStart() {
          super.onStart();
-         Log_OC.e(TAG, "onStart");
+         Log_OC.v(TAG, "onStart");
  
          OCFile file = getFile();
 -        if (file != null && file.isDown()) {
 +        if (file != null) {
              if (file.isAudio()) {
                  bindMediaService();
  
      /**
       * Update the file of the fragment with file value
       *
-      * @param file
+      * @param file      Replaces the held file with a new one
       */
      public void updateFile(OCFile file) {
          setFile(file);
  
          // load the video file in the video player ; 
          // when done, VideoHelper#onPrepared() will be called
-         mVideoPreview.setVideoPath(mUri);
 +        if (getFile().isDown()) {
 +            mUri = getFile().getStoragePath();
 +        } else {
 +            Context context = MainApp.getAppContext();
 +            Account account = mContainerActivity.getStorageManager().getAccount();
 +
 +            mUri = generateUrlWithCredentials(account, context, getFile());
 +        }
 +
+         mVideoPreview.setVideoURI(getFile().getStorageUri());
      }
  
 +    public static String generateUrlWithCredentials(Account account, Context context, OCFile file){
 +        OwnCloudAccount ocAccount = null;
 +        try {
 +            ocAccount = new OwnCloudAccount(account, context);
 +
 +            final ClientGenerationTask task = new ClientGenerationTask();
 +            task.execute(ocAccount);
 +
 +            OwnCloudClient mClient = task.get();
 +            String url = AccountUtils.constructFullURLForAccount(context, account) + Uri.encode(file.getRemotePath(), "/");
 +            OwnCloudCredentials credentials = mClient.getCredentials();
 +
 +            return url.replace("//", "//" + credentials.getUsername() + ":" + credentials.getAuthToken() + "@");
 +
 +        } catch (AccountUtils.AccountNotFoundException e) {
 +            e.printStackTrace();
 +
 +        } catch (InterruptedException e) {
 +            e.printStackTrace();
 +        } catch (ExecutionException e) {
 +            e.printStackTrace();
 +        }
 +        return "";
 +    }
 +
 +    public static class ClientGenerationTask extends AsyncTask<Object, Void, OwnCloudClient> {
 +        @Override
 +        protected OwnCloudClient doInBackground(Object... params) {
 +            Object account = params[0];
 +            if (account instanceof OwnCloudAccount){
 +                try {
 +                    OwnCloudAccount ocAccount = (OwnCloudAccount) account;
 +                    return OwnCloudClientManagerFactory.getDefaultSingleton().
 +                            getClientFor(ocAccount, MainApp.getAppContext());
 +                } catch (AccountUtils.AccountNotFoundException e) {
 +                    e.printStackTrace();
 +                } catch (OperationCanceledException e) {
 +                    e.printStackTrace();
 +                } catch (AuthenticatorException e) {
 +                    e.printStackTrace();
 +                } catch (IOException e) {
 +                    e.printStackTrace();
 +                }
 +            }
 +
 +            return null;
 +        }
 +    }
 +
  
      private class VideoHelper implements OnCompletionListener, OnPreparedListener, OnErrorListener {
  
           */
          @Override
          public void onPrepared(MediaPlayer vp) {
-             Log_OC.e(TAG, "onPrepared");
+             Log_OC.v(TAG, "onPrepared");
              mVideoPreview.seekTo(mSavedPlaybackPosition);
              if (mAutoplay) {
                  mVideoPreview.start();
           */
          @Override
          public void onCompletion(MediaPlayer mp) {
-             Log_OC.e(TAG, "completed");
+             Log_OC.v(TAG, "completed");
              if (mp != null) {
                  mVideoPreview.seekTo(0);
-                 // next lines are necessary to work around undesired video loops
-                 if (Build.VERSION.SDK_INT == Build.VERSION_CODES.GINGERBREAD) {
-                     mVideoPreview.pause();
-                 }
-                 else {
-                     if (Build.VERSION.SDK_INT == Build.VERSION_CODES.GINGERBREAD_MR1) {
-                         // mVideePreview.pause() is not enough
-                         mMediaController.setEnabled(false);
-                         mVideoPreview.stopPlayback();
-                         mAutoplay = false;
-                         mSavedPlaybackPosition = 0;
-                         mVideoPreview.setVideoPath(getFile().getStoragePath());
-                     }
-                 }
              } // else : called from onError()
              mMediaController.updatePausePlay();
          }
           */
          @Override
          public boolean onError(MediaPlayer mp, int what, int extra) {
 -            Log_OC.e(TAG, "Error in video playback, what = " + what + ", extra = " + extra);
 -            if (mVideoPreview.getWindowToken() != null) {
 -                String message = MediaService.getMessageForMediaError(
 -                        getActivity(), what, extra);
 -                new AlertDialog.Builder(getActivity())
 -                        .setMessage(message)
 -                        .setPositiveButton(android.R.string.VideoView_error_button,
 -                                new DialogInterface.OnClickListener() {
 -                                    public void onClick(DialogInterface dialog, int whichButton) {
 -                                        dialog.dismiss();
 -                                        VideoHelper.this.onCompletion(null);
 -                                    }
 -                                })
 -                        .setCancelable(false)
 -                        .show();
 -            }
 +            MediaService.streamWithExternalApp(mUri, getActivity()).show();
              return true;
          }
 -
      }
  
 -
      @Override
      public void onPause() {
-         Log_OC.e(TAG, "onPause");
+         Log_OC.v(TAG, "onPause");
          super.onPause();
      }
  
      @Override
      public void onResume() {
          super.onResume();
-         Log_OC.e(TAG, "onResume");
+         Log_OC.v(TAG, "onResume");
      }
  
      @Override
      public void onDestroy() {
-         Log_OC.e(TAG, "onDestroy");
+         Log_OC.v(TAG, "onDestroy");
          super.onDestroy();
      }
  
      @Override
      public void onStop() {
-         Log_OC.e(TAG, "onStop");
+         Log_OC.v(TAG, "onStop");
  
          mPrepared = false;
          if (mMediaServiceConnection != null) {
  
      @Override
      public void onConfigurationChanged(Configuration newConfig) {
-         Log_OC.e(TAG, "onConfigurationChanged " + this);
+         Log_OC.v(TAG, "onConfigurationChanged " + this);
      }
  
      @Override
      public void onActivityResult(int requestCode, int resultCode, Intent data) {
-         Log_OC.e(TAG, "onActivityResult " + this);
+         Log_OC.v(TAG, "onActivityResult " + this);
          super.onActivityResult(requestCode, resultCode, data);
          if (resultCode == Activity.RESULT_OK) {
              mSavedPlaybackPosition = data.getExtras().getInt(
          @Override
          public void onServiceDisconnected(ComponentName component) {
              if (component.equals(new ComponentName(getActivity(), MediaService.class))) {
-                 Log_OC.e(TAG, "Media service suddenly disconnected");
+                 Log_OC.w(TAG, "Media service suddenly disconnected");
                  if (mMediaController != null) {
                      mMediaController.setMediaPlayer(null);
                  }
          if (mPrepared) {
              mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
          }
-         Log_OC.e(TAG, "getting position: " + mSavedPlaybackPosition);
+         Log_OC.v(TAG, "getting position: " + mSavedPlaybackPosition);
          return mSavedPlaybackPosition;
      }
  
@@@ -78,7 -78,7 +78,7 @@@ public class PreviewVideoActivity exten
      @Override
      public void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
-         Log_OC.e(TAG, "ACTIVITY\t\tonCreate");
+         Log_OC.v(TAG, "onCreate");
          
          setContentView(R.layout.video_layout);
      
      @Override
      public void onSaveInstanceState(Bundle outState) {
          super.onSaveInstanceState(outState);
-         Log_OC.e(TAG, "ACTIVITY\t\tonSaveInstanceState");
          outState.putInt(PreviewVideoActivity.EXTRA_START_POSITION, mVideoPlayer.getCurrentPosition());
          outState.putBoolean(PreviewVideoActivity.EXTRA_AUTOPLAY , mVideoPlayer.isPlaying());
      }
      
      @Override
      public void onBackPressed() {
-         Log_OC.e(TAG, "ACTIVTIY\t\tonBackPressed");
+         Log_OC.v(TAG, "onBackPressed");
          Intent i = new Intent();
          i.putExtra(EXTRA_AUTOPLAY, mVideoPlayer.isPlaying());
          i.putExtra(EXTRA_START_POSITION, mVideoPlayer.getCurrentPosition());
       */
      @Override
      public void onPrepared(MediaPlayer mp) {
-         Log_OC.e(TAG, "ACTIVITY\t\tonPrepare");
+         Log_OC.v(TAG, "onPrepare");
          mVideoPlayer.seekTo(mSavedPlaybackPosition);
          if (mAutoplay) { 
              mVideoPlayer.start();
              file = getStorageManager().getFileById(file.getFileId()); 
              if (file != null) {
                  if (file.isDown()) {
-                     mVideoPlayer.setVideoPath(file.getStoragePath());
-                     
+                     mVideoPlayer.setVideoURI(file.getStorageUri());
                  } else {
 -                    // not working yet
                      String url;
 -                    try {
 -                        url = AccountUtils.constructFullURLForAccount(this, getAccount()) + file.getRemotePath();
 -                        mVideoPlayer.setVideoURI(Uri.parse(url));
 -                    } catch (AccountNotFoundException e) {
 -                        onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
 -                    }
 +                    url = PreviewMediaFragment.generateUrlWithCredentials(getAccount(), getApplicationContext(), getFile());
 +                    mVideoPlayer.setVideoURI(Uri.parse(url));
                  }
-                 
                  // create and prepare control panel for the user
                  mMediaController = new MediaController(this);
                  mMediaController.setMediaPlayer(mVideoPlayer);
                  mMediaController.setAnchorView(mVideoPlayer);
                  mVideoPlayer.setMediaController(mMediaController);
-                 
              } else {
                  finish();
              }