Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master

build.gradle

@@ -53,10 +53,13 @@ android {
         release.setRoot('build-types/release')
     }
 
-    android {
-        lintOptions {
-            abortOnError false
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    lintOptions {
+        abortOnError false
     }
 
     productFlavors {

owncloud-android-library

@@ -1 +1 @@
-Subproject commit 9e5c44ddb58970f1bbdf6723145a47379bdbccba
+Subproject commit 95919c9005aac54e7707f0fdc3c5b9dfdb29dac1

project.properties

@@ -11,3 +11,5 @@
 target=android-22
 android.library.reference.1=owncloud-android-library
 android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar
+java.source=7
+java.target=7

res/layout/edit_share_layout.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  @author David A. Velasco
+  Copyright (C) 2015 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context="com.owncloud.android.ui.fragment.EditShareFragment"
+            android:id="@+id/shareScroll">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+
+        <Switch
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/two_line_primary_text_size"
+            android:text="@string/share_privilege_can_edit"
+            android:id="@+id/canEditSwitch"
+            android:layout_gravity="start"
+            android:padding="@dimen/standard_half_padding"
+            android:layout_marginTop="@dimen/standard_half_margin"
+            android:background="@color/actionbar_start_color"
+            android:textColor="@color/white"
+            />
+
+        <CheckBox
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/canEditCreateCheckBox"
+            android:text="@string/share_privilege_can_edit_create"
+            android:visibility="gone"
+            />
+
+        <CheckBox
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/canEditChangeCheckBox"
+            android:text="@string/share_privilege_can_edit_change"
+            android:visibility="gone"
+            />
+
+        <CheckBox
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/canEditDeleteCheckBox"
+            android:text="@string/share_privilege_can_edit_delete"
+            android:visibility="gone"
+            />
+
+        <Switch
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/two_line_primary_text_size"
+            android:text="@string/share_privilege_can_share"
+            android:id="@+id/canShareSwitch"
+            android:layout_gravity="start"
+            android:padding="@dimen/standard_half_padding"
+            android:layout_marginTop="@dimen/standard_half_margin"
+            android:background="@color/actionbar_start_color"
+            android:textColor="@color/white"
+            />
+
+    </LinearLayout>
+
+</ScrollView>

res/layout/share_user_item.xml

@@ -29,8 +29,8 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0.9"
-            android:textSize="16dip"
+            android:layout_weight="0.8"
+            android:textSize="@dimen/two_line_primary_text_size"
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
             android:layout_margin="12dp"
@@ -43,10 +43,21 @@
             android:layout_height="match_parent"
             android:layout_weight="0.1"
             android:id="@+id/unshareButton"
-            android:src="@drawable/ic_cancel"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="4dp"
+            android:src="@drawable/ic_action_delete"
+            android:layout_marginRight="@dimen/standard_margin"
+            android:layout_marginEnd="@dimen/standard_margin"
             android:layout_gravity="center_horizontal"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.1"
+            android:id="@+id/editShareButton"
+            android:src="@drawable/ic_navigate_next"
+            android:layout_marginRight="@dimen/standard_margin"
+            android:layout_marginEnd="@dimen/standard_margin"
+            android:layout_gravity="center_horizontal"/>
+
     </LinearLayout>
 
     <View

res/menu/file_actions_menu.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

res/menu/main_menu.xml

@@ -34,6 +34,12 @@
         app:showAsAction="always"
         android:title="@string/actionbar_mkdir"
         android:contentDescription="@string/actionbar_mkdir"/>
+    <item
+        android:id="@+id/action_switch_view"
+        android:icon="@drawable/ic_view_module"
+        android:orderInCategory="2"
+        app:showAsAction="never"
+        android:title="@string/action_switch_grid_view" />
     <item
         android:id="@+id/action_sync_account"
         android:icon="@drawable/ic_action_refresh"

res/values-af-rZA/strings.xml

@@ -22,4 +22,7 @@
   <string name="folder_picker_choose_button_text">Kies</string>
   <string name="share_via_link_expiration_date_label">Stel verval datum</string>
   <string name="share_via_link_password_label">Beskerm met Wagwoord</string>
+  <string name="share_privilege_can_edit">kan wysig</string>
+  <string name="share_privilege_can_edit_create">skep</string>
+  <string name="share_privilege_can_edit_delete">uitvee</string>
 </resources>

res/values-ar/strings.xml

@@ -259,4 +259,9 @@
   <string name="share_via_link_expiration_date_label">تعيين تاريخ إنتهاء الصلاحية</string>
   <string name="share_via_link_password_label">حماية كلمة السر</string>
   <string name="share_search">البحث</string>
+  <string name="share_privilege_can_share">يمكن المشاركة</string>
+  <string name="share_privilege_can_edit">يمكن التحرير</string>
+  <string name="share_privilege_can_edit_create">إنشاء</string>
+  <string name="share_privilege_can_edit_change">تغيير</string>
+  <string name="share_privilege_can_edit_delete">حذف</string>
 </resources>

res/values-az/strings.xml

@@ -290,4 +290,7 @@ inzibatçınızla əlaqə saxlayasınız.</string>
   <string name="share_dialog_title">Paylaşılır</string>
   <string name="share_via_link_section_title">Linki yayımla</string>
   <string name="share_search">Axtarış</string>
+  <string name="share_privilege_can_share">yayımlaya bilərsiniz</string>
+  <string name="share_privilege_can_edit">dəyişmək olar</string>
+  <string name="share_privilege_can_edit_delete">sil</string>
 </resources>

res/values-bg-rBG/strings.xml

@@ -320,4 +320,9 @@
   <string name="share_via_link_expiration_date_label">Задаване на дата на изтичане</string>
   <string name="share_via_link_password_label">Защитено с парола</string>
   <string name="share_search">Търсене</string>
+  <string name="share_privilege_can_share">може да споделя</string>
+  <string name="share_privilege_can_edit">може да променя</string>
+  <string name="share_privilege_can_edit_create">създаване</string>
+  <string name="share_privilege_can_edit_change">промяна</string>
+  <string name="share_privilege_can_edit_delete">изтриване</string>
 </resources>

res/values-bn-rBD/strings.xml

@@ -258,4 +258,8 @@
   <string name="share_via_link_expiration_date_label">মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন</string>
   <string name="share_via_link_password_label">কূটশব্দ সুরক্ষিত</string>
   <string name="share_search">অনুসন্ধান</string>
+  <string name="share_privilege_can_share">ভাগাভাগি করেত পারেন</string>
+  <string name="share_privilege_can_edit">সম্পাদনা করতে পারবেন</string>
+  <string name="share_privilege_can_edit_create">তৈরী করুন</string>
+  <string name="share_privilege_can_edit_delete">মুছে ফেল</string>
 </resources>

res/values-bs/strings.xml

@@ -43,4 +43,9 @@
   <string name="share_via_link_expiration_date_label">Postavite datum isteka</string>
   <string name="share_via_link_password_label">Zaštitita lozinkom</string>
   <string name="share_search">Potraži</string>
+  <string name="share_privilege_can_share">mogu dijeliti</string>
+  <string name="share_privilege_can_edit">mogu mijenjati</string>
+  <string name="share_privilege_can_edit_create">kreiraj</string>
+  <string name="share_privilege_can_edit_change">izmjeni</string>
+  <string name="share_privilege_can_edit_delete">izbriši</string>
 </resources>

res/values-ca/strings.xml

@@ -265,4 +265,9 @@
   <string name="share_via_link_expiration_date_label">Estableix la data de venciment</string>
   <string name="share_via_link_password_label">Protegir amb contrasenya</string>
   <string name="share_search">Cerca</string>
+  <string name="share_privilege_can_share">pot compartir</string>
+  <string name="share_privilege_can_edit">pot editar</string>
+  <string name="share_privilege_can_edit_create">crea</string>
+  <string name="share_privilege_can_edit_change">cambi</string>
+  <string name="share_privilege_can_edit_delete">elimina</string>
 </resources>

res/values-cs-rCZ/strings.xml

@@ -272,7 +272,7 @@ správce systému.</string>
   <string name="unshare_link_file_no_exist">Nelze ukončit sdílení. Zkontrolujte prosím že soubor existuje</string>
   <string name="unshare_link_file_error">Při pokusu o zrušení sdílení tohoto souboru či složky nastala chyba</string>
   <string name="update_link_file_no_exist">Nelze aktulizovat. Ověřte že soubor existuje</string>
-  <string name="update_link_file_error">Došlo k chybě při pokusu aktualizovat sdílený odkaz</string>
+  <string name="update_link_file_error">Došlo k chybě při pokusu o aktualizaci sdílení</string>
   <string name="share_link_password_title">Zadejte heslo</string>
   <string name="share_link_empty_password">Musíte zadat heslo</string>
   <string name="activity_chooser_send_file_title">Odeslat</string>
@@ -289,7 +289,7 @@ správce systému.</string>
   <string name="forbidden_permissions_delete">smazat tento soubor</string>
   <string name="share_link_forbidden_permissions">sdílet tento soubor</string>
   <string name="unshare_link_forbidden_permissions">zrušit sdílení tohoto souboru</string>
-  <string name="update_link_forbidden_permissions">aktualizovat tento sdílený odkaz</string>
+  <string name="update_link_forbidden_permissions">pro aktualizaci tohoto sdílení</string>
   <string name="forbidden_permissions_create">vytvořit tento soubor</string>
   <string name="uploader_upload_forbidden_permissions">nahrávat do tohoto adresáře</string>
   <string name="downloader_download_file_not_found">Tento soubor již není dostupný na serveru</string>
@@ -356,4 +356,13 @@ správce systému.</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>
+  <string name="share_privilege_can_share">může sdílet</string>
+  <string name="share_privilege_can_edit">lze upravovat</string>
+  <string name="share_privilege_can_edit_create">vytvořit</string>
+  <string name="share_privilege_can_edit_change">změnit</string>
+  <string name="share_privilege_can_edit_delete">smazat</string>
+  <string name="edit_share_unshare">Ukončit sdílení</string>
+  <string name="edit_share_done">dokončeno</string>
+  <string name="action_switch_grid_view">Zobrazení v mřížce</string>
+  <string name="action_switch_list_view">Zobrazení v seznamu</string>
 </resources>

res/values-cy-rGB/strings.xml

@@ -134,4 +134,7 @@
   <string name="share_via_link_expiration_date_label">Gosod dyddiad dod i ben</string>
   <string name="share_via_link_password_label">Diogelu cyfrinair</string>
   <string name="share_search">Chwilio</string>
+  <string name="share_privilege_can_edit">yn gallu golygu</string>
+  <string name="share_privilege_can_edit_create">creu</string>
+  <string name="share_privilege_can_edit_delete">dileu</string>
 </resources>

res/values-da/strings.xml

@@ -331,4 +331,9 @@
   <string name="share_via_link_expiration_date_label">Vælg udløbsdato</string>
   <string name="share_via_link_password_label">Beskyt med adgangskode</string>
   <string name="share_search">Søg</string>
+  <string name="share_privilege_can_share">kan dele</string>
+  <string name="share_privilege_can_edit">kan redigere</string>
+  <string name="share_privilege_can_edit_create">opret</string>
+  <string name="share_privilege_can_edit_change">tilpas</string>
+  <string name="share_privilege_can_edit_delete">slet</string>
 </resources>

res/values-de-rAT/strings.xml

@@ -107,4 +107,6 @@
   <string name="prefs_category_accounts">Konten</string>
   <string name="auth_host_address">Adresse des Servers</string>
   <string name="share_via_link_section_title">Link teilen</string>
+  <string name="share_privilege_can_share">Kann teilen</string>
+  <string name="share_privilege_can_edit">Kann bearbeiten</string>
 </resources>

res/values-de-rDE/strings.xml

@@ -273,7 +273,7 @@
   <string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfen Sie, ob die Datei existiert</string>
   <string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
   <string name="update_link_file_no_exist">Update nicht möglich. Bitte überprüfen Sie, ob die Datei existiert</string>
-  <string name="update_link_file_error">Es ist ein Fehler beim Aktualisieren des geteilten Links aufgetreten</string>
+  <string name="update_link_file_error">Es ist ein Fehler beim Aktualisieren der Freigabe aufgetreten</string>
   <string name="share_link_password_title">Passwort eingeben</string>
   <string name="share_link_empty_password">Sie müssen ein Passwort eingeben</string>
   <string name="activity_chooser_send_file_title">Senden</string>
@@ -290,7 +290,7 @@
   <string name="forbidden_permissions_delete">diese Datei zu löschen</string>
   <string name="share_link_forbidden_permissions">diese Datei zu teilen</string>
   <string name="unshare_link_forbidden_permissions">diese Datei nicht mehr zu teilen</string>
-  <string name="update_link_forbidden_permissions">Zum Aktualisieren des geteilten Links</string>
+  <string name="update_link_forbidden_permissions">zum Aktualisieren dieser Freigabe</string>
   <string name="forbidden_permissions_create">eine Datei zu erstellen</string>
   <string name="uploader_upload_forbidden_permissions">in diesem Order etwas hochzuladen</string>
   <string name="downloader_download_file_not_found">Diese Datei steht auf dem Server nicht mehr zur Verfügung</string>
@@ -357,4 +357,13 @@
   <string name="share_group_clarification">%1$s (group)</string>
   <string name="share_sharee_unavailable">Entschuldigung, Ihre Serverversion erlaubt das Teilen mit Nutzern innerhalb der Clients nicht.
 \nBitte kontaktieren Sie Ihren Administrator</string>
+  <string name="share_privilege_can_share">kann teilen</string>
+  <string name="share_privilege_can_edit">kann bearbeiten</string>
+  <string name="share_privilege_can_edit_create">erstellen</string>
+  <string name="share_privilege_can_edit_change">Ändern</string>
+  <string name="share_privilege_can_edit_delete">löschen</string>
+  <string name="edit_share_unshare">Freigabe löschen</string>
+  <string name="edit_share_done">Erledigt</string>
+  <string name="action_switch_grid_view">Zur Rasteransicht wechseln</string>
+  <string name="action_switch_list_view">Zur Listenansicht wechseln</string>
 </resources>

res/values-de/strings.xml

@@ -273,7 +273,7 @@
   <string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfe, dass die Datei existiert</string>
   <string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
   <string name="update_link_file_no_exist">Aktualisierung der Datei nicht möglich. Prüfe, dass die Datei existiert</string>
-  <string name="update_link_file_error">Es ist ein Fehler beim Aktualisieren des geteilten Links aufgetreten</string>
+  <string name="update_link_file_error">Es ist ein Fehler beim Aktualisieren der Freigabe aufgetreten</string>
   <string name="share_link_password_title">Passwort eingeben</string>
   <string name="share_link_empty_password">Du musst ein Passwort eingeben</string>
   <string name="activity_chooser_send_file_title">Senden</string>
@@ -290,7 +290,7 @@
   <string name="forbidden_permissions_delete">diese Datei zu löschen</string>
   <string name="share_link_forbidden_permissions">diese Datei zu teilen</string>
   <string name="unshare_link_forbidden_permissions">diese Datei nicht mehr zu teilen</string>
-  <string name="update_link_forbidden_permissions">Zum Aktualisieren des geteilten Links</string>
+  <string name="update_link_forbidden_permissions">zum Aktualisieren dieser Freigabe</string>
   <string name="forbidden_permissions_create">eine Datei zu erstellen</string>
   <string name="uploader_upload_forbidden_permissions">in diesem Order etwas hochzuladen</string>
   <string name="downloader_download_file_not_found">Diese Datei steht auf dem Server nicht mehr zur Verfügung</string>
@@ -357,4 +357,13 @@
   <string name="share_group_clarification">%1$s (Gruppe)</string>
   <string name="share_sharee_unavailable">Entschuldigung, Deine Serverversion erlaubt das Teilen mit Nutzern innerhalb der Clients nicht.
 \nBitte kontaktiere Deinen Administrator</string>
+  <string name="share_privilege_can_share">kann teilen</string>
+  <string name="share_privilege_can_edit">kann bearbeiten</string>
+  <string name="share_privilege_can_edit_create">erstellen</string>
+  <string name="share_privilege_can_edit_change">Ändern</string>
+  <string name="share_privilege_can_edit_delete">löschen</string>
+  <string name="edit_share_unshare">Freigabe löschen</string>
+  <string name="edit_share_done">Erledigt</string>
+  <string name="action_switch_grid_view">Zur Rasteransicht wechseln</string>
+  <string name="action_switch_list_view">Zur Listenansicht wechseln</string>
 </resources>

res/values-el/strings.xml

@@ -347,4 +347,9 @@
   <string name="share_group_clarification">%1$s (ομάδα)</string>
   <string name="share_sharee_unavailable">Δεν επιτρέπεται ο διαμοιρασμός μεταξύ χρηστών μέσω εφαρμογής, σε αυτή την έκδοση.
 \nΕπικοινωνήστε με το διαχειριστή του συστήματος</string>
+  <string name="share_privilege_can_share">δυνατότητα διαμοιρασμού</string>
+  <string name="share_privilege_can_edit">δυνατότητα επεξεργασίας</string>
+  <string name="share_privilege_can_edit_create">δημιουργία</string>
+  <string name="share_privilege_can_edit_change">αλλαγή</string>
+  <string name="share_privilege_can_edit_delete">διαγραφή</string>
 </resources>

res/values-en-rGB/strings.xml

@@ -303,4 +303,9 @@
   <string name="share_via_link_expiration_date_label">Set expiration date</string>
   <string name="share_via_link_password_label">Password protect</string>
   <string name="share_search">Search</string>
+  <string name="share_privilege_can_share">can share</string>
+  <string name="share_privilege_can_edit">can edit</string>
+  <string name="share_privilege_can_edit_create">create</string>
+  <string name="share_privilege_can_edit_change">change</string>
+  <string name="share_privilege_can_edit_delete">delete</string>
 </resources>

res/values-eo/strings.xml

@@ -190,4 +190,8 @@
   <string name="share_via_link_expiration_date_label">Agordi limdaton</string>
   <string name="share_via_link_password_label">Protekti per pasvorto</string>
   <string name="share_search">Serĉi</string>
+  <string name="share_privilege_can_share">kunhavebla</string>
+  <string name="share_privilege_can_edit">povas redakti</string>
+  <string name="share_privilege_can_edit_create">krei</string>
+  <string name="share_privilege_can_edit_delete">forigi</string>
 </resources>

res/values-es-rAR/strings.xml

@@ -281,4 +281,8 @@
   <string name="share_via_link_expiration_date_label">Asignar fecha de vencimiento</string>
   <string name="share_via_link_password_label">Proteger con contraseña </string>
   <string name="share_search">Buscar</string>
+  <string name="share_privilege_can_share">puede compartir</string>
+  <string name="share_privilege_can_edit">podés editar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_delete">borrar</string>
 </resources>

res/values-es-rMX/strings.xml

@@ -211,4 +211,8 @@
   <string name="share_via_link_expiration_date_label">Establecer fecha de caducidad</string>
   <string name="share_via_link_password_label">Protección con contraseña</string>
   <string name="share_search">Buscar</string>
+  <string name="share_privilege_can_share">puede compartir</string>
+  <string name="share_privilege_can_edit">puede editar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_delete">eliminar</string>
 </resources>

res/values-es/strings.xml

@@ -273,7 +273,6 @@
   <string name="unshare_link_file_no_exist">No se puede dejar de compartir. Revise si el archivo existe</string>
   <string name="unshare_link_file_error">Ocurrió un error al tratar de ya no compartir este archivo o carpeta</string>
   <string name="update_link_file_no_exist">No se puede actualizar. Revise si el archivo existe</string>
-  <string name="update_link_file_error">Se produjo un error al tratar de actualizar el enlace compartido</string>
   <string name="share_link_password_title">Introduzca una contraseña</string>
   <string name="share_link_empty_password">Debe introducir una contraseña</string>
   <string name="activity_chooser_send_file_title">Enviar</string>
@@ -290,7 +289,6 @@
   <string name="forbidden_permissions_delete">para eliminar este archivo</string>
   <string name="share_link_forbidden_permissions">para compartir este archivo</string>
   <string name="unshare_link_forbidden_permissions">para dejar de compartir este archivo</string>
-  <string name="update_link_forbidden_permissions">para actualizar este enlace compartido</string>
   <string name="forbidden_permissions_create">para crear el archivo</string>
   <string name="uploader_upload_forbidden_permissions">para subir archivos a esta carpeta</string>
   <string name="downloader_download_file_not_found">Este archivo ya no se encuentra en el servidor</string>
@@ -356,4 +354,11 @@
   <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>
+  <string name="share_privilege_can_share">puede compartir</string>
+  <string name="share_privilege_can_edit">puede editar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_change">cambio</string>
+  <string name="share_privilege_can_edit_delete">borrar</string>
+  <string name="action_switch_grid_view">Cambiar a vista de cuadrícula</string>
+  <string name="action_switch_list_view">Cambiar a vista de lista</string>
 </resources>

res/values-et-rEE/strings.xml

@@ -352,4 +352,9 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="share_search">Otsi</string>
   <string name="search_users_and_groups_hint">Otsi kasutajaid ja gruppe</string>
   <string name="share_group_clarification">%1$s (grupp)</string>
+  <string name="share_privilege_can_share">saab jagada</string>
+  <string name="share_privilege_can_edit">saab muuta</string>
+  <string name="share_privilege_can_edit_create">loo</string>
+  <string name="share_privilege_can_edit_change">muuda</string>
+  <string name="share_privilege_can_edit_delete">kustuta</string>
 </resources>

res/values-eu/strings.xml

@@ -280,4 +280,9 @@ Mesedez, baimendu berriz</string>
   <string name="share_via_link_expiration_date_label">Ezarri muga data</string>
   <string name="share_via_link_password_label">Babestu pasahitzarekin</string>
   <string name="share_search">Bilatu</string>
+  <string name="share_privilege_can_share">elkarbana dezake</string>
+  <string name="share_privilege_can_edit">editatu dezake</string>
+  <string name="share_privilege_can_edit_create">sortu</string>
+  <string name="share_privilege_can_edit_change">aldatu</string>
+  <string name="share_privilege_can_edit_delete">ezabatu</string>
 </resources>

res/values-fa/strings.xml

@@ -299,4 +299,9 @@
   <string name="share_via_link_expiration_date_label">تنظیم تاریخ انقضا</string>
   <string name="share_via_link_password_label">نگهداری کردن رمز عبور</string>
   <string name="share_search">جست‌و‌جو</string>
+  <string name="share_privilege_can_share">قابل به اشتراک گذاری</string>
+  <string name="share_privilege_can_edit">می توان ویرایش کرد</string>
+  <string name="share_privilege_can_edit_create">ایجاد</string>
+  <string name="share_privilege_can_edit_change">تغییر</string>
+  <string name="share_privilege_can_edit_delete">حذف</string>
 </resources>

res/values-fi-rFI/strings.xml

@@ -256,6 +256,10 @@
 		ylläpitäjään.</string>
   <string name="share_link_file_no_exist">Jakaminen epäonnistui. Varmista, että tiedosto on olemassa</string>
   <string name="share_link_file_error">Virhe tiedoston tai kansion jakamista yrittäessä</string>
+  <string name="unshare_link_file_no_exist">Jakamisen lopettaminen epäonnistui. Tarkista onko tiedosto olemassa</string>
+  <string name="unshare_link_file_error">Tiedoston tai kansion jakamista lopettaessa tapahtui virhe</string>
+  <string name="update_link_file_no_exist">Päivittäminen epäonnistui. Tarkista onko tiedosto olemassa</string>
+  <string name="update_link_file_error">Jakoa päivittäessä tapahtui virhe</string>
   <string name="share_link_password_title">Anna salasana</string>
   <string name="share_link_empty_password">Salasana on pakko antaa</string>
   <string name="activity_chooser_send_file_title">Lähetä</string>
@@ -331,4 +335,12 @@
   <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>
+  <string name="share_privilege_can_share">jaa</string>
+  <string name="share_privilege_can_edit">voi muokata</string>
+  <string name="share_privilege_can_edit_create">luo</string>
+  <string name="share_privilege_can_edit_change">muuta</string>
+  <string name="share_privilege_can_edit_delete">poista</string>
+  <string name="edit_share_unshare">Lopeta jakaminen</string>
+  <string name="action_switch_grid_view">Vaihda ruudukkonäkymään</string>
+  <string name="action_switch_list_view">Vaihda luettelonäkymään</string>
 </resources>

res/values-fr/strings.xml

@@ -83,7 +83,7 @@ Téléchargez-le ici : %2$s</string>
   <string name="filedetails_sync_file">Synchroniser</string>
   <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
   <string name="list_layout">Affichage en liste</string>
-  <string name="action_share">Partage</string>
+  <string name="action_share">Partager</string>
   <string name="common_yes">Oui</string>
   <string name="common_no">Non</string>
   <string name="common_ok">OK</string>
@@ -248,7 +248,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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="digest_algorithm_not_available">Cet algorithme de hachage n\'est pas disponible sur votre appareil.</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>
@@ -276,8 +276,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="share_link_file_error">Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire</string>
   <string name="unshare_link_file_no_exist">Impossible de supprimer le partage. Vérifiez que le fichier est bien présent</string>
   <string name="unshare_link_file_error">Une erreur est survenue lors de la tentative d’annulation du partage de ce fichier ou répertoire</string>
-  <string name="update_link_file_no_exist">Actualisation impossible. Veuillez vérifier si ce fichier existe</string>
-  <string name="update_link_file_error">Une erreur est survenue lors de la tentative de rafraîchissement du lien partagé</string>
+  <string name="update_link_file_no_exist">Actualisation impossible. Veuillez vérifier que ce fichier existe</string>
+  <string name="update_link_file_error">Une erreur est survenue lors de la mise à jour du partage</string>
   <string name="share_link_password_title">Saisissez un mot de passe</string>
   <string name="share_link_empty_password">Vous devez saisir un mot de passe</string>
   <string name="activity_chooser_send_file_title">Envoyer</string>
@@ -292,11 +292,11 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="forbidden_permissions">Vous n\'avez pas la permission %s</string>
   <string name="forbidden_permissions_rename">de renommer ce fichier</string>
   <string name="forbidden_permissions_delete">d’effacer ce fichier</string>
-  <string name="share_link_forbidden_permissions">afin de partager ce fichier</string>
-  <string name="unshare_link_forbidden_permissions">afin de ne plus partager ce fichier</string>
-  <string name="update_link_forbidden_permissions">pour mettre à jour ce lien partagé</string>
+  <string name="share_link_forbidden_permissions">de partager ce fichier</string>
+  <string name="unshare_link_forbidden_permissions">de terminer le partage de ce fichier</string>
+  <string name="update_link_forbidden_permissions">de modifier ce partage</string>
   <string name="forbidden_permissions_create">de créer ce fichier</string>
-  <string name="uploader_upload_forbidden_permissions">afin d’importer dans ce répertoire</string>
+  <string name="uploader_upload_forbidden_permissions">de téléverser dans ce dossier</string>
   <string name="downloader_download_file_not_found">Ce fichier n’est plus disponible sur le serveur</string>
   <string name="prefs_category_accounts">Comptes</string>
   <string name="prefs_add_account">Ajouter un compte</string>
@@ -345,12 +345,12 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="prefs_instant_behaviour_title">Le fichier original sera...</string>
   <string name="upload_copy_files">Copier le fichier</string>
   <string name="upload_move_files">Déplacer le fichier</string>
-  <string name="pref_behaviour_entries_keep_file">l\'a gardé dans le dossier original</string>
+  <string name="pref_behaviour_entries_keep_file">gardé dans le dossier original</string>
   <string name="pref_behaviour_entries_move">déplacé vers le dossier de l\'application</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_add_user_or_group">Ajouter un utilisateur ou un groupe</string>
   <string name="share_via_link_section_title">Partager par lien public</string>
   <string name="share_via_link_expiration_date_label">Spécifier une date d\'expiration</string>
   <string name="share_via_link_password_label">Protéger par un mot de passe</string>
@@ -361,4 +361,13 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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>
+  <string name="share_privilege_can_share">peut partager</string>
+  <string name="share_privilege_can_edit">peut modifier</string>
+  <string name="share_privilege_can_edit_create">création</string>
+  <string name="share_privilege_can_edit_change">modification</string>
+  <string name="share_privilege_can_edit_delete">suppression</string>
+  <string name="edit_share_unshare">Terminer le partage</string>
+  <string name="edit_share_done">Terminé</string>
+  <string name="action_switch_grid_view">Basculer en vue par grille</string>
+  <string name="action_switch_list_view">Basculer en vue par liste</string>
 </resources>

res/values-gl/strings.xml

@@ -343,4 +343,9 @@ Descárgueo de aquí: %2$s</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>
+  <string name="share_privilege_can_share">pode compartir</string>
+  <string name="share_privilege_can_edit">pode editar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_change">cambio</string>
+  <string name="share_privilege_can_edit_delete">eliminar</string>
 </resources>

res/values-he/strings.xml

@@ -11,17 +11,28 @@
   <string name="actionbar_settings">הגדרות</string>
   <string name="actionbar_see_details">פרטים</string>
   <string name="actionbar_send_file">שליחה</string>
+  <string name="actionbar_sort">מיון</string>
+  <string name="actionbar_sort_title">מיון על בסיס</string>
+  <string-array name="actionbar_sortby">
+    <item>א-ת</item>
+    <item>חדש - ישן</item>
+  </string-array>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">כל הקבצים</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_item_settings">הגדרות</string>
+  <string name="drawer_item_logs">לוגים</string>
+  <string name="drawer_close">סגירה</string>
   <string name="drawer_open">פתיחה</string>
   <string name="prefs_category_general">כללי</string>
   <string name="prefs_category_more">יותר</string>
   <string name="prefs_accounts">חשבונות</string>
   <string name="prefs_manage_accounts">ניהול חשבונות</string>
+  <string name="prefs_passcode">נעילת סיסמא</string>
   <string name="prefs_instant_upload">העלאת תמונות מהירה</string>
   <string name="prefs_instant_upload_summary">העלאה מהירה של תמונות שצולמו במצלמה</string>
   <string name="prefs_instant_video_upload">העלאת סרטים מהירה</string>
@@ -35,7 +46,10 @@
   <string name="prefs_recommend">המלצה לחבר</string>
   <string name="prefs_feedback">משוב</string>
   <string name="prefs_imprint">חותמת</string>
+  <string name="prefs_remember_last_share_location">לזכור מקום שיתוף</string>
+  <string name="prefs_remember_last_upload_location_summary">לזכור מיקום שיתוף העלאה אחרון</string>
   <string name="recommend_subject">לבדיקה %1$s בטלפון החכם שלך!</string>
+  <string name="recommend_text">הנך מוזמן להשתמש ב- %1$s בטלפון החכם שלך!\nניתן להוריד מכאן: %2$s</string>
   <string name="auth_check_server">בודק שרת</string>
   <string name="auth_host_url">כתובת שרת https://…</string>
   <string name="auth_username">שם משתמש</string>
@@ -56,6 +70,8 @@
   <string name="uploader_info_uploading">בהעלאה</string>
   <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>
@@ -63,11 +79,14 @@
   <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">שיתוף</string>
   <string name="common_yes">כן</string>
   <string name="common_no">לא</string>
   <string name="common_ok">אישור</string>
+  <string name="common_cancel_sync">ביטון סנכרון</string>
   <string name="common_cancel">ביטול</string>
   <string name="common_save_exit">לשמור ולצאת</string>
   <string name="common_error">שגיאה</string>
@@ -113,6 +132,15 @@
   <string name="foreign_files_local_text">מקומי: %1$s</string>
   <string name="foreign_files_remote_text">מרוחק: %1$s</string>
   <string name="upload_query_move_foreign_files">אין מספיק מקום להעתקת הקבצים שנבחרו אל תיקיית %1$s . האם להעביר אותם במקום?</string>
+  <string name="pass_code_enter_pass_code">יש להכניס את הקוד שלך</string>
+  <string name="pass_code_configure_your_pass_code">יש להכניס את הקוד שלך</string>
+  <string name="pass_code_configure_your_pass_code_explanation">בכל פעם שיישום זה נפתח יהיה צורך להכניס את הקוד</string>
+  <string name="pass_code_reenter_your_pass_code">יש להכניס את הקוד שנית</string>
+  <string name="pass_code_remove_your_pass_code">יש להסיר את הקוד שלך</string>
+  <string name="pass_code_mismatch">הקודים אינם זהים</string>
+  <string name="pass_code_wrong">קוד שגוי</string>
+  <string name="pass_code_removed">הקוד הוסר</string>
+  <string name="pass_code_stored">הקוד נשמר</string>
   <string name="media_notif_ticker">נגנן המוזיקה %1$s</string>
   <string name="media_state_playing">%1$s (מתנגן)</string>
   <string name="media_state_loading">%1$s (בטעינה)</string>
@@ -137,6 +165,7 @@
   <string name="auth_no_net_conn_title">אין חיבור לאינטרנט</string>
   <string name="auth_nossl_plain_ok_title">אין חיבור מוצפן זמין.</string>
   <string name="auth_connection_established">החיבור נוצר</string>
+  <string name="auth_testing_connection">בדיקת חיבור</string>
   <string name="auth_not_configured_title">תצורת השרת פגומה</string>
   <string name="auth_account_not_new">חשבון לאותו משתמש ושרת כבר קיים במכשיר זה</string>
   <string name="auth_account_not_the_same">שם המשתמש שהוכנס לא מתאים לשם המשתמש של חשבון זה</string>
@@ -163,13 +192,17 @@
   <string name="auth_fail_get_user_name">השרת אינו מחזיר מספר משתמש נכון, יש ליצור קשר עם מנהל
 ⇥</string>
   <string name="auth_can_not_auth_against_server">לא מצליח לאמת מול השרת</string>
+  <string name="auth_account_does_not_exist">עדיין לא קיים חשבון במכשיר</string>
   <string name="favorite">מועדף</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_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">חיצוני &amp; מקומי</string>
   <string name="remove_success_msg">ההסרה הצליחה</string>
   <string name="remove_fail_msg">ההסרה נכשלה</string>
   <string name="rename_dialog_title">נא להזין שם חדש</string>
@@ -179,11 +212,13 @@
   <string name="sync_file_nothing_to_do_msg">תוכן הקובץ כבר מסונכרן</string>
   <string name="create_dir_fail_msg">לא ניתן ליצור תיקייה</string>
   <string name="filename_forbidden_characters">תווים אסורים: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">שם קובץ כולל לפחות תו אחד לא חוקי</string>
   <string name="filename_empty">שם קובץ לא יכול להיות ריק</string>
   <string name="wait_a_moment">נא להמתין רגע</string>
   <string name="filedisplay_unexpected_bad_get_content">תקלה בלתי צפויה ; נא לבחור בקובץ מיישום אחר</string>
   <string name="filedisplay_no_file_selected">לא נבחרו קבצים</string>
   <string name="activity_chooser_title">שליחת קישור אל ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">מעתיק קובץ מאחסון פרטי</string>
   <string name="oauth_check_onoff">התחברות באמצעות oAuth2</string>
   <string name="oauth_login_connection">התחברות אל שרת oAuth2…</string>
   <string name="ssl_validator_header">לא ניתן לאמת את זהות האתר</string>
@@ -208,6 +243,9 @@
   <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>
@@ -219,14 +257,25 @@
   <string name="instant_upload_on_wifi">העלאת תמונות דרך WiFi בלבד</string>
   <string name="instant_video_upload_on_wifi">העלאות קבצי וידאו על בסיס WiFi בלבד</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">התנגשות בין קבצים</string>
+  <string name="conflict_message">איזה קבצים לשמור? אם יבחרו שתי הגרסאות, הקובץ המקומי יקבל מספר שיצורף לשמו.</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="prefs_instant_upload_path_title">העלאת נתיב</string>
   <string name="share_link_no_support_share_api">מצטערים, שיתוף אינו מורשה על השרת שלך. יש ליצור קשר עם
 ⇥⇥מנהל.</string>
+  <string name="share_link_file_no_exist">לא ניתן לשתף. יש לבדוק אם הקובץ קיים</string>
   <string name="share_link_file_error">שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו</string>
+  <string name="unshare_link_file_no_exist">לא ניתן לבטל שיתוף. יש לבדוק אם הקובץ קיים</string>
   <string name="unshare_link_file_error">שגיאה אירעה בזמן ניסיון לבטל שיתוף לקובץ זה או לתיקייה זו</string>
+  <string name="update_link_file_no_exist">לא ניתן לעדכן. יש לבדוק אם הקובץ קיים</string>
+  <string name="update_link_file_error">שגיאה אירעה בניסיון לעדכן את השיתוף</string>
+  <string name="share_link_password_title">הכנסת סיסמא</string>
+  <string name="share_link_empty_password">יש להכניס סיסמא</string>
   <string name="activity_chooser_send_file_title">שליחה</string>
   <string name="copy_link">העתקת קישור</string>
   <string name="clipboard_text_copied">הועתק ללוח הגזירים - clipboard</string>
@@ -241,18 +290,80 @@
   <string name="forbidden_permissions_delete">למחוק קובץ זה</string>
   <string name="share_link_forbidden_permissions">לשתף קובץ זה</string>
   <string name="unshare_link_forbidden_permissions">לבטל שיתוף לקובץ זה</string>
+  <string name="update_link_forbidden_permissions">לעידכון השיתוף הזה</string>
   <string name="forbidden_permissions_create">ליצור קובץ</string>
   <string name="uploader_upload_forbidden_permissions">להעלאה לתיקייה זו</string>
   <string name="downloader_download_file_not_found">הקובץ אינו זמין יותר על השרת</string>
   <string name="prefs_category_accounts">חשבונות</string>
   <string name="prefs_add_account">הוספת חשבון</string>
   <string name="auth_redirect_non_secure_connection_title">חיבור מאובטח מנותב דרך נתיב לא מאובטח</string>
+  <string name="actionbar_logger">לוגים</string>
+  <string name="log_send_history_button">שליחת היסטוריה</string>
+  <string name="log_send_no_mail_app">לא נמצא יישום לשליחת לוגים. יש להתקין יישום דואר עכשיו!</string>
+  <string name="log_send_mail_subject">%1$s לוגים של יישום אנדרואיד</string>
+  <string name="log_progress_dialog_text">טעינת מידע...</string>
+  <string name="saml_authentication_required_text">נדרש אימות</string>
+  <string name="saml_authentication_wrong_pass">סיסמא שגוייה</string>
+  <string name="actionbar_move">העברה</string>
+  <string name="file_list_empty_moving">אין כאן כלום. ניתן להוסיף תיקייה!</string>
   <string name="folder_picker_choose_button_text">בחירה</string>
+  <string name="move_file_not_found">לא ניתן להעביר. יש לבדוק אם הקובץ קיים</string>
+  <string name="move_file_invalid_into_descendent">לא ניתן להעביר תיקייה אל תוך תיקיית משנה של אותה תיקייה</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_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="username">שם משתמש</string>
+  <string name="file_list__footer__folder">1 תיקייה</string>
+  <string name="file_list__footer__folders">%1$d תיקיות</string>
+  <string name="file_list__footer__file">1 קובץ</string>
+  <string name="file_list__footer__file_and_folder">1 קובץ, 1 תיקייה</string>
+  <string name="file_list__footer__file_and_folders">1 קובץ, %1$d תיקיות</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="prefs_instant_behaviour_dialogTitle">קובץ מקורי יהיה...</string>
+  <string name="prefs_instant_behaviour_title">תיקייה מקורית תהיה...</string>
+  <string name="upload_copy_files">העתקת קובץ</string>
+  <string name="upload_move_files">העברת קובץ</string>
+  <string name="pref_behaviour_entries_keep_file">נשמר בתיקייה מקורית</string>
+  <string name="pref_behaviour_entries_move">הועבר לתיקיית ישומים</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_via_link_section_title">קישור לשיתוף</string>
   <string name="share_via_link_expiration_date_label">הגדרת תאריך תפוגה</string>
   <string name="share_via_link_password_label">הגנה בססמה</string>
+  <string name="share_via_link_password_title">מאובטח</string>
+  <string name="share_get_public_link_button">קבלת קישור</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>
+  <string name="share_privilege_can_share">ניתן לשתף</string>
+  <string name="share_privilege_can_edit">ניתן לערוך</string>
+  <string name="share_privilege_can_edit_create">יצירה</string>
+  <string name="share_privilege_can_edit_change">שינוי</string>
+  <string name="share_privilege_can_edit_delete">מחיקה</string>
+  <string name="edit_share_unshare">הפסקת שיתוף</string>
+  <string name="edit_share_done">הסתיים</string>
+  <string name="action_switch_grid_view">מעבר לתצוגת טבלה</string>
+  <string name="action_switch_list_view">מעבר לתצוגת רשימה</string>
 </resources>

res/values-hr/strings.xml

@@ -70,4 +70,9 @@
   <string name="share_via_link_expiration_date_label">Odredite datum isteka</string>
   <string name="share_via_link_password_label">Zaštititi lozinkom</string>
   <string name="share_search">pretraži</string>
+  <string name="share_privilege_can_share">Dijeljenje moguće</string>
+  <string name="share_privilege_can_edit">Uređivanje moguće</string>
+  <string name="share_privilege_can_edit_create">Kreirajte</string>
+  <string name="share_privilege_can_edit_change">promijeni</string>
+  <string name="share_privilege_can_edit_delete">Izbrišite</string>
 </resources>

res/values-hu-rHU/strings.xml

@@ -126,6 +126,15 @@
   <string name="foreign_files_local_text">Helyi: %1$s</string>
   <string name="foreign_files_remote_text">Távoli: %1$s</string>
   <string name="upload_query_move_foreign_files">Nincs elég hely a kiválasztott fájlok másolására a %1$s könyvtárban. Szeretnéd áthelyezni inkább?</string>
+  <string name="pass_code_enter_pass_code">Kérlek illeszd be a számkódodat</string>
+  <string name="pass_code_configure_your_pass_code">Írd be a számkódodat</string>
+  <string name="pass_code_configure_your_pass_code_explanation">A számkódra minden alkalommal szükség lesz az applikáció indításához</string>
+  <string name="pass_code_reenter_your_pass_code">Kérlek írd be újra a számkódodat</string>
+  <string name="pass_code_remove_your_pass_code">Számkódod eltávolítása</string>
+  <string name="pass_code_mismatch">A számkódok nem egyeznek</string>
+  <string name="pass_code_wrong">Hibás számkód</string>
+  <string name="pass_code_removed">Számkód törölve</string>
+  <string name="pass_code_stored">Számkód eltárolva</string>
   <string name="media_notif_ticker">%1$s zene lejátszó</string>
   <string name="media_state_playing">%1$s (lejátszás)</string>
   <string name="media_state_loading">%1$s (betöltés)</string>
@@ -249,9 +258,11 @@
   <string name="prefs_category_accounts">Fiókok</string>
   <string name="prefs_add_account">Fiók hozzáadása</string>
   <string name="actionbar_logger">Naplók</string>
+  <string name="log_progress_dialog_text">Adatok betöltése...</string>
   <string name="saml_authentication_required_text">Felhasználóazonosítás szükséges</string>
   <string name="saml_authentication_wrong_pass">Hibás jelszó</string>
   <string name="actionbar_move">Mozgatás</string>
+  <string name="file_list_empty_moving">Itt nincs semmi! Adj hozzá egy mappát!</string>
   <string name="folder_picker_choose_button_text">Válasszon</string>
   <string name="prefs_category_security">Biztonság</string>
   <string name="shared_subject_header">megosztva</string>
@@ -272,4 +283,11 @@
   <string name="share_via_link_expiration_date_label">Legyen lejárati idő</string>
   <string name="share_via_link_password_label">Jelszóval is védem</string>
   <string name="share_search">Keresés</string>
+  <string name="share_privilege_can_share">megosztható</string>
+  <string name="share_privilege_can_edit">módosíthat</string>
+  <string name="share_privilege_can_edit_create">létrehoz</string>
+  <string name="share_privilege_can_edit_change">változtatás</string>
+  <string name="share_privilege_can_edit_delete">törlés</string>
+  <string name="action_switch_grid_view">Rács nézetre váltás</string>
+  <string name="action_switch_list_view">Lista nézetre váltás</string>
 </resources>

res/values-hy/strings.xml

@@ -43,4 +43,5 @@
   <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_via_link_section_title">Կիսվել հղմամբ</string>
+  <string name="share_privilege_can_edit_delete">ջնջել</string>
 </resources>

res/values-ia/strings.xml

@@ -49,4 +49,8 @@
   <string name="share_via_link_expiration_date_label">Fixa data de expiration</string>
   <string name="share_via_link_password_label">Protegite per contrasigno</string>
   <string name="share_search">Cercar</string>
+  <string name="share_privilege_can_share">pote compartir</string>
+  <string name="share_privilege_can_edit">pote modificar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_delete">deler</string>
 </resources>

res/values-id/strings.xml

@@ -335,4 +335,9 @@
   <string name="share_via_link_expiration_date_label">Atur tanggal kedaluwarsa</string>
   <string name="share_via_link_password_label">Lindungi dengan sandi</string>
   <string name="share_search">Cari</string>
+  <string name="share_privilege_can_share">dapat berbagi</string>
+  <string name="share_privilege_can_edit">dapat disunting</string>
+  <string name="share_privilege_can_edit_create">buat</string>
+  <string name="share_privilege_can_edit_change">ubah</string>
+  <string name="share_privilege_can_edit_delete">hapus</string>
 </resources>

res/values-is/strings.xml

@@ -1,22 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_version">útgáfa %1$s</string>
   <string name="actionbar_upload">Senda inn</string>
   <string name="actionbar_upload_files">Skrár</string>
+  <string name="actionbar_open_with">Opna með</string>
+  <string name="actionbar_mkdir">Ný mappa</string>
   <string name="actionbar_settings">Stillingar</string>
   <string name="actionbar_send_file">Senda</string>
+  <string name="actionbar_sort">Raða</string>
+  <string name="actionbar_sort_title">Raða sem</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Nýjast - Elst</item>
+  </string-array>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Allar skrár</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_close">Loka</string>
   <string name="drawer_open">Opna</string>
   <string name="prefs_category_more">Meira</string>
   <string name="prefs_help">Hjálp</string>
   <string name="auth_username">Notendanafn</string>
   <string name="auth_password">Lykilorð</string>
   <string name="sync_string_files">Skrár</string>
+  <string name="setup_btn_connect">Tengjast</string>
   <string name="uploader_btn_upload_text">Senda inn</string>
+  <string name="uploader_btn_new_folder_text">Ný mappa</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Hætta</string>
   <string name="file_list_seconds_ago">sek.</string>
   <string name="file_list_empty">Ekkert hér. Settu eitthvað inn!</string>
   <string name="filedetails_download">Niðurhal</string>
@@ -26,17 +40,39 @@
   <string name="common_ok">Í lagi</string>
   <string name="common_cancel">Hætta við</string>
   <string name="common_error"><strong>Villa</strong></string>
+  <string name="about_title">Um</string>
   <string name="change_password">Breyta lykilorði</string>
   <string name="uploader_info_dirname">Nafn möppu</string>
-  <string name="common_rename">Endurskýra</string>
+  <string name="foreign_files_move">Færa allt</string>
+  <string name="favorite">Uppáhalds</string>
+  <string name="common_rename">Endurnefna</string>
   <string name="common_remove">Fjarlægja</string>
+  <string name="ssl_validator_btn_details_hide">Fela</string>
+  <string name="ssl_validator_label_C">Land:</string>
+  <string name="ssl_validator_label_ST">Sýsla:</string>
+  <string name="ssl_validator_label_validity_from">Frá:</string>
+  <string name="ssl_validator_label_validity_to">Til:</string>
+  <string name="placeholder_filetype">PNG mynd</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="activity_chooser_send_file_title">Senda</string>
   <string name="empty"></string>
   <string name="actionbar_move">Færa</string>
   <string name="folder_picker_choose_button_text">Veldu</string>
+  <string name="with_you_subject_header">með þér</string>
+  <string name="subject_user_shared_with_you">%1$s deilt \"%2$s\" með þér</string>
   <string name="auth_host_address">Host nafn netþjóns</string>
+  <string name="username">Notendanafn</string>
+  <string name="file_list__footer__folder">1 mappa</string>
+  <string name="file_list__footer__file">1 skrá</string>
   <string name="share_via_link_section_title">Deila hlekk</string>
   <string name="share_via_link_expiration_date_label">Setja gildistíma</string>
   <string name="share_via_link_password_label">Verja með lykilorði</string>
   <string name="share_search">Leita</string>
+  <string name="share_privilege_can_share">getur deilt</string>
+  <string name="share_privilege_can_edit">getur breytt</string>
+  <string name="share_privilege_can_edit_create">mynda</string>
+  <string name="share_privilege_can_edit_change">breyta</string>
+  <string name="share_privilege_can_edit_delete">eyða</string>
 </resources>

res/values-it/strings.xml

@@ -273,7 +273,7 @@
   <string name="unshare_link_file_no_exist">Impossibile rimuovere dalla condivisione. Assicurati che il file esista</string>
   <string name="unshare_link_file_error">Si è verificato un errore durante il tentativo di rimuovere la condivisione del file o della cartella</string>
   <string name="update_link_file_no_exist">Impossibile aggiornare. Assicurati che il file esista</string>
-  <string name="update_link_file_error">Si è verificato un errore durante il tentativo di aggiornare il collegamento condiviso</string>
+  <string name="update_link_file_error">Si è verificato un errore durante il tentativo di aggiornare la condivisione.</string>
   <string name="share_link_password_title">Digita una password</string>
   <string name="share_link_empty_password">Devi digitare una password</string>
   <string name="activity_chooser_send_file_title">Invia</string>
@@ -290,7 +290,7 @@
   <string name="forbidden_permissions_delete">per eliminare questo file</string>
   <string name="share_link_forbidden_permissions">per condividere questo file</string>
   <string name="unshare_link_forbidden_permissions">per rimuovere la condivisione di questo file</string>
-  <string name="update_link_forbidden_permissions">per aggiornare questo collegamento condiviso</string>
+  <string name="update_link_forbidden_permissions">per aggiornare questa condivisione</string>
   <string name="forbidden_permissions_create">per creare il file</string>
   <string name="uploader_upload_forbidden_permissions">per caricare in questa cartella</string>
   <string name="downloader_download_file_not_found">Il file non è più disponibile sul server</string>
@@ -357,4 +357,13 @@
   <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>
+  <string name="share_privilege_can_share">può condividere</string>
+  <string name="share_privilege_can_edit">può modificare</string>
+  <string name="share_privilege_can_edit_create">crea</string>
+  <string name="share_privilege_can_edit_change">cambia</string>
+  <string name="share_privilege_can_edit_delete">elimina</string>
+  <string name="edit_share_unshare">Interrompi la condivisione</string>
+  <string name="edit_share_done">completato</string>
+  <string name="action_switch_grid_view">Passa alla vista a griglia</string>
+  <string name="action_switch_list_view">Passa alla vista a elenco</string>
 </resources>

res/values-ja-rJP/strings.xml

@@ -274,7 +274,7 @@
   <string name="unshare_link_file_no_exist">共有を解除できません。ファイルがあるか確認してください。</string>
   <string name="unshare_link_file_error">このファイルまたはフォルダーの共有を解除する際にエラーが発生しました</string>
   <string name="update_link_file_no_exist">更新できません。ファイルがあるか確認してください。</string>
-  <string name="update_link_file_error">共有リンクを更新する際にエラーが発生しました</string>
+  <string name="update_link_file_error">共有を更新する際にエラーが発生しました</string>
   <string name="share_link_password_title">パスワードを入力</string>
   <string name="share_link_empty_password">パスワードを入力しなければなりません</string>
   <string name="activity_chooser_send_file_title">送信</string>
@@ -291,7 +291,7 @@
   <string name="forbidden_permissions_delete">ファイルを削除</string>
   <string name="share_link_forbidden_permissions">ファイルを共有</string>
   <string name="unshare_link_forbidden_permissions">ファイルの共有を解除</string>
-  <string name="update_link_forbidden_permissions">この共有リンクを更新</string>
+  <string name="update_link_forbidden_permissions">共有を更新</string>
   <string name="forbidden_permissions_create">ファイルを作成</string>
   <string name="uploader_upload_forbidden_permissions">フォルダーをアップロード</string>
   <string name="downloader_download_file_not_found">ファイルはサーバー上で利用できません</string>
@@ -356,4 +356,13 @@
   <string name="share_group_clarification">%1$s (グループ)</string>
   <string name="share_sharee_unavailable">申し訳ありませんが、このサーバーのバージョンではこのクライアントアプリ上で他のユーザーと共有することができません。
         \n管理者に相談してしてください。</string>
+  <string name="share_privilege_can_share">共有可</string>
+  <string name="share_privilege_can_edit">編集を許可</string>
+  <string name="share_privilege_can_edit_create">作成</string>
+  <string name="share_privilege_can_edit_change">更新</string>
+  <string name="share_privilege_can_edit_delete">削除</string>
+  <string name="edit_share_unshare">共有の停止</string>
+  <string name="edit_share_done">完了</string>
+  <string name="action_switch_grid_view">グリッド表示に変更</string>
+  <string name="action_switch_list_view">リスト表示に変更</string>
 </resources>

res/values-ka-rGE/strings.xml

@@ -146,4 +146,7 @@
   <string name="share_via_link_expiration_date_label">მიუთითე ვადის გასვლის დრო</string>
   <string name="share_via_link_password_label">პაროლით დაცვა</string>
   <string name="share_search">ძებნა</string>
+  <string name="share_privilege_can_edit">შეგიძლია შეცვლა</string>
+  <string name="share_privilege_can_edit_create">შექმნა</string>
+  <string name="share_privilege_can_edit_delete">წაშლა</string>
 </resources>

res/values-km/strings.xml

@@ -108,4 +108,8 @@
   <string name="share_via_link_expiration_date_label">កំណត់​ពេល​ផុត​កំណត់</string>
   <string name="share_via_link_password_label">ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់</string>
   <string name="share_search">ស្វែង​រក</string>
+  <string name="share_privilege_can_share">អាច​ចែក​រំលែក</string>
+  <string name="share_privilege_can_edit">អាច​កែប្រែ</string>
+  <string name="share_privilege_can_edit_create">បង្កើត</string>
+  <string name="share_privilege_can_edit_delete">លុប</string>
 </resources>

res/values-kn/strings.xml

@@ -44,4 +44,9 @@
   <string name="share_via_link_expiration_date_label">ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸಿ</string>
   <string name="share_via_link_password_label">ಗುಪ್ತಪದ ರಕ್ಷಿಸಿಕೂಳ್ಲಿ</string>
   <string name="share_search">ಹುಡುಕು</string>
+  <string name="share_privilege_can_share">ಹಂಚಿಕೊಳ್ಳಬಹುದು</string>
+  <string name="share_privilege_can_edit">ಸಂಪಾದಿಸಬಹುದು</string>
+  <string name="share_privilege_can_edit_create">ಸೃಷ್ಟಿಸು</string>
+  <string name="share_privilege_can_edit_change">ಬದಲಾವಣೆ</string>
+  <string name="share_privilege_can_edit_delete">ಅಳಿಸಿ</string>
 </resources>

res/values-ko/strings.xml

@@ -272,7 +272,6 @@
   <string name="unshare_link_file_no_exist">공유를 해제할 수 없습니다. 파일이 있는지 확인하십시오</string>
   <string name="unshare_link_file_error">이 파일이나 폴더의 공유를 해제하는 중 오류 발생</string>
   <string name="update_link_file_no_exist">업데이트에 실패하였습니다. 이미 파일이 존재하지는 않는지 확인해주세요.</string>
-  <string name="update_link_file_error">공유된 링크를 업데이트 하는데 에러가 발생하였습니다.</string>
   <string name="share_link_password_title">암호 입력</string>
   <string name="share_link_empty_password">암호를 입력해야 합니다</string>
   <string name="activity_chooser_send_file_title">보내기</string>
@@ -289,7 +288,6 @@
   <string name="forbidden_permissions_delete">이 파일을 삭제할</string>
   <string name="share_link_forbidden_permissions">이 파일을 공유할</string>
   <string name="unshare_link_forbidden_permissions">이 파일의 공유를 해제할</string>
-  <string name="update_link_forbidden_permissions">이 공유된 링크를 업데이트</string>
   <string name="forbidden_permissions_create">파일을 생성할</string>
   <string name="uploader_upload_forbidden_permissions">이 폴더에 업로드할</string>
   <string name="downloader_download_file_not_found">이 파일을 서버에서 더 이상 사용할 수 없습니다</string>
@@ -336,6 +334,12 @@
   <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="prefs_instant_behaviour_dialogTitle">원래 파일은...</string>
+  <string name="prefs_instant_behaviour_title">원래 파일은...</string>
+  <string name="upload_copy_files">파일 복사</string>
+  <string name="upload_move_files">파일 이동</string>
+  <string name="pref_behaviour_entries_keep_file">원래 폴더에 유지</string>
+  <string name="pref_behaviour_entries_move">앱 폴더로 이동되었습니다.</string>
   <string name="share_dialog_title">공유</string>
   <string name="share_with_user_section_title">유저와 그룹에 공유하기</string>
   <string name="share_no_users">No data shared with users yet</string>
@@ -350,4 +354,9 @@
   <string name="share_group_clarification">%1$s (그룹)</string>
   <string name="share_sharee_unavailable">죄송합니다. 이 버전에서는 사용자들이 클라이언트에서 공유하는 것을 허용하지 않습니다.
 \n서버의 관리자에게 문의하시기 바랍니다.</string>
+  <string name="share_privilege_can_share">공유 가능</string>
+  <string name="share_privilege_can_edit">편집 가능</string>
+  <string name="share_privilege_can_edit_create">생성</string>
+  <string name="share_privilege_can_edit_change">변경</string>
+  <string name="share_privilege_can_edit_delete">삭제</string>
 </resources>

res/values-lb/strings.xml

@@ -234,4 +234,8 @@
   <string name="share_via_link_expiration_date_label">Verfallsdatum setzen</string>
   <string name="share_via_link_password_label">Passwuertgeschützt</string>
   <string name="share_search">Sichen</string>
+  <string name="share_privilege_can_share">kann deelen</string>
+  <string name="share_privilege_can_edit">kann änneren</string>
+  <string name="share_privilege_can_edit_create">erstellen</string>
+  <string name="share_privilege_can_edit_delete">läschen</string>
 </resources>

res/values-lt-rLT/strings.xml

@@ -271,7 +271,6 @@
   <string name="unshare_link_file_no_exist">Nepavyksta nebedalinti. Patikrinkite ar failas egzistuoja</string>
   <string name="unshare_link_file_error">Įvyko klaida bandant nebedalinti šio failu ar aplanku</string>
   <string name="update_link_file_no_exist">Nepavyko atnaujinti. Prašau patikrinti ar failas egzistuoja</string>
-  <string name="update_link_file_error">Klaida atnaujinant dalijimosi nuorodą</string>
   <string name="share_link_password_title">Įveskite slaptažodį</string>
   <string name="share_link_empty_password">Slaptažodis privalomas</string>
   <string name="activity_chooser_send_file_title">Siųsti</string>
@@ -288,7 +287,6 @@
   <string name="forbidden_permissions_delete">ištrinti failo</string>
   <string name="share_link_forbidden_permissions">dalintis failu</string>
   <string name="unshare_link_forbidden_permissions">nebesidalinti failu</string>
-  <string name="update_link_forbidden_permissions">atnaujinti dalijimosi nuorodą</string>
   <string name="forbidden_permissions_create">sukurti failą</string>
   <string name="uploader_upload_forbidden_permissions">įkelti į aplanką</string>
   <string name="downloader_download_file_not_found">Failas neegzistuoja serveryje</string>
@@ -355,4 +353,9 @@
   <string name="share_group_clarification">%1$s (grupė)</string>
   <string name="share_sharee_unavailable">Serveris nepalaiko dalinimosi su vartotojais kliente.
 \nSusisiekite su administratoriumi.</string>
+  <string name="share_privilege_can_share">gali dalintis</string>
+  <string name="share_privilege_can_edit">gali redaguoti</string>
+  <string name="share_privilege_can_edit_create">sukurti</string>
+  <string name="share_privilege_can_edit_change">keisti</string>
+  <string name="share_privilege_can_edit_delete">ištrinti</string>
 </resources>

res/values-lv/strings.xml

@@ -193,4 +193,8 @@
   <string name="share_via_link_expiration_date_label">Iestaties termiņa datumu</string>
   <string name="share_via_link_password_label">Aizsargāt ar paroli</string>
   <string name="share_search">Meklēt</string>
+  <string name="share_privilege_can_share">Var dalīties</string>
+  <string name="share_privilege_can_edit">var rediģēt</string>
+  <string name="share_privilege_can_edit_create">izveidot</string>
+  <string name="share_privilege_can_edit_delete">dzēst</string>
 </resources>

res/values-mk/strings.xml

@@ -21,8 +21,10 @@
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Сите датотеки</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_item_settings">Подесувања</string>
   <string name="drawer_open">Отвори</string>
   <string name="prefs_category_general">Општо</string>
   <string name="prefs_category_more">Повеќе</string>
@@ -184,6 +186,7 @@
  </string>
   <string name="auth_can_not_auth_against_server">Не можам да се авторизирам на овој сервер </string>
   <string name="auth_account_does_not_exist">Сметката сеуште не постои на овој уред</string>
+  <string name="favorite">Омилен</string>
   <string name="common_rename">Преименувај</string>
   <string name="common_remove">Отстрани</string>
   <string name="confirmation_remove_alert">Дали навистина сакаш да ја отстраниш %1$s?</string>
@@ -299,4 +302,9 @@
   <string name="share_via_link_expiration_date_label">Постави рок на траење</string>
   <string name="share_via_link_password_label">Заштити со лозинка</string>
   <string name="share_search">Барај</string>
+  <string name="share_privilege_can_share">може да споделува</string>
+  <string name="share_privilege_can_edit">може да се измени</string>
+  <string name="share_privilege_can_edit_create">креирај</string>
+  <string name="share_privilege_can_edit_change">промени</string>
+  <string name="share_privilege_can_edit_delete">избриши</string>
 </resources>

res/values-ms-rMY/strings.xml

@@ -62,4 +62,6 @@
   <string name="prefs_category_accounts">Akaun</string>
   <string name="auth_host_address">Alamat pelayan</string>
   <string name="share_search">Cari</string>
+  <string name="share_privilege_can_share">boleh berkongsi</string>
+  <string name="share_privilege_can_edit">boleh mengubah</string>
 </resources>

res/values-my/strings.xml

@@ -20,4 +20,7 @@
   <string name="empty"></string>
   <string name="folder_picker_choose_button_text">ရွေးချယ်</string>
   <string name="share_via_link_expiration_date_label">သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်</string>
+  <string name="share_privilege_can_edit">ပြင်ဆင်နိုင်</string>
+  <string name="share_privilege_can_edit_create">ဖန်တီးမည်</string>
+  <string name="share_privilege_can_edit_delete">ဖျက်မည်</string>
 </resources>

res/values-nb-rNO/strings.xml

@@ -243,6 +243,9 @@
   <string name="ssl_validator_label_validity_to">Til:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
+  <string name="digest_algorithm_not_available">Digest-algoritmen er ikke tilgjengelig på din telefon.</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Fingeravtrykk:</string>
+  <string name="certificate_load_problem">Det er et problem med lasting av sertifikatet.</string>
   <string name="ssl_validator_null_cert">Sertifikatet kunne ikke vises.</string>
   <string name="ssl_validator_no_info_about_error">- Ingen informasjon om feilen</string>
   <string name="placeholder_sentence">Dette er en plassholder</string>
@@ -269,6 +272,7 @@
   <string name="share_link_file_error">Det skjedde en feil under deling av denne filen eller mappen</string>
   <string name="unshare_link_file_no_exist">Kan ikke fjerne deling. Sjekk om filen eksisterer.</string>
   <string name="unshare_link_file_error">En feil oppstod ved avslutting av delingen av denne filen eller mappen</string>
+  <string name="update_link_file_no_exist">Kan ikke oppdatere. Sjekk om filen eksisterer</string>
   <string name="share_link_password_title">Skriv inn ett passord</string>
   <string name="share_link_empty_password">Du må skrive inn ett passord</string>
   <string name="activity_chooser_send_file_title">Send</string>
@@ -314,6 +318,7 @@
   <string name="prefs_category_instant_uploading">Umiddelbare opplastinger</string>
   <string name="prefs_category_security">Sikkerhet</string>
   <string name="prefs_instant_video_upload_path_title">Sti til video-opplasting</string>
+  <string name="sync_folder_failed_content">Synkronisering av %1$s mappe kunne ikke fullføres</string>
   <string name="shared_subject_header">delte</string>
   <string name="with_you_subject_header">med deg</string>
   <string name="subject_user_shared_with_you">%1$s delte \"%2$s\" med deg</string>
@@ -330,11 +335,31 @@
   <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="prefs_instant_behaviour_dialogTitle">Opprinnelig fil vil bli...</string>
+  <string name="prefs_instant_behaviour_title">Opprinnelig fil vil bli...</string>
+  <string name="upload_copy_files">Kopier fil</string>
+  <string name="upload_move_files">Flytt fil</string>
+  <string name="pref_behaviour_entries_keep_file">beholdt i opprinnelig mappe</string>
+  <string name="pref_behaviour_entries_move">flyttet til app-mappe</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_via_link_section_title">Del lenke</string>
   <string name="share_via_link_expiration_date_label">Sett utløpsdato</string>
   <string name="share_via_link_password_label">Passordbeskyttet</string>
+  <string name="share_via_link_password_title">Sikret</string>
+  <string name="share_get_public_link_button">Hent lenke</string>
   <string name="share_search">Søk</string>
+  <string name="search_users_and_groups_hint">Søk etter brukere og grupper</string>
+  <string name="share_group_clarification">%1$s (gruppe)</string>
+  <string name="share_sharee_unavailable">Beklager, server-versjonen din tillater ikke klienter å dele med brukere.
+        \nKontakt systemadministratoren</string>
+  <string name="share_privilege_can_share">kan dele</string>
+  <string name="share_privilege_can_edit">kan endre</string>
+  <string name="share_privilege_can_edit_create">opprette</string>
+  <string name="share_privilege_can_edit_change">endre</string>
+  <string name="share_privilege_can_edit_delete">slett</string>
+  <string name="action_switch_grid_view">Bytt til rutenett-visning</string>
+  <string name="action_switch_list_view">Bytt til listevisning</string>
 </resources>

res/values-nl/strings.xml

@@ -276,7 +276,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="unshare_link_file_no_exist">Kan delen niet beëindigen. Ga na of het bestand bestaat</string>
   <string name="unshare_link_file_error">Er trad een fout op bij uw poging het delen van dit bestand of deze map te beëindigen</string>
   <string name="update_link_file_no_exist">Kan niet bijwerken. Ga na of het bestand bestaat</string>
-  <string name="update_link_file_error">Er trad een fout op bij uw poging deze gedeelde link bij te werken</string>
+  <string name="update_link_file_error">Er trad een fout op bij uw poging de share bij te werken</string>
   <string name="share_link_password_title">Vul het wachtwoord in</string>
   <string name="share_link_empty_password">U moet een wachtwoord opgeven</string>
   <string name="activity_chooser_send_file_title">Versturen</string>
@@ -293,7 +293,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="forbidden_permissions_delete">om dit bestand te verwijderen</string>
   <string name="share_link_forbidden_permissions">om dit bestand te delen</string>
   <string name="unshare_link_forbidden_permissions">om dit bestand niet meer te delen</string>
-  <string name="update_link_forbidden_permissions">deze gedeelde link bij te werken</string>
+  <string name="update_link_forbidden_permissions">om deze share bij te werken</string>
   <string name="forbidden_permissions_create">om dit bestand te creëren</string>
   <string name="uploader_upload_forbidden_permissions">om dit bestand in deze map te uploaden</string>
   <string name="downloader_download_file_not_found">Dit bestand is niet langer beschikbaar op de server</string>
@@ -360,4 +360,13 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <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>
+  <string name="share_privilege_can_share">kan delen</string>
+  <string name="share_privilege_can_edit">kan wijzigen</string>
+  <string name="share_privilege_can_edit_create">creëer</string>
+  <string name="share_privilege_can_edit_change">wijzig</string>
+  <string name="share_privilege_can_edit_delete">verwijderen</string>
+  <string name="edit_share_unshare">Stop met delen</string>
+  <string name="edit_share_done">gedaan</string>
+  <string name="action_switch_grid_view">Omschakelen naar rasteroverzicht</string>
+  <string name="action_switch_list_view">Omschakelen naar lijstoverzicht</string>
 </resources>

res/values-nn-rNO/strings.xml

@@ -131,4 +131,8 @@
   <string name="share_via_link_expiration_date_label">Set utløpsdato</string>
   <string name="share_via_link_password_label">Passordvern</string>
   <string name="share_search">Søk</string>
+  <string name="share_privilege_can_share">kan dela</string>
+  <string name="share_privilege_can_edit">kan endra</string>
+  <string name="share_privilege_can_edit_create">lag</string>
+  <string name="share_privilege_can_edit_delete">slett</string>
 </resources>

res/values-oc/strings.xml

@@ -343,4 +343,9 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an
   <string name="share_via_link_password_label">Protegir per un senhal</string>
   <string name="share_search">Recercar</string>
   <string name="search_users_and_groups_hint">Recercar d\'utilizaires e de gropes</string>
+  <string name="share_privilege_can_share">pòt partejar</string>
+  <string name="share_privilege_can_edit">pòt modificar</string>
+  <string name="share_privilege_can_edit_create">crear</string>
+  <string name="share_privilege_can_edit_change">modificacion</string>
+  <string name="share_privilege_can_edit_delete">suprimir</string>
 </resources>

res/values-pl/strings.xml

@@ -320,4 +320,9 @@
   <string name="share_via_link_expiration_date_label">Ustaw datę wygaśnięcia</string>
   <string name="share_via_link_password_label">Zabezpiecz hasłem</string>
   <string name="share_search">Wyszukaj</string>
+  <string name="share_privilege_can_share">może współdzielić</string>
+  <string name="share_privilege_can_edit">może edytować</string>
+  <string name="share_privilege_can_edit_create">utwórz</string>
+  <string name="share_privilege_can_edit_change">zmiany</string>
+  <string name="share_privilege_can_edit_delete">skasuj</string>
 </resources>

res/values-pt-rBR/strings.xml

@@ -273,7 +273,7 @@
   <string name="unshare_link_file_no_exist">Não é possível cancelar o compartilhamento. Por favor verifique se o arquivo existe</string>
   <string name="unshare_link_file_error">Ocorreu um erro ao tentar descompartilhar este arquivo ou pasta</string>
   <string name="update_link_file_no_exist">Não é possível atualizar. Por favor verifique se o arquivo existe</string>
-  <string name="update_link_file_error">Ocorreu um erro ao tentar atualizar o link compartilhado</string>
+  <string name="update_link_file_error">Ocorreu um erro enquanto tentava atualizar o compartilhamento</string>
   <string name="share_link_password_title">Digite uma senha</string>
   <string name="share_link_empty_password">Você deve digitar uma senha</string>
   <string name="activity_chooser_send_file_title">Enviar</string>
@@ -290,7 +290,7 @@
   <string name="forbidden_permissions_delete">para excluir este arquivo</string>
   <string name="share_link_forbidden_permissions">para compartilhar este arquivo</string>
   <string name="unshare_link_forbidden_permissions">para descompartilhar este arquivo</string>
-  <string name="update_link_forbidden_permissions">atualizar este link compartilhado</string>
+  <string name="update_link_forbidden_permissions">atualizar este compartilhamento</string>
   <string name="forbidden_permissions_create">para criar este arquivo</string>
   <string name="uploader_upload_forbidden_permissions">para enviar para esta pasta</string>
   <string name="downloader_download_file_not_found">Este arquivo não mais está disponível neste servidor</string>
@@ -357,4 +357,13 @@
   <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>
+  <string name="share_privilege_can_share">pode compartilhar</string>
+  <string name="share_privilege_can_edit">pode editar</string>
+  <string name="share_privilege_can_edit_create">criar</string>
+  <string name="share_privilege_can_edit_change">mudança</string>
+  <string name="share_privilege_can_edit_delete">excluir</string>
+  <string name="edit_share_unshare">Parar compartilhamento</string>
+  <string name="edit_share_done">finalizado</string>
+  <string name="action_switch_grid_view">Alternar para exibição de grade</string>
+  <string name="action_switch_list_view">Alternar para exibição de lista</string>
 </resources>

res/values-pt-rPT/strings.xml

@@ -242,6 +242,9 @@
   <string name="ssl_validator_label_validity_to">Para:</string>
   <string name="ssl_validator_label_signature">Assinatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo</string>
+  <string name="digest_algorithm_not_available">O algoritmo de resumo não está disponível no seu telemóvel</string>
+  <string name="ssl_validator_label_certificate_fingerprint"><h3>Impressões digitais</h3></string>
+  <string name="certificate_load_problem">Ocorreu um problema ao carregar o certificado </string>
   <string name="ssl_validator_null_cert">Não foi possível mostrar o certificado.</string>
   <string name="ssl_validator_no_info_about_error">- Nenhuma informação sobre o erro</string>
   <string name="placeholder_sentence">Isto é uma variável.</string>
@@ -267,6 +270,8 @@
   <string name="share_link_file_error">Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta</string>
   <string name="unshare_link_file_no_exist">Não é possível retirar a partilha. Verifique se o ficheiro existe</string>
   <string name="unshare_link_file_error">Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta</string>
+  <string name="update_link_file_no_exist">Não é possível atualizar. Por favor, verifique se o ficheiro existe.</string>
+  <string name="update_link_file_error">Ocorreu um erro ao tentar atualizar a partilha</string>
   <string name="share_link_password_title">Introduza uma palavra-passe</string>
   <string name="share_link_empty_password">Você deve introduzir uma palavra-passe</string>
   <string name="activity_chooser_send_file_title">Enviar</string>
@@ -283,6 +288,7 @@
   <string name="forbidden_permissions_delete">para apagar este ficheiro</string>
   <string name="share_link_forbidden_permissions">para partilhar este ficheiro</string>
   <string name="unshare_link_forbidden_permissions">para cancelar a partilha deste ficheiro</string>
+  <string name="update_link_forbidden_permissions">para atualizar esta partilha</string>
   <string name="forbidden_permissions_create">para criar o ficheiro</string>
   <string name="uploader_upload_forbidden_permissions">para enviar nesta pasta</string>
   <string name="downloader_download_file_not_found">O ficheiro não está mais disponível no servidor</string>
@@ -329,11 +335,33 @@
   <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="prefs_instant_behaviour_dialogTitle">O ficheiro original será...</string>
+  <string name="prefs_instant_behaviour_title">O ficheiro original será...</string>
+  <string name="upload_copy_files">Copiar ficheiro</string>
+  <string name="upload_move_files">Mover ficheiro</string>
+  <string name="pref_behaviour_entries_keep_file">mantido na pasta original</string>
+  <string name="pref_behaviour_entries_move">movido para pasta da aplicação</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_via_link_section_title">Compartilhar hiperligação</string>
   <string name="share_via_link_expiration_date_label">Definir a data de expiração</string>
   <string name="share_via_link_password_label">Proteger com Palavra-passe</string>
+  <string name="share_via_link_password_title">Protegido</string>
+  <string name="share_get_public_link_button">Obter ligação</string>
   <string name="share_search">Procurar</string>
+  <string name="search_users_and_groups_hint">Pesquisar utilizadores e grupos</string>
+  <string name="share_group_clarification">%1$s (grupo)</string>
+  <string name="share_sharee_unavailable">Desculpe, a versão do seu servidor não autoriza a partilha com utilizadores no mesmo cliente.
+        \nPor favor contacte o seu administrador</string>
+  <string name="share_privilege_can_share">pode partilhar</string>
+  <string name="share_privilege_can_edit">pode editar</string>
+  <string name="share_privilege_can_edit_create">criar</string>
+  <string name="share_privilege_can_edit_change">alterar</string>
+  <string name="share_privilege_can_edit_delete">eliminar</string>
+  <string name="edit_share_unshare">Parar partilha</string>
+  <string name="edit_share_done">feito</string>
+  <string name="action_switch_grid_view">Alterar para vista de grelha</string>
+  <string name="action_switch_list_view">Alterar para vista em lista</string>
 </resources>

res/values-ro/strings.xml

@@ -326,4 +326,9 @@
   <string name="share_via_link_expiration_date_label">Specifică data expirării</string>
   <string name="share_via_link_password_label">Protejare cu parolă</string>
   <string name="share_search">Căutare</string>
+  <string name="share_privilege_can_share">se poate partaja</string>
+  <string name="share_privilege_can_edit">se poate edita</string>
+  <string name="share_privilege_can_edit_create">creare</string>
+  <string name="share_privilege_can_edit_change">modifică</string>
+  <string name="share_privilege_can_edit_delete">ștergere</string>
 </resources>

res/values-ru/strings.xml

@@ -274,7 +274,7 @@
   <string name="unshare_link_file_no_exist">Невозможно закрыть доступ. Убедитесь что файл существует</string>
   <string name="unshare_link_file_error">При попытке закрыть доступ к этому файлу или каталогу произошла ошибка</string>
   <string name="update_link_file_no_exist">Не удается обновить. Пожалуйста, проверьте, существует ли файл</string>
-  <string name="update_link_file_error">Произошла ошибка при попытке обновить общую ссылку</string>
+  <string name="update_link_file_error">Произошла ошибка во время обновления ссылки доступа</string>
   <string name="share_link_password_title">Введите пароль</string>
   <string name="share_link_empty_password">Вы должны ввести пароль</string>
   <string name="activity_chooser_send_file_title">Отправить</string>
@@ -291,7 +291,7 @@
   <string name="forbidden_permissions_delete">для удаления этого файла</string>
   <string name="share_link_forbidden_permissions">для открытия доступа к этому файлу</string>
   <string name="unshare_link_forbidden_permissions">для закрытия доступа к этому файлу</string>
-  <string name="update_link_forbidden_permissions">обновить эту общую ссылку</string>
+  <string name="update_link_forbidden_permissions">для обновления этой ссылки</string>
   <string name="forbidden_permissions_create">для создания файла</string>
   <string name="uploader_upload_forbidden_permissions">для загрузки в этот каталог</string>
   <string name="downloader_download_file_not_found">Этот файл больше недоступен на сервере</string>
@@ -338,6 +338,12 @@
   <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="prefs_instant_behaviour_dialogTitle">Исходный файл будет ...</string>
+  <string name="prefs_instant_behaviour_title">Исходный файл будет ...</string>
+  <string name="upload_copy_files">Копировать файл</string>
+  <string name="upload_move_files">Переместить файл</string>
+  <string name="pref_behaviour_entries_keep_file">остался в исходной папке</string>
+  <string name="pref_behaviour_entries_move">перемещен в папку приложения</string>
   <string name="share_dialog_title">Общий доступ</string>
   <string name="share_with_user_section_title">Поделиться с пользователями и группами</string>
   <string name="share_no_users">Нет данных используемых совместно с другими пользователями</string>
@@ -351,4 +357,13 @@
   <string name="search_users_and_groups_hint">Поиск пользователей и групп</string>
   <string name="share_group_clarification">%1$s (группа)</string>
   <string name="share_sharee_unavailable">Извините, версия вашего сервера не позволяет поделиться с пользователями через клиент. \nПожалуйста обратитесь к администратору</string>
+  <string name="share_privilege_can_share">можно поделиться</string>
+  <string name="share_privilege_can_edit">можно редактировать</string>
+  <string name="share_privilege_can_edit_create">создать</string>
+  <string name="share_privilege_can_edit_change">изменить</string>
+  <string name="share_privilege_can_edit_delete">удалить</string>
+  <string name="edit_share_unshare">Остановить общий доступ</string>
+  <string name="edit_share_done">завершено</string>
+  <string name="action_switch_grid_view">Переключить на табличный вид</string>
+  <string name="action_switch_list_view">Переключить на отображение в виде списка</string>
 </resources>

res/values-si-rLK/strings.xml

@@ -83,4 +83,7 @@
   <string name="share_via_link_expiration_date_label">කල් ඉකුත් විමේ දිනය දමන්න</string>
   <string name="share_via_link_password_label">මුර පදයකින් ආරක්ශාකරන්න</string>
   <string name="share_search">සොයන්න</string>
+  <string name="share_privilege_can_edit">සංස්කරණය කළ හැක</string>
+  <string name="share_privilege_can_edit_create">සදන්න</string>
+  <string name="share_privilege_can_edit_delete">මකන්න</string>
 </resources>

res/values-sk-rSK/strings.xml

@@ -345,4 +345,9 @@
   <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>
+  <string name="share_privilege_can_share">môže zdieľať</string>
+  <string name="share_privilege_can_edit">môže upraviť</string>
+  <string name="share_privilege_can_edit_create">vytvoriť</string>
+  <string name="share_privilege_can_edit_change">zmeniť</string>
+  <string name="share_privilege_can_edit_delete">vymazať</string>
 </resources>

res/values-sl/strings.xml

@@ -71,7 +71,7 @@
   <string name="file_list_seconds_ago">pred nekaj sekundami</string>
   <string name="file_list_empty">Tukaj še ni ničesar. Najprej je treba datoteke poslati v oblak!</string>
   <string name="file_list_loading">Poteka nalaganje ...</string>
-  <string name="file_list_no_app_for_file_type">Ne najdem aplikacije za to vrsto datoteke!</string>
+  <string name="file_list_no_app_for_file_type">Za to vrsto datoteke ni določenega programa!</string>
   <string name="local_file_list_empty">V tej mapi ni datotek.</string>
   <string name="filedetails_select_file">Pritisnite na datoteko za prikaz dodatnih podrobnosti.</string>
   <string name="filedetails_size">Velikost:</string>
@@ -79,14 +79,14 @@
   <string name="filedetails_created">Ustvarjeno:</string>
   <string name="filedetails_modified">Spremenjeno:</string>
   <string name="filedetails_download">Prejmi</string>
-  <string name="filedetails_sync_file">Sinhroniziraj</string>
+  <string name="filedetails_sync_file">Uskladi</string>
   <string name="filedetails_renamed_in_upload_msg">Datoteka je bila med nalaganjem preimenovana v %1$s</string>
   <string name="list_layout">Postavitev seznama</string>
   <string name="action_share">Souporaba</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">V redu</string>
-  <string name="common_cancel_sync">Prekliči sinhronizacijo</string>
+  <string name="common_cancel_sync">Prekliči usklajevanje</string>
   <string name="common_cancel">Prekliči</string>
   <string name="common_save_exit">Shrani in končaj</string>
   <string name="common_error">Napaka</string>
@@ -243,8 +243,9 @@
   <string name="ssl_validator_label_validity_to">Do:</string>
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritem:</string>
-  <string name="digest_algorithm_not_available">Ta algoritem ni na voljo na vašem telefonu.</string>
-  <string name="certificate_load_problem">Imam težavo z nalaganjem certifikata.</string>
+  <string name="digest_algorithm_not_available">Ta algoritem na tej napravi ni podprt.</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Prstni odtis:</string>
+  <string name="certificate_load_problem">Prišlo je do težav med nalaganjem potrdila.</string>
   <string name="ssl_validator_null_cert">Potrdila ni mogoče pokazati.</string>
   <string name="ssl_validator_no_info_about_error">– Ni podatkov o napaki</string>
   <string name="placeholder_sentence">To je vsebnik predmetov</string>
@@ -271,14 +272,13 @@
   <string name="share_link_file_error">Prišlo je do napake med poskusom omogočanja souporabe te datoteke ali mape</string>
   <string name="unshare_link_file_no_exist">Ni mogoče prekiniti souporabe. Preverite, ali datoteka obstaja.</string>
   <string name="unshare_link_file_error">Prišlo je do napake med poskusom odstranjevanja souporabe te datoteke ali mape</string>
-  <string name="update_link_file_no_exist">Nemorem posodobiti. Prosim, preverite ali datoteka obstaja.</string>
-  <string name="update_link_file_error">Prišlo je do napake med posodabljanjem povezav</string>
+  <string name="update_link_file_no_exist">Posodobitev ni mogoča. Preverite, ali datoteka obstaja.</string>
   <string name="share_link_password_title">Vpis gesla</string>
   <string name="share_link_empty_password">Vpisati je treba geslo.</string>
   <string name="activity_chooser_send_file_title">Pošlji</string>
   <string name="copy_link">Kopiraj povezavo</string>
   <string name="clipboard_text_copied">Kopirano v odložišče</string>
-  <string name="error_cant_bind_to_operations_service">Kritična napaka: dejanj ni možno izvesti</string>
+  <string name="error_cant_bind_to_operations_service">Kritična napaka: opravil ni možno izvesti</string>
   <string name="network_error_socket_exception">Med povezovanjem s strežnikom je prišlo do napake.</string>
   <string name="network_error_socket_timeout_exception">Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni mogoče izvesti.</string>
   <string name="network_error_connect_timeout_exception">Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni bilo mogoče končati.</string>
@@ -289,13 +289,12 @@
   <string name="forbidden_permissions_delete">za izbris datoteke.</string>
   <string name="share_link_forbidden_permissions">za omogočanje souporabe datoteke.</string>
   <string name="unshare_link_forbidden_permissions">za preklic souporabe datoteke.</string>
-  <string name="update_link_forbidden_permissions">za posodobitev te povezave za souporabo</string>
   <string name="forbidden_permissions_create">za ustvarjanje datoteke.</string>
   <string name="uploader_upload_forbidden_permissions">za pošiljanje datoteke v oblak.</string>
   <string name="downloader_download_file_not_found">Datoteka na strežniku ni več na voljo.</string>
   <string name="prefs_category_accounts">Računi</string>
   <string name="prefs_add_account">Dodaj račun</string>
-  <string name="auth_redirect_non_secure_connection_title">Varna povezava je preusmerjena preko ne-varne poti.</string>
+  <string name="auth_redirect_non_secure_connection_title">Varna povezava je preusmerjena prek nevarovane poti.</string>
   <string name="actionbar_logger">Dnevnik</string>
   <string name="log_send_history_button">Pošlji zgodovino</string>
   <string name="log_send_no_mail_app">Ni nameščenega poštnega programa za pošiljanje dnevnikov.</string>
@@ -311,7 +310,7 @@
   <string name="move_file_invalid_overwrite">Datoteka v ciljni mapi že obstaja.</string>
   <string name="move_file_error">Prišlo je do napake med premikanjem datoteke v mapo</string>
   <string name="forbidden_permissions_move">med premikanjem datoteke</string>
-  <string name="copy_file_not_found">Ne morem kopirati. Prosim, preverite ali datoteka obstaja.</string>
+  <string name="copy_file_not_found">Kopiranje ni mogoče. Preverite, ali datoteka obstaja.</string>
   <string name="copy_file_invalid_into_descendent">Ni mogoče kopirati mape v podrejeno mapo.</string>
   <string name="copy_file_invalid_overwrite">Datoteka v ciljni mapi že obstaja.</string>
   <string name="copy_file_error">Prišlo je do napake med kopiranjem datoteke v mapo</string>
@@ -319,11 +318,11 @@
   <string name="prefs_category_instant_uploading">Takojšnje pošiljanje v oblak</string>
   <string name="prefs_category_security">Varnost</string>
   <string name="prefs_instant_video_upload_path_title">Pot videa za pošiljanje</string>
-  <string name="sync_folder_failed_content">Sinhronizacija mape %1$s ne more biti zaključena</string>
+  <string name="sync_folder_failed_content">Usklajevanja mape %1$s ni mogoče zaključiti</string>
   <string name="shared_subject_header">v souporabi</string>
   <string name="with_you_subject_header">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="subject_user_shared_with_you">Uporabnik %1$s je omogočil souporabo \"%2$s\"</string>
+  <string name="subject_shared_with_you">\"%1$s\" vam je oddan v souporabo</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>
@@ -336,18 +335,31 @@
   <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="prefs_instant_behaviour_dialogTitle">Izvorna datoteka bo ...</string>
+  <string name="prefs_instant_behaviour_title">Izvorna datoteka bo ...</string>
+  <string name="upload_copy_files">Kopiraj datoteko</string>
+  <string name="upload_move_files">Premakni datoteko</string>
+  <string name="pref_behaviour_entries_keep_file">ohranjeno v izvorni mapi</string>
+  <string name="pref_behaviour_entries_move">premaknjeno v mapo programa</string>
   <string name="share_dialog_title">Souporaba</string>
-  <string name="share_with_user_section_title">Deli z uporabniki in skupinami</string>
-  <string name="share_no_users">Podatki še niso bili deljeni z uporabniki</string>
+  <string name="share_with_user_section_title">Omogoči souporabo s skupino ali z uporabnikom</string>
+  <string name="share_no_users">Ni datotek, ki bi jih omogočili za souporabo z drugimi</string>
   <string name="share_add_user_or_group">Dodaj uporabnika ali skupino</string>
   <string name="share_via_link_section_title">Povezava za souporabo</string>
   <string name="share_via_link_expiration_date_label">Nastavi datum preteka</string>
   <string name="share_via_link_password_label">Zaščiti z geslom</string>
   <string name="share_via_link_password_title">Varovano</string>
-  <string name="share_get_public_link_button">Vzami povezavo</string>
+  <string name="share_get_public_link_button">Pridobi povezavo</string>
   <string name="share_search">Poišči</string>
-  <string name="search_users_and_groups_hint">Poišči uporabniku in skupine</string>
+  <string name="search_users_and_groups_hint">Iskanje uporabnikov in skupin</string>
   <string name="share_group_clarification">%1$s (skupina)</string>
-  <string name="share_sharee_unavailable">Žal, vaš strežnik ne dovoljuje deljenja z uporabniki med strankami.
-        \nKontaktirajte skrbnika.</string>
+  <string name="share_sharee_unavailable">Različica strežnika ne omogoča souporabe predmetov z uporabniki med strankami.
+\nStopite v stik s skrbnikom sistema.</string>
+  <string name="share_privilege_can_share">lahko omogoči souporabo</string>
+  <string name="share_privilege_can_edit">lahko ureja</string>
+  <string name="share_privilege_can_edit_create">ustvari</string>
+  <string name="share_privilege_can_edit_change">spremeni</string>
+  <string name="share_privilege_can_edit_delete">izbriši</string>
+  <string name="action_switch_grid_view">Preklopi v mrežni pogled</string>
+  <string name="action_switch_list_view">Preklopi v seznamski pogled</string>
 </resources>

res/values-sq/strings.xml

@@ -159,13 +159,13 @@
   <string name="media_play_pause_description">Butoni Luaje ose Pushoje</string>
   <string name="media_forward_description">Butoni Përpara</string>
   <string name="auth_getting_authorization">Po merret autorizim…</string>
-  <string name="auth_trying_to_login">Po përpiqet të bëhet hyrja…</string>
+  <string name="auth_trying_to_login">Po provohet hyrja…</string>
   <string name="auth_no_net_conn_title">Pa lidhje rrjeti</string>
   <string name="auth_nossl_plain_ok_title">S\’ka lidhje të sigurt.</string>
   <string name="auth_connection_established">Lidhja u vendos</string>
   <string name="auth_testing_connection">Po provohet lidhja</string>
   <string name="auth_not_configured_title">Formësim i keqformuar shërbyesi</string>
-  <string name="auth_account_not_new">Ka tashmë në pajisje një llogari për të njëjtin përdorues dhe shërbyes</string>
+  <string name="auth_account_not_new">Në pajisje ka tashmë një llogari për të njëjtin përdorues dhe shërbyes</string>
   <string name="auth_account_not_the_same">Përdoruesi i dhënë s\’përputhet me përdoruesin e kësaj llogarie</string>
   <string name="auth_unknown_error_title">Ndodhi një gabim i panjohur!</string>
   <string name="auth_unknown_host_title">S\’u gjet dot strehë</string>
@@ -205,7 +205,7 @@
   <string name="rename_dialog_title">Jepni një emër të ri</string>
   <string name="rename_local_fail_msg">Kopja vendore s\’u riemërtua dot; provoni një emër tjetër</string>
   <string name="rename_server_fail_msg">Riemërtimi s\’u plotësua dot</string>
-  <string name="sync_file_fail_msg">S\’u kap dot kartela</string>
+  <string name="sync_file_fail_msg">S\’u kap dot kartela e largët</string>
   <string name="sync_file_nothing_to_do_msg">Lëndë kartele tashmë e njëkohësuar</string>
   <string name="create_dir_fail_msg">S\’u krijua dot dosja</string>
   <string name="filename_forbidden_characters">Shenja të ndaluara: / \\ &lt; &gt; : \" | ? *</string>
@@ -269,7 +269,7 @@
   <string name="unshare_link_file_no_exist">S\’arrin të zhbëjë ndarjen me të tjerët. Ju lutemi, kontrolloni nëse kartela ekziston</string>
   <string name="unshare_link_file_error">Ndodhi një gabim teksa përpiqej të zhbëhej ndarja me të tjerët e kësaj kartele apo dosjeje</string>
   <string name="update_link_file_no_exist">S’u arrit të përditësohej gjë. Ju lutemi, kontrolloni nëse ekziston apo jo kartela.</string>
-  <string name="update_link_file_error">Ndodhi një gabim teksa provohej të përditësohej lidhja e ndarë me të tjerët</string>
+  <string name="update_link_file_error">Ndodhi një gabim teksa provohej të përditësohej ndarja</string>
   <string name="share_link_password_title">Jepni një fjalëkalim</string>
   <string name="share_link_empty_password">Duhet të jepni një fjalëkalim</string>
   <string name="activity_chooser_send_file_title">Dërgoje</string>
@@ -286,7 +286,7 @@
   <string name="forbidden_permissions_delete">për fshirje të kësaj kartele</string>
   <string name="share_link_forbidden_permissions">për ndarje me të tjerët të kësaj kartele</string>
   <string name="unshare_link_forbidden_permissions">për zhbërje të ndarjes me të tjerët të kësaj kartele</string>
-  <string name="update_link_forbidden_permissions">që të përditësohet kjo lidhje e ndarë me të tjerët</string>
+  <string name="update_link_forbidden_permissions">që të përditësohet kjo ndarje</string>
   <string name="forbidden_permissions_create">për krijim kartele</string>
   <string name="uploader_upload_forbidden_permissions">për ngarkim në këtë dosje</string>
   <string name="downloader_download_file_not_found">Kartela s\’gjendet më te shërbyesi</string>
@@ -353,4 +353,13 @@
   <string name="share_group_clarification">%1$s (grup)</string>
   <string name="share_sharee_unavailable">Na ndjeni, versioni juaj i shërbyesit nuk lejon ndarje me përdorues brenda klientësh.
         \nJu lutemi, lidhuni me përgjegjësin tuaj</string>
+  <string name="share_privilege_can_share">mund të ndajë</string>
+  <string name="share_privilege_can_edit">mund të përpunojnë</string>
+  <string name="share_privilege_can_edit_create">krijoje</string>
+  <string name="share_privilege_can_edit_change">ndrysho</string>
+  <string name="share_privilege_can_edit_delete">fshi</string>
+  <string name="edit_share_unshare">Resht së ndari</string>
+  <string name="edit_share_done">u bë</string>
+  <string name="action_switch_grid_view">Kalo te pamja mozaik</string>
+  <string name="action_switch_list_view">Kalo te pamja listë</string>
 </resources>

res/values-sr-rSP/strings.xml

@@ -76,4 +76,9 @@
   <string name="share_via_link_expiration_date_label">Datum isteka</string>
   <string name="share_via_link_password_label">Zaštita lozinkom</string>
   <string name="share_search">Traži</string>
+  <string name="share_privilege_can_share">može da deli</string>
+  <string name="share_privilege_can_edit">može da menja</string>
+  <string name="share_privilege_can_edit_create">napravi</string>
+  <string name="share_privilege_can_edit_change">izmeni</string>
+  <string name="share_privilege_can_edit_delete">brisanje</string>
 </resources>

res/values-sr/strings.xml

@@ -321,4 +321,9 @@
   <string name="share_via_link_expiration_date_label">Постави датум истека</string>
   <string name="share_via_link_password_label">Заштићено лозинком</string>
   <string name="share_search">Тражи</string>
+  <string name="share_privilege_can_share">може да дели</string>
+  <string name="share_privilege_can_edit">може да мења</string>
+  <string name="share_privilege_can_edit_create">направи</string>
+  <string name="share_privilege_can_edit_change">измени</string>
+  <string name="share_privilege_can_edit_delete">обриши</string>
 </resources>

res/values-sv/strings.xml

@@ -273,7 +273,6 @@
   <string name="unshare_link_file_no_exist">Lyckades ej sluta dela. Vänligen kontrollera om filen existerar</string>
   <string name="unshare_link_file_error">Ett fel uppstod vid försök att sluta dela denna fil eller mapp</string>
   <string name="update_link_file_no_exist">Kunde inte uppdatera. Var god kolla om filen existerar.</string>
-  <string name="update_link_file_error">Ett fel uppstod medan den delade länken försökte uppdateras</string>
   <string name="share_link_password_title">Ange ett lösenord</string>
   <string name="share_link_empty_password">Du måste ange ett lösenord</string>
   <string name="activity_chooser_send_file_title">Skicka</string>
@@ -290,7 +289,6 @@
   <string name="forbidden_permissions_delete">att radera denna fil</string>
   <string name="share_link_forbidden_permissions">att dela denna fil</string>
   <string name="unshare_link_forbidden_permissions">att avbryta delningen utav denna fil</string>
-  <string name="update_link_forbidden_permissions">för att uppdatera denna delade länken</string>
   <string name="forbidden_permissions_create">att skapa filen</string>
   <string name="uploader_upload_forbidden_permissions">att ladda upp i den här mappen</string>
   <string name="downloader_download_file_not_found">Filen är inte längre tillgänglig på servern</string>
@@ -350,4 +348,9 @@
   <string name="search_users_and_groups_hint">Sök användare och grupper</string>
   <string name="share_group_clarification">%1$s (grupp)</string>
   <string name="share_sharee_unavailable">Tyvärr tillåter inte din serverversion delning med användare inom klienter. \nVar god kontakta din administrator.</string>
+  <string name="share_privilege_can_share">får dela</string>
+  <string name="share_privilege_can_edit">kan redigera</string>
+  <string name="share_privilege_can_edit_create">skapa</string>
+  <string name="share_privilege_can_edit_change">ändra</string>
+  <string name="share_privilege_can_edit_delete">radera</string>
 </resources>

res/values-ta-rLK/strings.xml

@@ -130,4 +130,7 @@
   <string name="share_via_link_expiration_date_label">காலாவதி தேதியை குறிப்பிடுக</string>
   <string name="share_via_link_password_label">கடவுச்சொல்லை பாதுகாத்தல்</string>
   <string name="share_search">தேடுதல்</string>
+  <string name="share_privilege_can_edit">தொகுக்க முடியும்</string>
+  <string name="share_privilege_can_edit_create">உருவவாக்கல்</string>
+  <string name="share_privilege_can_edit_delete">நீக்குக</string>
 </resources>

res/values-te/strings.xml

@@ -24,4 +24,5 @@
   <string name="activity_chooser_send_file_title">పంపించు</string>
   <string name="empty"></string>
   <string name="auth_host_address">సేవకి చిరునామా</string>
+  <string name="share_privilege_can_edit_delete">తొలగించు</string>
 </resources>

res/values-th-rTH/strings.xml

@@ -271,7 +271,7 @@
   <string name="unshare_link_file_no_exist">ไม่สามารถยกเลิกการแชร์ กรุณาตรวจสอบไฟล์ที่มีอยู่</string>
   <string name="unshare_link_file_error">เกิดข้อผิดพลาดในขณะที่จะยกเลิกการอชร์ไฟล์หรือโฟลเดอร์นี้</string>
   <string name="update_link_file_no_exist">ไม่สามารถอัพเดท กรุณาตรวจสอบว่ามีไฟล์นั้นอยู่จริง</string>
-  <string name="update_link_file_error">เกิดข้อผิดพลาดในขณะที่กำลังพยายามอัพเดทลิงค์ที่แชร์</string>
+  <string name="update_link_file_error">เกิดข้อผิดพลาดในขณะที่พยายามอัพเดทการแชร์</string>
   <string name="share_link_password_title">ป้อนรหัสผ่าน</string>
   <string name="share_link_empty_password">คุณจะต้องใส่รหัสผ่าน</string>
   <string name="activity_chooser_send_file_title">ส่ง</string>
@@ -288,7 +288,7 @@
   <string name="forbidden_permissions_delete">เพื่อลบไฟล์นี้</string>
   <string name="share_link_forbidden_permissions">เพื่อแชร์ไฟล์นี้</string>
   <string name="unshare_link_forbidden_permissions">เพื่อเลิกแชร์ไฟล์นี้</string>
-  <string name="update_link_forbidden_permissions">เพื่ออัพเดทลิงค์นี้ที่ถูกแชร์</string>
+  <string name="update_link_forbidden_permissions">เพื่ออัพเดทการแชร์นี้</string>
   <string name="forbidden_permissions_create">เพื่อสร้างไฟล์</string>
   <string name="uploader_upload_forbidden_permissions">เพื่ออัพโหลดในโฟลเดอร์นี้</string>
   <string name="downloader_download_file_not_found">ไฟล์ไม่พร้อมใช้งานบนเซิร์ฟเวอร์</string>
@@ -335,6 +335,12 @@
   <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="prefs_instant_behaviour_dialogTitle">ไฟล์ต้นฉบับ...</string>
+  <string name="prefs_instant_behaviour_title">ไฟล์ต้นฉบับ...</string>
+  <string name="upload_copy_files">คัดลอกไฟล์</string>
+  <string name="upload_move_files">ย้ายไฟล์</string>
+  <string name="pref_behaviour_entries_keep_file">เก็บไว้ในโฟลเดอร์ต้นฉบับ</string>
+  <string name="pref_behaviour_entries_move">ถูกย้ายไปยังโฟลเดอร์แอพพลิเคชัน</string>
   <string name="share_dialog_title">การแชร์ข้อมูล</string>
   <string name="share_with_user_section_title">แชร์กับผู้ใช้และกลุ่ม</string>
   <string name="share_no_users">ยังไม่มีข้อมูลที่แชร์กับผู้ใช้ในตอนนี้</string>
@@ -349,4 +355,13 @@
   <string name="share_group_clarification">%1$s (กลุ่ม)</string>
   <string name="share_sharee_unavailable">ขออภัย รุ่นเซิร์ฟเวอร์ของคุณไม่อนุญาตให้แชร์กับผู้ใช้ภายในไคลเอนต์
 \nกรุณาติดต่อผู้ดูแลระบบ</string>
+  <string name="share_privilege_can_share">สามารถแชร์ได้</string>
+  <string name="share_privilege_can_edit">สามารถแก้ไข</string>
+  <string name="share_privilege_can_edit_create">สร้าง</string>
+  <string name="share_privilege_can_edit_change">เปลี่ยนแปลง</string>
+  <string name="share_privilege_can_edit_delete">ลบ</string>
+  <string name="edit_share_unshare">ยกเลิกการแชร์</string>
+  <string name="edit_share_done">สำเร็จ</string>
+  <string name="action_switch_grid_view">สลับไปยังมุมมองตาราง</string>
+  <string name="action_switch_list_view">สลับไปยังมุมมองรายการ</string>
 </resources>

res/values-tr/strings.xml

@@ -71,7 +71,7 @@
   <string name="file_list_seconds_ago">saniyeler önce</string>
   <string name="file_list_empty">Burada hiçbir şey yok. Bir şeyler yükleyin!</string>
   <string name="file_list_loading">Yükleniyor...</string>
-  <string name="file_list_no_app_for_file_type">Dosya tipi için uygulama bulunamadı!</string>
+  <string name="file_list_no_app_for_file_type">Dosya türü için uygulama bulunamadı!</string>
   <string name="local_file_list_empty">Bu klasörde dosya yok.</string>
   <string name="filedetails_select_file">Ek bilgileri görmek için dosyaya dokunun.</string>
   <string name="filedetails_size">Boyut:</string>
@@ -79,7 +79,7 @@
   <string name="filedetails_created">Oluşturulma:</string>
   <string name="filedetails_modified">Değiştirilme:</string>
   <string name="filedetails_download">İndir</string>
-  <string name="filedetails_sync_file">Eşitleme</string>
+  <string name="filedetails_sync_file">Eşitle</string>
   <string name="filedetails_renamed_in_upload_msg">Dosya adı, yükleme sırasında %1$s olarak değiştirildi</string>
   <string name="list_layout">Liste Yerleşimi</string>
   <string name="action_share">Paylaş</string>
@@ -243,7 +243,7 @@
   <string name="ssl_validator_label_validity_to">Bitiş:</string>
   <string name="ssl_validator_label_signature">İmza:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
-  <string name="digest_algorithm_not_available">Özümlenen algoritma telefonunuz için mevcut değil</string>
+  <string name="digest_algorithm_not_available">Özümlenen algoritma telefonunuz için mevcut değil.</string>
   <string name="ssl_validator_label_certificate_fingerprint">Parmak izi:</string>
   <string name="certificate_load_problem">Sertifika yüklemesinde problem var.</string>
   <string name="ssl_validator_null_cert">Sertifika gösterilemedi.</string>
@@ -273,7 +273,6 @@
   <string name="unshare_link_file_no_exist">Paylaşımı kaldırma başarısız. Lütfen dosyanın mevcut olup olmadığını denetleyin</string>
   <string name="unshare_link_file_error">Bu dosya veya klasör paylaşımı kaldırılmaya çalışılırken bir hata oluştu</string>
   <string name="update_link_file_no_exist">Güncelleme yapılamıyor. Lütfen dosyanın mevcut olup olmadığını kontrol edin.</string>
-  <string name="update_link_file_error">Paylaşılan bağlantı güncellenirken hata oluştu</string>
   <string name="share_link_password_title">Bir parola girin</string>
   <string name="share_link_empty_password">Bir parola girmelisiniz</string>
   <string name="activity_chooser_send_file_title">Gönder</string>
@@ -286,11 +285,10 @@
   <string name="network_host_not_available">İşlem tamamlanamadı, sunucu kullanılamıyor</string>
   <string name="empty"></string>
   <string name="forbidden_permissions">%s izniniz yok</string>
-  <string name="forbidden_permissions_rename">Bu dosyayı adlandırma</string>
-  <string name="forbidden_permissions_delete">Bu dosyayı silme</string>
-  <string name="share_link_forbidden_permissions">Bu dosyayı paylaşma</string>
-  <string name="unshare_link_forbidden_permissions">Bu dosya paylaşımını kaldırma</string>
-  <string name="update_link_forbidden_permissions">Paylaşılan bağlantıyı güncellemek için</string>
+  <string name="forbidden_permissions_rename">Bu dosyayı adlandırmak için</string>
+  <string name="forbidden_permissions_delete">Bu dosyayı silmek için</string>
+  <string name="share_link_forbidden_permissions">Bu dosyayı paylaşmak için</string>
+  <string name="unshare_link_forbidden_permissions">Bu dosya paylaşımını kaldırmak için</string>
   <string name="forbidden_permissions_create">Dosya oluşturma</string>
   <string name="uploader_upload_forbidden_permissions">Bu klasöre yükleme</string>
   <string name="downloader_download_file_not_found">Bu dosya artık sunucuda mevcut değil</string>
@@ -337,6 +335,12 @@
   <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="prefs_instant_behaviour_dialogTitle">Özgün dosya...</string>
+  <string name="prefs_instant_behaviour_title">Özgün dosya...</string>
+  <string name="upload_copy_files">Dosyayı kopyala</string>
+  <string name="upload_move_files">Dosyayı taşı</string>
+  <string name="pref_behaviour_entries_keep_file">özgün klasöründe tutuldu</string>
+  <string name="pref_behaviour_entries_move">app klasörüne taşındı</string>
   <string name="share_dialog_title">Paylaşım</string>
   <string name="share_with_user_section_title">Kullanıcı ve Gruplarla paylaş</string>
   <string name="share_no_users">Henüz kullanıcılara paylaşılan veri yok</string>
@@ -349,6 +353,13 @@
   <string name="share_search">Ara</string>
   <string name="search_users_and_groups_hint">Kullanıcı ve Grupları Ara</string>
   <string name="share_group_clarification">%1$s (grup)</string>
-  <string name="share_sharee_unavailable">Üzgünüz sunucu versiyonunuz istemcilerdeki kullanıcılara paylaşıma izin vermiyor.
+  <string name="share_sharee_unavailable">Üzgünüz sunucu sürümünüz istemcilerdeki kullanıcılara paylaşıma izin vermiyor.
 \nLütfen yöneticinize başvurun</string>
+  <string name="share_privilege_can_share">paylaşabilir</string>
+  <string name="share_privilege_can_edit">düzenleyebilir</string>
+  <string name="share_privilege_can_edit_create">oluştur</string>
+  <string name="share_privilege_can_edit_change">değiştir</string>
+  <string name="share_privilege_can_edit_delete">sil</string>
+  <string name="action_switch_grid_view">Tablo görünümüne geç</string>
+  <string name="action_switch_list_view">Liste görünümüne geç</string>
 </resources>

res/values-ug/strings.xml

@@ -54,4 +54,5 @@
   <string name="auth_host_address">مۇلازىمېتىر ئادرىسى</string>
   <string name="share_dialog_title">ھەمبەھىر</string>
   <string name="share_search">ئىزدە</string>
+  <string name="share_privilege_can_edit_delete">ئۆچۈر</string>
 </resources>

res/values-uk/strings.xml

@@ -332,4 +332,9 @@
   <string name="share_via_link_expiration_date_label">Встановити термін дії</string>
   <string name="share_via_link_password_label">Захистити паролем</string>
   <string name="share_search">Пошук</string>
+  <string name="share_privilege_can_share">може ділитися з іншими</string>
+  <string name="share_privilege_can_edit">може редагувати</string>
+  <string name="share_privilege_can_edit_create">створити</string>
+  <string name="share_privilege_can_edit_change">змінити</string>
+  <string name="share_privilege_can_edit_delete">видалити</string>
 </resources>

res/values-ur-rPK/strings.xml

@@ -30,4 +30,7 @@
   <string name="share_via_link_expiration_date_label">تاریخ معیاد سیٹ کریں</string>
   <string name="share_via_link_password_label">محفوظ پاسورڈ</string>
   <string name="share_search">تلاش</string>
+  <string name="share_privilege_can_edit">تبدیل کر سکے ھیں</string>
+  <string name="share_privilege_can_edit_create">نیا بنائیں</string>
+  <string name="share_privilege_can_edit_delete">ختم کریں</string>
 </resources>

res/values-vi/strings.xml

@@ -210,4 +210,8 @@
   <string name="share_via_link_expiration_date_label">Đặt ngày kết thúc</string>
   <string name="share_via_link_password_label">Mật khẩu bảo vệ</string>
   <string name="share_search">Tìm kiếm</string>
+  <string name="share_privilege_can_share">có thể chia sẽ</string>
+  <string name="share_privilege_can_edit">có thể chỉnh sửa</string>
+  <string name="share_privilege_can_edit_create">tạo</string>
+  <string name="share_privilege_can_edit_delete">xóa</string>
 </resources>

res/values-zh-rCN/strings.xml

@@ -332,4 +332,9 @@
   <string name="share_via_link_expiration_date_label">设置过期日期</string>
   <string name="share_via_link_password_label">密码保护</string>
   <string name="share_search">搜索</string>
+  <string name="share_privilege_can_share">可共享</string>
+  <string name="share_privilege_can_edit">可编辑</string>
+  <string name="share_privilege_can_edit_create">创建</string>
+  <string name="share_privilege_can_edit_change">更改</string>
+  <string name="share_privilege_can_edit_delete">删除</string>
 </resources>

res/values-zh-rHK/strings.xml

@@ -81,4 +81,6 @@
   <string name="share_via_link_expiration_date_label">設定分享期限</string>
   <string name="share_via_link_password_label">密碼保護</string>
   <string name="share_search">尋找</string>
+  <string name="share_privilege_can_edit_create">新增</string>
+  <string name="share_privilege_can_edit_delete">刪除</string>
 </resources>

res/values-zh-rTW/strings.xml

@@ -78,12 +78,14 @@
   <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">分享</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">好</string>
+  <string name="common_cancel_sync">取消同步</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">儲存並離開</string>
   <string name="common_error">錯誤</string>
@@ -240,6 +242,7 @@
   <string name="ssl_validator_label_validity_to">至：</string>
   <string name="ssl_validator_label_signature">簽名：</string>
   <string name="ssl_validator_label_signature_algorithm">演算法:</string>
+  <string name="ssl_validator_label_certificate_fingerprint">指紋:</string>
   <string name="ssl_validator_null_cert">這個憑證無法被顯示</string>
   <string name="ssl_validator_no_info_about_error">- 沒有關於這個錯誤的說明</string>
   <string name="placeholder_sentence">這是佔位的資訊</string>
@@ -329,4 +332,9 @@
   <string name="share_via_link_expiration_date_label">指定到期日</string>
   <string name="share_via_link_password_label">密碼保護</string>
   <string name="share_search">搜尋</string>
+  <string name="share_privilege_can_share">可分享</string>
+  <string name="share_privilege_can_edit">可編輯</string>
+  <string name="share_privilege_can_edit_create">建立</string>
+  <string name="share_privilege_can_edit_change">更動</string>
+  <string name="share_privilege_can_edit_delete">刪除</string>
 </resources>

res/values/dims.xml

@@ -25,7 +25,9 @@
     <dimen name="file_icon_size">32dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
+    <dimen name="standard_half_padding">8dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
+    <dimen name="standard_half_margin">8dp</dimen>
 
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">14sp</dimen>

res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="about_android">%1$s Android App</string>
+    <string name="about_android">%1$s Android app</string>
     <string name="about_version">version %1$s</string>
     <string name="actionbar_sync">Refresh account</string>
     <string name="actionbar_upload">Upload</string>
@@ -32,17 +32,17 @@
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
-    <string name="prefs_manage_accounts">Manage Accounts</string>
+    <string name="prefs_manage_accounts">Manage accounts</string>
     <string name="prefs_passcode">Passcode lock</string>
     <string name="prefs_instant_upload">Instant picture uploads</string>
     <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
     <string name="prefs_instant_video_upload">Instant video uploads</string>
     <string name="prefs_instant_video_upload_summary">Instantly upload videos recorded by camera</string>
-    <string name="prefs_log_title">Enable Logging</string>
+    <string name="prefs_log_title">Enable logging</string>
     <string name="prefs_log_summary">This is used to log problems</string>
-    <string name="prefs_log_title_history">Logging History</string>
+    <string name="prefs_log_title_history">Logging history</string>
     <string name="prefs_log_summary_history">This shows the recorded logs</string>
-    <string name="prefs_log_delete_history_button">Delete History</string>
+    <string name="prefs_log_delete_history_button">Delete history</string>
     <string name="prefs_help">Help</string>
     <string name="prefs_recommend">Recommend to a friend</string>
     <string name="prefs_feedback">Feedback</string>
@@ -53,7 +53,7 @@
 	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
 	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>
 
-    <string name="auth_check_server">Check Server</string>
+    <string name="auth_check_server">Check server</string>
     <string name="auth_host_url">Server address https://…</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
@@ -64,7 +64,7 @@
     <string name="uploader_btn_new_folder_text">New folder</string>
     <string name="uploader_top_message">Choose upload folder:</string>
     <string name="uploader_wrn_no_account_title">No account found</string>
-    <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
+    <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please set up an account first.</string>
     <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
     <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
     <string name="uploader_wrn_no_content_title">No content to upload</string>
@@ -74,7 +74,7 @@
     <string name="file_list_seconds_ago">seconds ago</string>
     <string name="file_list_empty">Nothing in here. Upload something!</string>
     <string name="file_list_loading">Loading&#8230;</string>
-    <string name="file_list_no_app_for_file_type">No App found for file type!</string>
+    <string name="file_list_no_app_for_file_type">No app found for file type!</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_size">Size:</string>
@@ -84,14 +84,14 @@
     <string name="filedetails_download">Download</string>
     <string name="filedetails_sync_file">Synchronize</string>
     <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
-    <string name="list_layout">List Layout</string>
+    <string name="list_layout">List layout</string>
     <string name="action_share">Share</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
-    <string name="common_cancel_sync">Cancel synchronization</string>
+    <string name="common_cancel_sync">Cancel sync</string>
     <string name="common_cancel">Cancel</string>
-    <string name="common_save_exit">Save &amp; Exit</string>
+    <string name="common_save_exit">Save &amp; exit</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Loading &#8230;</string>
     <string name="common_error_unknown">Unknown error</string>
@@ -104,22 +104,22 @@
     <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
     <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
-    <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
+    <string name="uploader_upload_succeeded_content_single">%1$s uploaded</string>
     <string name="uploader_upload_failed_ticker">Upload failed</string>
     <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
-    <string name="uploader_upload_failed_credentials_error">Upload failed, you need to relogin</string>
+    <string name="uploader_upload_failed_credentials_error">Upload failed, you need to log in again</string>
     <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
     <string name="downloader_download_succeeded_ticker">Download succeeded</string>
-    <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
+    <string name="downloader_download_succeeded_content">%1$s downloaded</string>
     <string name="downloader_download_failed_ticker">Download failed</string>
     <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
     <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
-    <string name="downloader_download_failed_credentials_error">Download failed, you need to relogin</string>
+    <string name="downloader_download_failed_credentials_error">Download failed, you need to log in again</string>
     <string name="common_choose_account">Choose account</string>
-    <string name="sync_fail_ticker">Synchronization failed</string>
-    <string name="sync_fail_ticker_unauthorized">Synchronization failed, you need to relogin</string>
-    <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
+    <string name="sync_fail_ticker">Sync failed</string>
+    <string name="sync_fail_ticker_unauthorized">Sync failed, you need to log in again</string>
+    <string name="sync_fail_content">Sync of %1$s could not be completed</string>
     <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
     <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
@@ -134,12 +134,12 @@
     <string name="foreign_files_fail">"Some files could not be moved"</string>
     <string name="foreign_files_local_text">"Local: %1$s"</string>
     <string name="foreign_files_remote_text">"Remote: %1$s"</string>
-    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
-    <string name="pass_code_enter_pass_code">Please, insert your passcode</string>
+    <string name="upload_query_move_foreign_files">There is not enough space to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
+    <string name="pass_code_enter_pass_code">Please insert your passcode</string>
     
     <string name="pass_code_configure_your_pass_code">Enter your passcode</string>
     <string name="pass_code_configure_your_pass_code_explanation">The passcode will be requested every time the app is started</string>
-    <string name="pass_code_reenter_your_pass_code">Please, reenter your passcode</string>
+    <string name="pass_code_reenter_your_pass_code">Please reenter your passcode</string>
     <string name="pass_code_remove_your_pass_code">Remove your passcode</string>
     <string name="pass_code_mismatch">The passcodes are not the same</string>
     <string name="pass_code_wrong">Incorrect passcode</string>
@@ -166,8 +166,8 @@
     <string name="media_play_pause_description">Play or pause button</string>
     <string name="media_forward_description">Fast forward button</string>
 
-	<string name="auth_getting_authorization">Getting authorization&#8230;</string>
-	<string name="auth_trying_to_login">Trying to login&#8230;</string>
+	<string name="auth_getting_authorization">Getting authorization &#8230;</string>
+	<string name="auth_trying_to_login">Trying to log in &#8230;</string>
 	<string name="auth_no_net_conn_title">No network connection</string>
 	<string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
 	<string name="auth_connection_established">Connection established</string>
@@ -179,7 +179,7 @@
 	<string name="auth_unknown_host_title">Couldn\'t find host</string>
 	<string name="auth_incorrect_path_title">Server instance not found</string>
 	<string name="auth_timeout_title">The server took too long to respond</string>
-	<string name="auth_incorrect_address_title">Malformed URL</string>
+	<string name="auth_incorrect_address_title">Wrong server address format</string>
 	<string name="auth_ssl_general_error_title">SSL initialization failed</string>
 	<string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</string>
 	<string name="auth_bad_oc_version_title">Unrecognized server version</string>
@@ -188,16 +188,16 @@
 	<string name="auth_unauthorized">Wrong username or password</string>
 	<string name="auth_oauth_error">Unsuccessful authorization</string>
 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
-	<string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+	<string name="auth_wtf_reenter_URL">Unexpected state; please enter the server address again</string>
 	<string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
-	<string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
+	<string name="auth_expired_basic_auth_toast">Please enter the current password</string>
 	<string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
-	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
+	<string name="auth_connecting_auth_server">Connecting to authentication server …</string>
 	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>
 	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
 	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator
 	</string>
-	<string name="auth_can_not_auth_against_server">Cannot authenticate against this server</string>
+	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
     
     <string name="favorite">Favorite</string>
@@ -265,8 +265,8 @@
     <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_video_upload_on_wifi">Upload videos via wifi 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>
@@ -278,7 +278,7 @@
     <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>
@@ -287,7 +287,7 @@
 	<string name="unshare_link_file_no_exist">Unable to unshare. Please check whether the file exists</string>
 	<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
     <string name="update_link_file_no_exist">Unable to update. Please check whether the file exists </string>
-    <string name="update_link_file_error">An error occurred while trying to update the shared link</string>
+    <string name="update_link_file_error">An error occurred while trying to update the share</string>
     <string name="share_link_password_title">Enter a password</string>
     <string name="share_link_empty_password">You must enter a password</string>
 
@@ -309,7 +309,7 @@
     <string name="forbidden_permissions_delete">to delete this file</string>
     <string name="share_link_forbidden_permissions">to share this file</string>
     <string name="unshare_link_forbidden_permissions">to unshare this file</string>
-    <string name="update_link_forbidden_permissions">to update this shared link</string>
+    <string name="update_link_forbidden_permissions">to update this share</string>
     <string name="forbidden_permissions_create">to create the file</string>
     <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
     <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
@@ -319,10 +319,10 @@
     <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 
 	<string name="actionbar_logger">Logs</string>
-	<string name="log_send_history_button">Send History</string>
-	<string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
+	<string name="log_send_history_button">Send history</string>
+	<string name="log_send_no_mail_app">No app for sending logs found. Please install a mail app.</string>
 	<string name="log_send_mail_subject">%1$s Android app logs</string>
-	<string name="log_progress_dialog_text">Loading data&#8230;</string>
+	<string name="log_progress_dialog_text">Loading data &#8230;</string>
 
 	<string name="saml_authentication_required_text">Authentication required</string>
 	<string name="saml_authentication_wrong_pass">Wrong password</string>
@@ -343,10 +343,10 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
-    <string name="prefs_category_instant_uploading">Instant Uploads</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="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>
@@ -380,7 +380,7 @@
     <string name="share_dialog_title">Sharing</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_add_user_or_group">Add user or group</string>
     <string name="share_via_link_section_title">Share link</string>
     <string name="share_via_link_expiration_date_label">Set expiration date</string>
     <string name="share_via_link_password_label">Password protect</string>
@@ -394,5 +394,14 @@
 
     <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
         \nPlease contact your administrator</string>
+    <string name="share_privilege_can_share">can share</string>
+    <string name="share_privilege_can_edit">can edit</string>
+    <string name="share_privilege_can_edit_create">create</string>
+    <string name="share_privilege_can_edit_change">change</string>
+    <string name="share_privilege_can_edit_delete">delete</string>
+    <string name="edit_share_unshare">Stop sharing</string>
+    <string name="edit_share_done">done</string>
 
+    <string name="action_switch_grid_view">Grid view</string>
+    <string name="action_switch_list_view">List view</string>
 </resources>

src/com/owncloud/android/authentication/PassCodeManager.java

@@ -74,7 +74,7 @@ public class PassCodeManager {
                 ){
 
             Intent i = new Intent(MainApp.getAppContext(), PassCodeActivity.class);
-            i.setAction(PassCodeActivity.ACTION_REQUEST);
+            i.setAction(PassCodeActivity.ACTION_CHECK);
             i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             activity.startActivity(i);
 

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

@@ -100,7 +100,7 @@ public class FileDataStorageManager {
 
 
     public OCFile getFileByPath(String path) {
-        Cursor c = getCursorForValue(ProviderTableMeta.FILE_PATH, path);
+        Cursor c = getFileCursorForValue(ProviderTableMeta.FILE_PATH, path);
         OCFile file = null;
         if (c.moveToFirst()) {
             file = createFileInstance(c);
@@ -114,7 +114,7 @@ public class FileDataStorageManager {
 
 
     public OCFile getFileById(long id) {
-        Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
+        Cursor c = getFileCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
         OCFile file = null;
         if (c.moveToFirst()) {
             file = createFileInstance(c);
@@ -124,7 +124,7 @@ public class FileDataStorageManager {
     }
 
     public OCFile getFileByLocalPath(String path) {
-        Cursor c = getCursorForValue(ProviderTableMeta.FILE_STORAGE_PATH, path);
+        Cursor c = getFileCursorForValue(ProviderTableMeta.FILE_STORAGE_PATH, path);
         OCFile file = null;
         if (c.moveToFirst()) {
             file = createFileInstance(c);
@@ -831,7 +831,7 @@ public class FileDataStorageManager {
         return retval;
     }
 
-    private Cursor getCursorForValue(String key, String value) {
+    private Cursor getFileCursorForValue(String key, String value) {
         Cursor c = null;
         if (getContentResolver() != null) {
             c = getContentResolver()
@@ -936,7 +936,7 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, share.getRemoteId());
         cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, mAccount.name);
 
-        if (shareExists(share.getRemoteId())) {// for renamed files; no more delete and create
+        if (shareExistsForRemoteId(share.getRemoteId())) {// for renamed files; no more delete and create
             overriden = true;
             if (getContentResolver() != null) {
                 getContentResolver().update(ProviderTableMeta.CONTENT_URI_SHARE, cv,
@@ -978,6 +978,95 @@ public class FileDataStorageManager {
         return overriden;
     }
 
+    /**
+     * Retrieves an stored {@link OCShare} given its id.
+     *
+     * @param id    Identifier.
+     * @return      Stored {@link OCShare} given its id.
+     */
+    public OCShare getShareById(long id) {
+        OCShare share = null;
+        Cursor c = getShareCursorForValue(
+                ProviderTableMeta._ID,
+                String.valueOf(id)
+        );
+        if (c != null) {
+            if (c.moveToFirst()) {
+                share = createShareInstance(c);
+            }
+            c.close();
+        }
+        return share;
+    }
+
+
+    /**
+     * Checks the existance of an stored {@link OCShare} matching the given remote id (not to be confused with
+     * the local id) in the current account.
+     *
+     * @param remoteId      Remote of the share in the server.
+     * @return              'True' if a matching {@link OCShare} is stored in the current account.
+     */
+    private boolean shareExistsForRemoteId(long remoteId) {
+        return shareExistsForValue(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, String.valueOf(remoteId));
+    }
+
+
+    /**
+     * Checks the existance of an stored {@link OCShare} in the current account
+     * matching a given column and a value for that column
+     *
+     * @param key           Name of the column to match.
+     * @param value         Value of the column to match.
+     * @return              'True' if a matching {@link OCShare} is stored in the current account.
+     */
+    private boolean shareExistsForValue(String key, String value) {
+        Cursor c = getShareCursorForValue(key, value);
+        boolean retval = c.moveToFirst();
+        c.close();
+        return retval;
+    }
+
+
+    /**
+     * Gets a {@link Cursor} for an stored {@link OCShare} in the current account
+     * matching a given column and a value for that column
+     *
+     * @param key           Name of the column to match.
+     * @param value         Value of the column to match.
+     * @return              'True' if a matching {@link OCShare} is stored in the current account.
+     */
+    private Cursor getShareCursorForValue(String key, String value) {
+        Cursor c;
+        if (getContentResolver() != null) {
+            c = getContentResolver()
+                    .query(ProviderTableMeta.CONTENT_URI_SHARE,
+                            null,
+                            key + "=? AND "
+                                + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?",
+                            new String[]{value, mAccount.name},
+                            null
+                    );
+        } else {
+            try {
+                c = getContentProviderClient().query(
+                        ProviderTableMeta.CONTENT_URI_SHARE,
+                        null,
+                        key + "=? AND "
+                                + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?",
+                        new String[]{value, mAccount.name},
+                        null
+                );
+            } catch (RemoteException e) {
+                Log_OC.w(TAG,
+                        "Could not get details, assuming share does not exist: "+ e.getMessage());
+                c = null;
+            }
+        }
+        return c;
+    }
+
+
 
     /**
      * Get first share bound to a file with a known path and given {@link ShareType}.
@@ -1074,40 +1163,6 @@ public class FileDataStorageManager {
         return share;
     }
 
-    private boolean shareExists(String cmp_key, String value) {
-        Cursor c;
-        if (getContentResolver() != null) {
-            c = getContentResolver()
-                    .query(ProviderTableMeta.CONTENT_URI_SHARE,
-                            null,
-                            cmp_key + "=? AND "
-                                    + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER
-                                    + "=?",
-                            new String[]{value, mAccount.name}, null);
-        } else {
-            try {
-                c = getContentProviderClient().query(
-                        ProviderTableMeta.CONTENT_URI_SHARE,
-                        null,
-                        cmp_key + "=? AND "
-                                + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?",
-                        new String[]{value, mAccount.name}, null);
-            } catch (RemoteException e) {
-                Log_OC.e(TAG,
-                        "Couldn't determine file existance, assuming non existance: "
-                                + e.getMessage());
-                return false;
-            }
-        }
-        boolean retval = c.moveToFirst();
-        c.close();
-        return retval;
-    }
-
-    private boolean shareExists(long remoteId) {
-        return shareExists(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, String.valueOf(remoteId));
-    }
-
     private void resetShareFlagsInAllFiles() {
         ContentValues cv = new ContentValues();
         cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, false);
@@ -1217,7 +1272,7 @@ public class FileDataStorageManager {
                 cv.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, share.getRemoteId());
                 cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, mAccount.name);
 
-                if (shareExists(share.getRemoteId())) {
+                if (shareExistsForRemoteId(share.getRemoteId())) {
                     // updating an existing file
                     operations.add(
                             ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI_SHARE).

src/com/owncloud/android/files/FileOperationsHelper.java

@@ -39,6 +39,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.services.OperationsService;
@@ -227,8 +228,9 @@ public class FileOperationsHelper {
      * @param file          The file to share.
      * @param shareeName    Name (user name or group name) of the target sharee.
      * @param shareType     The share type determines the sharee type.
+     * @param permissions   Permissions to grant to sharee on the shared file.
      */
-    public void shareFileWithSharee(OCFile file, String shareeName, ShareType shareType) {
+    public void shareFileWithSharee(OCFile file, String shareeName, ShareType shareType, int permissions) {
         if (file != null) {
             // TODO check capability?
             mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
@@ -240,6 +242,7 @@ public class FileOperationsHelper {
             service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             service.putExtra(OperationsService.EXTRA_SHARE_WITH, shareeName);
             service.putExtra(OperationsService.EXTRA_SHARE_TYPE, shareType);
+            service.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, permissions);
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
         } else {
@@ -387,6 +390,26 @@ public class FileOperationsHelper {
     }
 
 
+    /**
+     * Updates a share on a file to set its access permissions.
+     * Starts a request to do it in {@link OperationsService}
+     *
+     * @param share                     {@link OCShare} instance which permissions will be updated.
+     * @param permissions               New permissions to set. A value <= 0 makes no update.
+     */
+    public void setPermissionsToShare(OCShare share, int permissions) {
+        Intent updateShareIntent = new Intent(mFileActivity, OperationsService.class);
+        updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
+        updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());
+        updateShareIntent.putExtra(
+                OperationsService.EXTRA_SHARE_PERMISSIONS,
+                permissions
+        );
+        queueShareIntent(updateShareIntent);
+    }
+
+
     /**
      * @return 'True' if the server supports the Search Users API
      */

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

@@ -26,12 +26,16 @@ package com.owncloud.android.operations;
  */
 
 
+import android.accounts.Account;
+
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation;
+import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.operations.common.SyncOperation;
@@ -43,6 +47,7 @@ public class CreateShareWithShareeOperation extends SyncOperation {
     private String mPath;
     private String mShareeName;
     private ShareType mShareType;
+    private int mPermissions;
 
     /**
      * Constructor.
@@ -51,25 +56,21 @@ public class CreateShareWithShareeOperation extends SyncOperation {
      * @param shareeName    User or group name of the target sharee.
      * @param shareType     Type of share determines type of sharee; {@link ShareType#USER} and {@link ShareType#GROUP}
      *                      are the only valid values for the moment.
+     * @param permissions   Share permissions key as detailed in
+     *                      https://doc.owncloud.org/server/8.2/developer_manual/core/ocs-share-api.html .
      */
-    public CreateShareWithShareeOperation(String path, String shareeName, ShareType shareType) {
+    public CreateShareWithShareeOperation(String path, String shareeName, ShareType shareType, int permissions) {
         if (!ShareType.USER.equals(shareType) && !ShareType.GROUP.equals(shareType)) {
             throw new IllegalArgumentException("Illegal share type " + shareType);
         }
         mPath = path;
         mShareeName = shareeName;
         mShareType = shareType;
+        mPermissions = permissions;
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        // Check if the share link already exists
-        // TODO or not
-        /*
-        RemoteOperation operation = new GetRemoteSharesForFileOperation(mPath, false, false);
-        RemoteOperationResult result = operation.execute(client);
-        if (!result.isSuccess() || result.getData().size() <= 0) {
-        */
 
         CreateRemoteShareOperation operation = new CreateRemoteShareOperation(
                 mPath,
@@ -77,7 +78,7 @@ public class CreateShareWithShareeOperation extends SyncOperation {
                 mShareeName,
                 false,
                 "",
-                OCShare.DEFAULT_PERMISSION
+                mPermissions
         );
         operation.setGetShareDetails(true);
         RemoteOperationResult result = operation.execute(client);