Bladeren bron

Merge branch 'master' into reliable_uploads_actions_uploads_view

Conflicts FIXED in res/values/styles.xml (trivial)
David A. Velasco 9 jaren geleden
bovenliggende
commit
f6ea9b597a
80 gewijzigde bestanden met toevoegingen van 784 en 273 verwijderingen
  1. 1 1
      AndroidManifest.xml
  2. BIN
      res/drawable-hdpi/ic_close.png
  3. BIN
      res/drawable-hdpi/ic_group.png
  4. BIN
      res/drawable-hdpi/ic_search.png
  5. BIN
      res/drawable-hdpi/ic_user.png
  6. BIN
      res/drawable-mdpi/ic_close.png
  7. BIN
      res/drawable-mdpi/ic_group.png
  8. BIN
      res/drawable-mdpi/ic_search.png
  9. BIN
      res/drawable-mdpi/ic_user.png
  10. BIN
      res/drawable-xhdpi/ic_close.png
  11. BIN
      res/drawable-xhdpi/ic_group.png
  12. BIN
      res/drawable-xhdpi/ic_search.png
  13. BIN
      res/drawable-xhdpi/ic_user.png
  14. BIN
      res/drawable-xxhdpi/ic_close.png
  15. BIN
      res/drawable-xxhdpi/ic_group.png
  16. BIN
      res/drawable-xxhdpi/ic_search.png
  17. BIN
      res/drawable-xxhdpi/ic_user.png
  18. 33 11
      res/layout/edit_share_layout.xml
  19. 2 1
      res/layout/password_dialog.xml
  20. 17 4
      res/layout/search_users_groups_layout.xml
  21. 205 196
      res/layout/share_file_layout.xml
  22. 21 15
      res/layout/share_user_item.xml
  23. 1 0
      res/values-ar/strings.xml
  24. 1 0
      res/values-bg-rBG/strings.xml
  25. 1 0
      res/values-bs/strings.xml
  26. 1 0
      res/values-ca/strings.xml
  27. 6 0
      res/values-cs-rCZ/strings.xml
  28. 4 0
      res/values-da/strings.xml
  29. 7 1
      res/values-de-rDE/strings.xml
  30. 4 0
      res/values-de/strings.xml
  31. 43 0
      res/values-el/strings.xml
  32. 1 0
      res/values-en-rGB/strings.xml
  33. 1 0
      res/values-eo/strings.xml
  34. 1 0
      res/values-es/strings.xml
  35. 1 0
      res/values-et-rEE/strings.xml
  36. 1 0
      res/values-eu/strings.xml
  37. 1 0
      res/values-fa/strings.xml
  38. 3 0
      res/values-fi-rFI/strings.xml
  39. 4 0
      res/values-fr/strings.xml
  40. 1 0
      res/values-gl/strings.xml
  41. 4 0
      res/values-he/strings.xml
  42. 1 0
      res/values-hr/strings.xml
  43. 1 0
      res/values-hu-rHU/strings.xml
  44. 1 0
      res/values-hy/strings.xml
  45. 1 0
      res/values-id/strings.xml
  46. 248 0
      res/values-is/strings.xml
  47. 4 0
      res/values-it/strings.xml
  48. 1 0
      res/values-ja-rJP/strings.xml
  49. 1 0
      res/values-kn/strings.xml
  50. 1 0
      res/values-ko/strings.xml
  51. 1 0
      res/values-lt-rLT/strings.xml
  52. 1 0
      res/values-mk/strings.xml
  53. 1 0
      res/values-nb-rNO/strings.xml
  54. 4 0
      res/values-nl/strings.xml
  55. 1 0
      res/values-oc/strings.xml
  56. 1 0
      res/values-pl/strings.xml
  57. 4 0
      res/values-pt-rBR/strings.xml
  58. 5 1
      res/values-pt-rPT/strings.xml
  59. 1 0
      res/values-ro/strings.xml
  60. 6 0
      res/values-ru/strings.xml
  61. 1 0
      res/values-sk-rSK/strings.xml
  62. 4 0
      res/values-sl/strings.xml
  63. 4 0
      res/values-sq/strings.xml
  64. 1 0
      res/values-sr-rSP/strings.xml
  65. 1 0
      res/values-sr/strings.xml
  66. 1 0
      res/values-sv/strings.xml
  67. 1 0
      res/values-th-rTH/strings.xml
  68. 1 0
      res/values-tr/strings.xml
  69. 1 0
      res/values-uk/strings.xml
  70. 1 0
      res/values-zh-rCN/strings.xml
  71. 36 0
      res/values-zh-rTW/strings.xml
  72. 3 0
      res/values/strings.xml
  73. 23 0
      res/values/styles.xml
  74. 7 1
      src/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java
  75. 2 2
      src/com/owncloud/android/ui/activity/Uploader.java
  76. 5 0
      src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
  77. 2 1
      src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
  78. 15 11
      src/com/owncloud/android/ui/fragment/EditShareFragment.java
  79. 2 2
      src/com/owncloud/android/ui/fragment/SearchShareesFragment.java
  80. 24 26
      src/com/owncloud/android/ui/fragment/ShareFileFragment.java

+ 1 - 1
AndroidManifest.xml

@@ -216,7 +216,7 @@
         <activity
             android:name=".ui.activity.ShareActivity"
             android:label="@string/share_dialog_title"
-            android:theme="@style/Theme.ownCloud.Dialog"
+            android:theme="@style/Theme.ownCloud.Dialog.NoTitle"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize" >
             <intent-filter>

BIN
res/drawable-hdpi/ic_close.png


BIN
res/drawable-hdpi/ic_group.png


BIN
res/drawable-hdpi/ic_search.png


BIN
res/drawable-hdpi/ic_user.png


BIN
res/drawable-mdpi/ic_close.png


BIN
res/drawable-mdpi/ic_group.png


BIN
res/drawable-mdpi/ic_search.png


BIN
res/drawable-mdpi/ic_user.png


BIN
res/drawable-xhdpi/ic_close.png


BIN
res/drawable-xhdpi/ic_group.png


BIN
res/drawable-xhdpi/ic_search.png


BIN
res/drawable-xhdpi/ic_user.png


BIN
res/drawable-xxhdpi/ic_close.png


BIN
res/drawable-xxhdpi/ic_group.png


BIN
res/drawable-xxhdpi/ic_search.png


BIN
res/drawable-xxhdpi/ic_user.png


+ 33 - 11
res/layout/edit_share_layout.xml

@@ -27,18 +27,41 @@
     <LinearLayout android:orientation="vertical"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/editShareTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/share_with_edit_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:padding="@dimen/standard_padding"
+            android:singleLine="true"
+            android:ellipsize="middle"
+            />
+
+        <View
+            android:id="@+id/share_header_divider"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@color/owncloud_blue"
+            />
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin">
 
-        <Switch
+        <android.support.v7.widget.SwitchCompat
             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"
+            android:textColor="@color/color_accent"
+            android:paddingLeft="0dp"
+            style="?android:attr/listSeparatorTextViewStyle"
             />
 
         <CheckBox
@@ -65,19 +88,18 @@
             android:visibility="gone"
             />
 
-        <Switch
+        <android.support.v7.widget.SwitchCompat
             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"
+            android:textColor="@color/color_accent"
+            android:paddingLeft="0dp"
+            style="?android:attr/listSeparatorTextViewStyle"
             />
-
+    </LinearLayout>
     </LinearLayout>
 
 </ScrollView>

+ 2 - 1
res/layout/password_dialog.xml

@@ -27,7 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-		android:inputType="textPassword">
+		android:inputType="textPassword"
+        android:layout_margin="@dimen/standard_margin">
     </EditText>
 
 </LinearLayout>

+ 17 - 4
res/layout/search_users_groups_layout.xml

@@ -21,18 +21,31 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:id="@+id/search_layout"
-    android:minWidth="200dp">
+    android:minWidth="200dp"
+    android:layout_marginRight="@dimen/standard_margin"
+    android:layout_marginBottom="20dp">
 
-    <SearchView
+    <TextView
+        android:id="@+id/searchUserGroupsTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/share_with_title"
+        android:textAppearance="@style/TextAppearance.AppCompat.Title"
+        android:padding="@dimen/standard_padding"/>
+
+    <android.support.v7.widget.SearchView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/searchView"
-        android:hint="@string/share_search"/>
+        android:hint="@string/share_search"
+        style="@style/ownCloud.SearchView"/>
 
     <ListView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/searchUsersListView"
-        android:scrollbars="vertical"/>
+        android:scrollbars="vertical"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="@dimen/standard_half_margin"/>
 
 </LinearLayout>

+ 205 - 196
res/layout/share_file_layout.xml

@@ -15,17 +15,17 @@
   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.ShareFileFragment"
-            android:id="@+id/shareScroll">
+<ScrollView
+    android:id="@+id/shareScroll"
+    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.ShareFileFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background_material_light"
         android:orientation="vertical"
         >
 
@@ -33,245 +33,254 @@
             android:id="@+id/shareHeaderContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:background="@color/background_color">
+            android:padding="@dimen/standard_padding">
 
             <ImageView
                 android:id="@+id/shareFileIcon"
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
-                android:src="@drawable/file"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="12dp"/>
+                android:layout_marginRight="@dimen/standard_half_margin"
+                android:src="@drawable/file"/>
 
             <TextView
                 android:id="@+id/shareFileName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/placeholder_filename"
-                android:textSize="16sp"
-                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/standard_half_margin"
                 android:layout_marginLeft="4dp"
+                android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_marginStart="4dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toRightOf="@+id/shareFileIcon"
                 android:layout_toEndOf="@+id/shareFileIcon"
-                android:singleLine="true"
+                android:layout_toRightOf="@+id/shareFileIcon"
                 android:ellipsize="middle"
-                android:layout_marginTop="12dp"/>
+                android:singleLine="true"
+                android:text="@string/placeholder_filename"
+                android:textColor="@color/black"
+                android:textSize="16sp"/>
 
             <TextView
+                android:id="@+id/shareFileSize"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="12sp"
-                android:text="@string/placeholder_filesize"
-                android:id="@+id/shareFileSize"
                 android:layout_below="@+id/shareFileName"
-                android:layout_toRightOf="@+id/shareFileIcon"
-                android:layout_toEndOf="@+id/shareFileIcon"
-                android:layout_marginTop="4dp"
+                android:layout_gravity="center_vertical"
                 android:layout_marginLeft="4dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginBottom="12dp"
-                android:layout_gravity="center_vertical"/>
+                android:layout_toEndOf="@+id/shareFileIcon"
+                android:layout_toRightOf="@+id/shareFileIcon"
+                android:text="@string/placeholder_filesize"
+                android:textSize="12sp"/>
 
         </RelativeLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:text="@string/share_with_user_section_title"
-            android:id="@+id/shareWithUsersSectionTitle"
-            android:layout_gravity="start"
-            android:padding="8dp"
-            android:background="@color/actionbar_start_color"
-            android:textColor="@color/white"/>
-
-        <ListView
+        <View
+            android:id="@+id/share_header_divider"
             android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:id="@+id/shareUsersList"
-            android:visibility="gone"
-            android:scrollbars="vertical"
-            android:layout_weight="1"/>
+            android:layout_height="2dp"
+            android:background="@color/owncloud_blue"
+            />
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/shareNoUsers"
-            android:text="@string/share_no_users"
-            android:textSize="12sp"
-            android:padding="12dp" />
-
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/addUserButton"
-            style="@style/ownCloud.Button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:theme="@style/Button.Primary"
-            android:text="@string/share_add_user_or_group"
-            android:contentDescription="shareAddUserButton"/>
+            android:orientation="vertical"
+            android:padding="@dimen/standard_padding">
 
-        <Switch
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:text="@string/share_via_link_section_title"
-            android:id="@+id/shareViaLinkSectionSwitch"
-            android:layout_gravity="start"
-            android:padding="8dp"
-            android:background="@color/actionbar_start_color"
-            android:textColor="@color/white"/>
+            <TextView
+                android:id="@+id/shareWithUsersSectionTitle"
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:text="@string/share_with_user_section_title"
+                android:textColor="@color/color_accent"/>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/shareViaLinkExpirationSection"
-            >
+            <ListView
+                android:id="@+id/shareUsersList"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:paddingLeft="@dimen/standard_half_padding"
+                android:scrollbars="vertical"
+                android:visibility="gone"/>
 
-            <Switch
-                android:id="@+id/shareViaLinkExpirationSwitch"
-                android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/shareNoUsers"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerInParent="true"
-                android:padding="8dp"
-                />
+                android:padding="@dimen/standard_half_padding"
+                android:text="@string/share_no_users"
+                android:textSize="12sp"/>
 
-            <TextView
-                android:id="@+id/shareViaLinkExpirationLabel"
-                android:layout_width="wrap_content"
+            <android.support.v7.widget.AppCompatButton
+                android:id="@+id/addUserButton"
+                style="@style/ownCloud.Button"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
-                android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
-                android:paddingTop="8dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/share_via_link_expiration_date_label"
-                android:textSize="16sp"
-                />
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="shareAddUserButton"
+                android:text="@string/share_add_user_or_group"
+                android:theme="@style/Button.Primary"/>
 
-            <TextView
-                android:id="@+id/shareViaLinkExpirationValue"
-                android:layout_width="wrap_content"
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/shareViaLinkSectionSwitch"
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
-                android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
-                android:layout_below="@id/shareViaLinkExpirationLabel"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:paddingBottom="8dp"
-                android:textSize="12sp"
-                />
+                android:layout_gravity="start"
+                android:layout_marginTop="@dimen/standard_half_margin"
+                android:checked="false"
+                android:paddingRight="@dimen/standard_half_padding"
+                android:text="@string/share_via_link_section_title"
+                android:textColor="@color/color_accent"/>
 
-        </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/shareViaLinkExpirationSection"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/standard_half_margin"
+                >
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/shareViaLinkPasswordSection"
-            >
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/shareViaLinkExpirationSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentTop="true"
+                    android:checked="false"
+                    android:padding="@dimen/standard_half_padding"/>
 
-            <Switch
-                android:id="@+id/shareViaLinkPasswordSwitch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerInParent="true"
-                android:padding="8dp"
-            />
+                <TextView
+                    android:id="@+id/shareViaLinkExpirationLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
+                    android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
+                    android:paddingLeft="@dimen/standard_half_padding"
+                    android:paddingRight="@dimen/standard_half_padding"
+                    android:paddingTop="@dimen/standard_half_padding"
+                    android:text="@string/share_via_link_expiration_date_label"
+                    android:textColor="@color/black"
+                    android:textSize="14sp"
+                    />
 
-            <TextView
-                android:id="@+id/shareViaLinkPasswordLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
-                android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
-                android:paddingTop="8dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/share_via_link_password_label"
-                android:textSize="16sp"
-                />
+                <TextView
+                    android:id="@+id/shareViaLinkExpirationValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/shareViaLinkExpirationLabel"
+                    android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
+                    android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:paddingLeft="@dimen/standard_half_padding"
+                    android:paddingRight="@dimen/standard_half_padding"
+                    android:textSize="12sp"
+                    />
 
-            <TextView
-                android:id="@+id/shareViaLinkPasswordValue"
-                android:layout_width="wrap_content"
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/shareViaLinkPasswordSection"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
-                android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
-                android:layout_below="@id/shareViaLinkPasswordLabel"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:paddingBottom="8dp"
-                android:text="@string/share_via_link_password_title"
-                android:textSize="12sp"
-                android:visibility="invisible"
-                />
+                >
 
-        </RelativeLayout>
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/shareViaLinkPasswordSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentTop="true"
+                    android:padding="@dimen/standard_half_padding"
+                    />
 
-        <RelativeLayout
-            android:id="@+id/shareViaLinkEditPermissionSection"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="invisible"
-            >
+                <TextView
+                    android:id="@+id/shareViaLinkPasswordLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
+                    android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
+                    android:paddingLeft="@dimen/standard_half_padding"
+                    android:paddingRight="@dimen/standard_half_padding"
+                    android:paddingTop="@dimen/standard_half_padding"
+                    android:text="@string/share_via_link_password_label"
+                    android:textColor="@color/black"
+                    android:textSize="14sp"
+                    />
 
-            <Switch
-                android:id="@+id/shareViaLinkEditPermissionSwitch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerInParent="true"
-                android:padding="8dp"
-                />
+                <TextView
+                    android:id="@+id/shareViaLinkPasswordValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/shareViaLinkPasswordLabel"
+                    android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
+                    android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:paddingLeft="@dimen/standard_half_padding"
+                    android:paddingRight="@dimen/standard_half_padding"
+                    android:text="@string/share_via_link_password_title"
+                    android:textSize="12sp"
+                    android:visibility="invisible"
+                    />
 
-            <TextView
-                android:id="@+id/shareViaLinkEditPermissionLabel"
-                android:layout_width="wrap_content"
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/shareViaLinkEditPermissionSection"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/shareViaLinkEditPermissionSwitch"
-                android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
-                android:paddingTop="8dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/share_via_link_edit_permission_label"
-                android:textSize="16sp"
-                />
+                android:visibility="invisible"
+                >
 
-        </RelativeLayout>
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/shareViaLinkEditPermissionSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerInParent="true"
+                    android:padding="@dimen/standard_half_padding"
+                    />
 
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/shareViaLinkGetLinkButton"
-            style="@style/ownCloud.Button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:theme="@style/Button.Primary"
-            android:text="@string/share_get_public_link_button"
-            android:contentDescription="shareGetLinkButton"/>
+                <TextView
+                    android:id="@+id/shareViaLinkEditPermissionLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_toLeftOf="@id/shareViaLinkEditPermissionSwitch"
+                    android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
+                    android:paddingLeft="@dimen/standard_half_padding"
+                    android:paddingRight="@dimen/standard_half_padding"
+                    android:paddingTop="@dimen/standard_half_padding"
+                    android:text="@string/share_via_link_edit_permission_label"
+                    android:textColor="@color/black"
+                    android:textSize="14sp"
+                    />
+
+            </RelativeLayout>
+
+            <android.support.v7.widget.AppCompatButton
+                android:id="@+id/shareViaLinkGetLinkButton"
+                style="@style/ownCloud.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="shareGetLinkButton"
+                android:text="@string/share_get_public_link_button"
+                android:theme="@style/Button.Primary"/>
 
+        </LinearLayout>
     </LinearLayout>
 
 </ScrollView>

+ 21 - 15
res/layout/share_user_item.xml

@@ -26,42 +26,48 @@
         android:orientation="horizontal"
         android:weightSum="1"
         android:longClickable="true">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/icon"
+            android:src="@drawable/ic_user"
+            android:layout_gravity="center_vertical"/>
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0.8"
+            android:layout_weight="1"
             android:textSize="@dimen/two_line_primary_text_size"
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
-            android:layout_margin="12dp"
+            android:layout_marginTop="@dimen/standard_half_margin"
+            android:layout_marginBottom="@dimen/standard_half_margin"
+            android:layout_marginLeft="@dimen/standard_half_margin"
             android:textColor="@color/textColor"
             android:singleLine="true"
-            android:ellipsize="middle"/>
+            android:ellipsize="middle"
+            android:layout_gravity="center_vertical"/>
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.1"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:id="@+id/unshareButton"
             android:src="@drawable/ic_action_delete"
-            android:layout_marginRight="@dimen/standard_margin"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_gravity="center_vertical"
+            android:padding="@dimen/standard_half_padding"/>
 
         <ImageView
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.1"
+            android:layout_height="wrap_content"
             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"/>
+            android:padding="@dimen/standard_half_padding"
+            android:layout_gravity="center_vertical"/>
 
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/list_divider_background"></View>
+        android:background="@color/list_divider_background" />
 </LinearLayout>

+ 1 - 0
res/values-ar/strings.xml

@@ -232,6 +232,7 @@
   <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_edit_permission_label">السماح بالتعديلات</string>
   <string name="share_search">البحث</string>
   <string name="share_privilege_can_share">يمكن المشاركة</string>
   <string name="share_privilege_can_edit">يمكن التحرير</string>

+ 1 - 0
res/values-bg-rBG/strings.xml

@@ -283,6 +283,7 @@
   <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_edit_permission_label">Позволяване на редактиране</string>
   <string name="share_search">Търсене</string>
   <string name="share_privilege_can_share">може да споделя</string>
   <string name="share_privilege_can_edit">може да променя</string>

+ 1 - 0
res/values-bs/strings.xml

@@ -41,6 +41,7 @@
   <string name="share_via_link_section_title">Podijelite vezu</string>
   <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_via_link_edit_permission_label">Dozvolite izmjenu</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>

+ 1 - 0
res/values-ca/strings.xml

@@ -237,6 +237,7 @@
   <string name="share_via_link_section_title">Comparteix l\'enllaç</string>
   <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_via_link_edit_permission_label">Permetre edició</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>

+ 6 - 0
res/values-cs-rCZ/strings.xml

@@ -340,6 +340,7 @@ správce systému.</string>
   <string name="pref_behaviour_entries_keep_file">ponechán ve výchozím adresáři</string>
   <string name="pref_behaviour_entries_move">přesunut do adresáře aplikace</string>
   <string name="share_dialog_title">Sdílení</string>
+  <string name="share_file">Sdílet %1$s</string>
   <string name="share_with_user_section_title">Sdílet s uživateli a skupinami</string>
   <string name="share_no_users">Zatím nebyla s uživateli sdílena žádná data</string>
   <string name="share_add_user_or_group">Přidat uživatele nebo skupinu</string>
@@ -347,10 +348,15 @@ správce systému.</string>
   <string name="share_via_link_expiration_date_label">Nastavit datum vypršení platnosti</string>
   <string name="share_via_link_password_label">Chránit heslem</string>
   <string name="share_via_link_password_title">Zabezpečeno</string>
+  <string name="share_via_link_edit_permission_label">Povolit úpravy</string>
   <string name="share_get_public_link_button">Vytvořit odkaz</string>
+  <string name="share_with_title">Sdílet s ...</string>
+  <string name="share_with_edit_title">Sdílet s %1$s</string>
   <string name="share_search">Hledat</string>
   <string name="search_users_and_groups_hint">Prohledat uživatele a skupiny</string>
   <string name="share_group_clarification">%1$s (skupina)</string>
+  <string name="share_remote_clarification">%1$s (vzdálený)</string>
+  <string name="share_known_remote_clarification">%1$s ( v %2$s )</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>

+ 4 - 0
res/values-da/strings.xml

@@ -36,8 +36,11 @@
   <string name="prefs_instant_upload_summary">Upload straks billeder taget med kameraet</string>
   <string name="prefs_instant_video_upload">Upload videoer straks</string>
   <string name="prefs_instant_video_upload_summary">Upload straks videor optaget med kameraet</string>
+  <string name="prefs_log_title">Slå logning til</string>
   <string name="prefs_log_summary">Dette bruges til at logregistrere problemer</string>
+  <string name="prefs_log_title_history">Logningshistorik</string>
   <string name="prefs_log_summary_history">Dette viser de optagne logger</string>
+  <string name="prefs_log_delete_history_button">Slet historik</string>
   <string name="prefs_help">Hjælp</string>
   <string name="prefs_recommend">Anbefal til en ven</string>
   <string name="prefs_feedback">Feedback</string>
@@ -294,6 +297,7 @@
   <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_via_link_password_title">Sikret</string>
+  <string name="share_via_link_edit_permission_label">Tillad redigering</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>

+ 7 - 1
res/values-de-rDE/strings.xml

@@ -82,7 +82,7 @@
   <string name="filedetails_sync_file">Synchronisieren</string>
   <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
   <string name="list_layout">Listenlayout</string>
-  <string name="action_share">Share</string>
+  <string name="action_share">Teilen</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
   <string name="common_ok">OK</string>
@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
   <string name="pref_behaviour_entries_move">in den App-Ordner verschoben</string>
   <string name="share_dialog_title">Teilen</string>
+  <string name="share_file">%1$s teilen</string>
   <string name="share_with_user_section_title">Mit Benutzern und Gruppen teilen</string>
   <string name="share_no_users">Bis jetzt hast du noch keine Dateien mit anderen geteilt</string>
   <string name="share_add_user_or_group">Benutzer oder Gruppe hinzufügen</string>
@@ -348,10 +349,15 @@
   <string name="share_via_link_expiration_date_label">Ein Ablaufdatum setzen</string>
   <string name="share_via_link_password_label">Passwortschutz</string>
   <string name="share_via_link_password_title">Gesichert</string>
+  <string name="share_via_link_edit_permission_label">Bearbeitung erlauben</string>
   <string name="share_get_public_link_button">Link erstellen</string>
+  <string name="share_with_title">Teilen mit ...</string>
+  <string name="share_with_edit_title">Teilen mit %1$s</string>
   <string name="share_search">Suche</string>
   <string name="search_users_and_groups_hint">Nach Benutzern und Gruppen suchen</string>
   <string name="share_group_clarification">%1$s (group)</string>
+  <string name="share_remote_clarification">%1$s (entfernte Freigabe)</string>
+  <string name="share_known_remote_clarification">%1$s ( auf %2$s )</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>

+ 4 - 0
res/values-de/strings.xml

@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
   <string name="pref_behaviour_entries_move">in den App-Ordner verschoben</string>
   <string name="share_dialog_title">Teilen</string>
+  <string name="share_file">Teile %1$s</string>
   <string name="share_with_user_section_title">Mit Benutzern oder Gruppen teilen</string>
   <string name="share_no_users">Es wurden noch keine Dateien mit Benutzern geteilt</string>
   <string name="share_add_user_or_group">Füge Benutzer oder Gruppe hinzu</string>
@@ -348,7 +349,10 @@
   <string name="share_via_link_expiration_date_label">Setze ein Ablaufdatum</string>
   <string name="share_via_link_password_label">Passwortschutz</string>
   <string name="share_via_link_password_title">Gesichert</string>
+  <string name="share_via_link_edit_permission_label">Bearbeitung erlauben</string>
   <string name="share_get_public_link_button">Link erhalten</string>
+  <string name="share_with_title">Teile mit ...</string>
+  <string name="share_with_edit_title">Teile mit %1$s</string>
   <string name="share_search">Suche</string>
   <string name="search_users_and_groups_hint">Nutzer und Gruppen suchen</string>
   <string name="share_group_clarification">%1$s (Gruppe)</string>

+ 43 - 0
res/values-el/strings.xml

@@ -37,7 +37,9 @@
   <string name="prefs_instant_upload_summary">Μεταφορτώστε απευθείας φωτογραφίες από την κάμερα</string>
   <string name="prefs_instant_video_upload">Στιγμιαίες μεταφορτώσεις βίντεο</string>
   <string name="prefs_instant_video_upload_summary">Άμεση μεταφόρτωση των βίντεο από την φωτογραφική μηχανή</string>
+  <string name="prefs_log_title">Ενεργοποίηση καταγραφής ιστορικού</string>
   <string name="prefs_log_summary">Χρησιμοποιείται για την καταγραφή προβλημάτων</string>
+  <string name="prefs_log_title_history">Ιστορικό καταγραφής</string>
   <string name="prefs_log_summary_history">Εδώ μπορείτε να δείτε το καταγεγραμμένο ιστορικό</string>
   <string name="prefs_log_delete_history_button">Διαγραφή ιστορικού</string>
   <string name="prefs_help">Βοήθεια</string>
@@ -59,6 +61,7 @@
   <string name="uploader_btn_new_folder_text">Νέος φάκελος</string>
   <string name="uploader_top_message">Επιλέξτε φάκελο μεταφορτώσεων:</string>
   <string name="uploader_wrn_no_account_title">Δεν βρέθηκε λογαριασμός</string>
+  <string name="uploader_wrn_no_account_text">Δεν υπάρχουν λογαριασμοί %1$s στη συσκευή σας. Παρακαλώ ρυθμίστε πρώτα ένα λογαριασμό.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ρύθμιση</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Έξοδος</string>
   <string name="uploader_wrn_no_content_title">Δεν υπάρχει περιεχόμενο για να μεταφορτώσετε</string>
@@ -68,6 +71,7 @@
   <string name="file_list_seconds_ago">δευτερόλεπτα πριν</string>
   <string name="file_list_empty">Δεν υπάρχει τίποτα εδώ. Μεταφορτώστε κάτι!</string>
   <string name="file_list_loading">Φόρτωση...</string>
+  <string name="file_list_no_app_for_file_type">Δεν βρέθηκε εφαρμογή για τον τύπο αρχείου!</string>
   <string name="local_file_list_empty">Δεν υπάρχουν αρχεία σε αυτό τον φάκελο.</string>
   <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
   <string name="filedetails_size">Μέγεθος:</string>
@@ -77,6 +81,7 @@
   <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>
@@ -96,8 +101,10 @@
   <string name="uploader_upload_in_progress_ticker">Μεταφόρτωση ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Μεταφορτώνονται %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Η μεταφόρτωση ολοκληρώθηκε επιτυχώς</string>
+  <string name="uploader_upload_succeeded_content_single">Το %1$s μεταφορτώθηκε</string>
   <string name="uploader_upload_failed_ticker">Η μεταφόρτωση απέτυχε</string>
   <string name="uploader_upload_failed_content_single">Η μεταφόρτωση του %1$s δεν ήταν δυνατόν να ολοκληρωθεί</string>
+  <string name="uploader_upload_failed_credentials_error">Η μεταφόρτωση απέτυχε, πρέπει να επανασυνδεθείτε</string>
   <string name="downloader_download_in_progress_ticker">Λήψη ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Λαμβάνονται %2$s</string>
   <string name="downloader_download_succeeded_ticker">Η λήψη ολοκληρώθηκε επιτυχώς</string>
@@ -108,6 +115,8 @@
   <string name="downloader_download_failed_credentials_error">Αποτυχία λήψης, πρέπει να εισέλθετε ξανά</string>
   <string name="common_choose_account">Επιλογή λογαριασμού</string>
   <string name="sync_fail_ticker">Αποτυχία συγχρονισμού</string>
+  <string name="sync_fail_ticker_unauthorized">Ο συγχρονισμός απέτυχε, πρέπει να επανασυνδεθείτε</string>
+  <string name="sync_fail_content">Ο συγχρονισμός του %1$s δεν μπόρεσε να ολοκληρωθεί</string>
   <string name="sync_fail_content_unauthorized">Λάθος κωδικός για %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Βρέθηκαν συγκρούσεις</string>
   <string name="sync_conflicts_in_favourites_content">%1$d αρχεία σε αναμονή συγχρονισμού δεν μπόρεσαν να συγχρονιστούν</string>
@@ -122,8 +131,11 @@
   <string name="foreign_files_fail">Μερικά αρχεία δεν μπόρεσαν να μετακινηθούν</string>
   <string name="foreign_files_local_text">Τοπικά: %1$s</string>
   <string name="foreign_files_remote_text">Απομακρυσμένα: %1$s</string>
+  <string name="upload_query_move_foreign_files">Δεν υπάρχει αρκετός διαθέσιμος αποθηκευτικός χώρος για να αντιγραφούν τα επιλεγμένα αρχεία στον φάκελο %1$s. Θα θέλατε να τα μετακινήσετε αντί αυτού;</string>
+  <string name="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>
@@ -148,6 +160,8 @@
   <string name="media_rewind_description">Κουμπί επαναφοράς</string>
   <string name="media_play_pause_description">Κουμπί αναπαραγωγής ή παύσης</string>
   <string name="media_forward_description">Κουμπί προώθησης</string>
+  <string name="auth_getting_authorization">Λήψη πιστοποίησης...</string>
+  <string name="auth_trying_to_login">Προσπάθεια σύνδεσης...</string>
   <string name="auth_no_net_conn_title">Δεν υπάρχει σύνδεση στο δίκτυο</string>
   <string name="auth_nossl_plain_ok_title">Μη διαθέσιμη ασφαλής σύνδεση.</string>
   <string name="auth_connection_established">Επετεύχθη σύνδεση</string>
@@ -168,12 +182,16 @@
   <string name="auth_unauthorized">Λάθος όνομα χρήστη ή κωδικός</string>
   <string name="auth_oauth_error">Η πιστοποίηση απέτυχε</string>
   <string name="auth_oauth_error_access_denied">Ο διακομιστής πιστοποίησης αρνήθηκε την πρόσβαση</string>
+  <string name="auth_wtf_reenter_URL">Απρόοπτη κατάσταση - παρακαλώ εισάγετε τη διεύθυνση URL του διακομιστή ξανά</string>
   <string name="auth_expired_oauth_token_toast">Η πιστοποιίησή σας έληξε. Παρακαλώ πιστοποιήστε ξανά</string>
+  <string name="auth_expired_basic_auth_toast">Παρακαλώ εισάγετε τον τρέχοντα κωδικό πρόσβασης</string>
   <string name="auth_expired_saml_sso_token_toast">Η συνεδρία σας έληξε. Παρακαλώ συνδεθείτε ξανά</string>
+  <string name="auth_connecting_auth_server">Σύνδεση με το διακομιστή πιστοποίησης...</string>
   <string name="auth_unsupported_auth_method">Ο διακομιστής δεν υποστηρίζει αυτή τη μέθοδο πιστοποίησης</string>
   <string name="auth_unsupported_multiaccount">Ο %1$s  δεν υποστηρίζει πολλαπλούς λογαριασμούς</string>
   <string name="auth_fail_get_user_name">Ο διακομιστής σας δεν επιστρέφει το σωστό αναγνωριστικό χρήστη, παρακαλώ επικοινωνήστε με ένα διαχειριστή
 ⇥</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>
@@ -244,12 +262,15 @@
   <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>
@@ -266,6 +287,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="forbidden_permissions_create">για να δημιουργήσετε το αρχείο</string>
   <string name="uploader_upload_forbidden_permissions">για να μεταφορτώσετε σε αυτό το φάκελο</string>
   <string name="downloader_download_file_not_found">Αυτό το αρχείο δεν είναι πια διαθέσιμο στο διακομιστή</string>
@@ -274,7 +296,9 @@
   <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 αναφορές της εφαρμογής Android</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>
@@ -290,7 +314,9 @@
   <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_details">Λεπτομέρειες</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>
@@ -308,19 +334,30 @@
   <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_file">Διαμοιρασμός %1$s</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_via_link_edit_permission_label">Επιτρέπεται η επεξεργασία</string>
   <string name="share_get_public_link_button">Λήψη συνδέσμου</string>
+  <string name="share_with_title">Διαμοιρασμός με...</string>
+  <string name="share_with_edit_title">Διαμοιρασμός με %1$s</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_remote_clarification">%1$s (απομακρυσμένα)</string>
+  <string name="share_known_remote_clarification">%1$s ( στο %2$s )</string>
   <string name="share_sharee_unavailable">Δεν επιτρέπεται ο διαμοιρασμός μεταξύ χρηστών μέσω εφαρμογής, σε αυτή την έκδοση.
 \nΕπικοινωνήστε με το διαχειριστή του συστήματος</string>
   <string name="share_privilege_can_share">δυνατότητα διαμοιρασμού</string>
@@ -329,6 +366,12 @@
   <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>
+  <string name="manage_space_title">Διαχείριση χώρου</string>
+  <string name="manage_space_description">Οι ρυθμίσεις, η βάση δεδομένων και τα πιστοποιητικά διακομιστή από τα δεδομένα του %1$s θα διαγραφούν οριστικά. \n\nΤα ληφθέντα αρχεία δεν θα πειραχθούν. \n\nΗ διαδικασία μπορεί να διαρκέσει λίγη ώρα.</string>
   <string name="manage_space_clear_data">Εκκαθάριση δεδομένων</string>
   <string name="manage_space_error">Μερικά αρχεία δεν μπορούν να διαγραφούν.</string>
+  <string name="permission_storage_access">Επιπλέον διακαιώματα απαιτούνται για μεταφόρτωση &amp; λήψη αρχείων.</string>
 </resources>

+ 1 - 0
res/values-en-rGB/strings.xml

@@ -348,6 +348,7 @@
   <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_via_link_password_title">Secured</string>
+  <string name="share_via_link_edit_permission_label">Allow editing</string>
   <string name="share_get_public_link_button">Get link</string>
   <string name="share_search">Search</string>
   <string name="search_users_and_groups_hint">Search users and groups</string>

+ 1 - 0
res/values-eo/strings.xml

@@ -266,6 +266,7 @@
   <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_via_link_password_title">Sekurigita</string>
+  <string name="share_via_link_edit_permission_label">Permesi redakton</string>
   <string name="share_get_public_link_button">Ekhavi ligilon</string>
   <string name="share_search">Serĉi</string>
   <string name="search_users_and_groups_hint">Serĉi uzantojn kaj grupojn</string>

+ 1 - 0
res/values-es/strings.xml

@@ -348,6 +348,7 @@
   <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_via_link_password_title">Asegurado</string>
+  <string name="share_via_link_edit_permission_label">Permitir edición</string>
   <string name="share_get_public_link_button">Obtener enlace</string>
   <string name="share_search">Buscar</string>
   <string name="search_users_and_groups_hint">Buscar usuarios y grupos</string>

+ 1 - 0
res/values-et-rEE/strings.xml

@@ -322,6 +322,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="share_via_link_expiration_date_label">Määra aegumise kuupäev</string>
   <string name="share_via_link_password_label">Parooliga kaitstud</string>
   <string name="share_via_link_password_title">Turvatud</string>
+  <string name="share_via_link_edit_permission_label">Luba muutmine</string>
   <string name="share_get_public_link_button">Hangi link</string>
   <string name="share_search">Otsi</string>
   <string name="search_users_and_groups_hint">Otsi kasutajaid ja gruppe</string>

+ 1 - 0
res/values-eu/strings.xml

@@ -258,6 +258,7 @@ Mesedez, baimendu berriz</string>
   <string name="share_via_link_section_title">Elkarbanatu lotura</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_via_link_edit_permission_label">Baimendu editatzea</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>

+ 1 - 0
res/values-fa/strings.xml

@@ -266,6 +266,7 @@
   <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_edit_permission_label">اجازه‌ی ویرایش</string>
   <string name="share_search">جست‌و‌جو</string>
   <string name="share_privilege_can_share">قابل به اشتراک گذاری</string>
   <string name="share_privilege_can_edit">می توان ویرایش کرد</string>

+ 3 - 0
res/values-fi-rFI/strings.xml

@@ -325,7 +325,10 @@
   <string name="share_via_link_expiration_date_label">Aseta päättymispäivä</string>
   <string name="share_via_link_password_label">Suojaa salasanalla</string>
   <string name="share_via_link_password_title">Turvattu</string>
+  <string name="share_via_link_edit_permission_label">Salli muokkaus</string>
   <string name="share_get_public_link_button">Hanki linkki</string>
+  <string name="share_with_title">Jaa…</string>
+  <string name="share_with_edit_title">Jaa käyttäjän %1$s kanssa</string>
   <string name="share_search">Etsi</string>
   <string name="search_users_and_groups_hint">Etsi käyttäjiä ja ryhmiä</string>
   <string name="share_group_clarification">%1$s (ryhmä)</string>

+ 4 - 0
res/values-fr/strings.xml

@@ -345,6 +345,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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_file">Partager %1$s</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>
@@ -352,7 +353,10 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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>
   <string name="share_via_link_password_title">Sécurisé</string>
+  <string name="share_via_link_edit_permission_label">Permettre la modification</string>
   <string name="share_get_public_link_button">Obtenir le lien</string>
+  <string name="share_with_title">Partager avec ...</string>
+  <string name="share_with_edit_title">Partager avec %1$s</string>
   <string name="share_search">Rechercher</string>
   <string name="search_users_and_groups_hint">Chercher parmi les utilisateurs et groupes</string>
   <string name="share_group_clarification">%1$s (groupe)</string>

+ 1 - 0
res/values-gl/strings.xml

@@ -298,6 +298,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="share_via_link_section_title">Ligazón para compartir</string>
   <string name="share_via_link_expiration_date_label">Definir a data de caducidade</string>
   <string name="share_via_link_password_label">Protexido con contrasinal</string>
+  <string name="share_via_link_edit_permission_label">Permitir a edición</string>
   <string name="share_search">Buscar</string>
   <string name="search_users_and_groups_hint">Buscar usuarios e grupos</string>
   <string name="share_group_clarification">%1$s (grupo)</string>

+ 4 - 0
res/values-he/strings.xml

@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">נשמר בתיקייה מקורית</string>
   <string name="pref_behaviour_entries_move">הועבר לתיקיית ישומים</string>
   <string name="share_dialog_title">שיתוף</string>
+  <string name="share_file">שיתוף %1$s</string>
   <string name="share_with_user_section_title">שיתוף עם משתמשים וקבוצות</string>
   <string name="share_no_users">עדיין לא שותף מידע עם משתמשים</string>
   <string name="share_add_user_or_group">הוספת משתמש או קבוצה</string>
@@ -348,7 +349,10 @@
   <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_via_link_edit_permission_label">אישור עריכה</string>
   <string name="share_get_public_link_button">קבלת קישור</string>
+  <string name="share_with_title">שיתף עם...</string>
+  <string name="share_with_edit_title">שיתף עם %1$s</string>
   <string name="share_search">חיפוש</string>
   <string name="search_users_and_groups_hint">חיפוש משתמשים וקבוצות</string>
   <string name="share_group_clarification">%1$s (קבוצה)</string>

+ 1 - 0
res/values-hr/strings.xml

@@ -66,6 +66,7 @@
   <string name="share_via_link_section_title">Podijelite vezu</string>
   <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_via_link_edit_permission_label">Omogući uređivanje</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>

+ 1 - 0
res/values-hu-rHU/strings.xml

@@ -251,6 +251,7 @@
   <string name="share_via_link_section_title">Megosztás hivatkozással</string>
   <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_via_link_edit_permission_label">Szerkesztés engedélyezése</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>

+ 1 - 0
res/values-hy/strings.xml

@@ -86,6 +86,7 @@
   <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_via_link_edit_permission_label">Թույլատրել խմբագրումը</string>
   <string name="share_get_public_link_button">Ստանալ հղում</string>
   <string name="share_search">Փնտրել</string>
   <string name="share_privilege_can_share">կարող է տարածել</string>

+ 1 - 0
res/values-id/strings.xml

@@ -304,6 +304,7 @@
   <string name="share_via_link_section_title">Bagikan tautan</string>
   <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_via_link_edit_permission_label">Izinkan penyuntingan</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>

+ 248 - 0
res/values-is/strings.xml

@@ -25,13 +25,31 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Stillingar</string>
+  <string name="drawer_item_logs">Annálar</string>
   <string name="drawer_close">Loka</string>
   <string name="drawer_open">Opna</string>
   <string name="prefs_category_general">Almennt</string>
   <string name="prefs_category_more">Meira</string>
   <string name="prefs_accounts">Notandaaðgangar</string>
+  <string name="prefs_manage_accounts">Sýsla með notandaaðganga</string>
+  <string name="prefs_passcode">Læsing með lykilorði</string>
+  <string name="prefs_instant_upload">Hlaða strax inn myndum</string>
+  <string name="prefs_instant_upload_summary">Hlaða strax inn myndum teknum á myndavél</string>
+  <string name="prefs_instant_video_upload">Hlaða strax inn myndskeiðum</string>
+  <string name="prefs_instant_video_upload_summary">Hlaða strax inn myndskeiðum teknum á myndavél</string>
+  <string name="prefs_log_title">Virkja skráningu í annál</string>
+  <string name="prefs_log_summary">Þetta er notað til að skrá vandamál</string>
+  <string name="prefs_log_title_history">Ferill annálsskráningar</string>
+  <string name="prefs_log_summary_history">Þetta sýnir skráningar í annála</string>
   <string name="prefs_log_delete_history_button">Eyða ferli</string>
   <string name="prefs_help">Hjálp</string>
+  <string name="prefs_recommend">Mæla með við vin</string>
+  <string name="prefs_feedback">Umsögn</string>
+  <string name="prefs_imprint">Prenta</string>
+  <string name="prefs_remember_last_share_location">Muna staðsetningu sameignar</string>
+  <string name="prefs_remember_last_upload_location_summary">Muna staðsetningu á síðustu innhleðslu sameignar</string>
+  <string name="recommend_subject">Prófaðu %1$s á snjallsímanum þínum!</string>
+  <string name="recommend_text">Þér langar til að bjóða þér að nota %1$s á snjallsímanum þínum!\nSæktu það hér: %2$s</string>
   <string name="auth_check_server">Athuga með þjón</string>
   <string name="auth_host_url">Vistfang þjóns https://…</string>
   <string name="auth_username">Notendanafn</string>
@@ -41,73 +59,300 @@
   <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_top_message">Veldu innsendingamöppu:</string>
+  <string name="uploader_wrn_no_account_title">Enginn notandaaðgangur fannst</string>
+  <string name="uploader_wrn_no_account_text">Það eru engir %1$s aðgangar á tækinu þínu. Settu fyrst upp notandaaðgang.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Uppsetning</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Hætta</string>
+  <string name="uploader_wrn_no_content_title">Ekkert efni til að senda inn</string>
+  <string name="uploader_wrn_no_content_text">Ekkert efni barst. Ekkert til að senda inn.</string>
+  <string name="uploader_error_forbidden_content">%1$s er ekki með heimild til að nálgast sameiginlega efnið</string>
   <string name="uploader_info_uploading">Sendi inn</string>
   <string name="file_list_seconds_ago">sek.</string>
   <string name="file_list_empty">Ekkert hér. Settu eitthvað inn!</string>
   <string name="file_list_loading">Hleð inn…</string>
+  <string name="file_list_no_app_for_file_type">Engin forrit fundust fyrir skráategund!</string>
+  <string name="local_file_list_empty">Það eru engar skrár í þessari möppu.</string>
+  <string name="filedetails_select_file">Bankaðu á skrá til að sjá ítarlegri upplýsingar.</string>
   <string name="filedetails_size">Stærð:</string>
   <string name="filedetails_type">Tegund:</string>
   <string name="filedetails_created">Búið til:</string>
   <string name="filedetails_modified">Breytt:</string>
   <string name="filedetails_download">Niðurhal</string>
   <string name="filedetails_sync_file">Samstilla</string>
+  <string name="filedetails_renamed_in_upload_msg">Skrá var endurnefnd sem %1$s við innsendingu</string>
+  <string name="list_layout">Framsetning lista</string>
   <string name="action_share">Deila</string>
   <string name="common_yes">Já</string>
   <string name="common_no">Nei</string>
   <string name="common_ok">Í lagi</string>
+  <string name="common_cancel_sync">Hætta við samstillingu</string>
   <string name="common_cancel">Hætta við</string>
+  <string name="common_save_exit">Vista &amp; fara út</string>
   <string name="common_error"><strong>Villa</strong></string>
   <string name="common_loading">Hleð inn …</string>
   <string name="common_error_unknown">Óþekkt villa</string>
   <string name="about_title">Um</string>
   <string name="change_password">Breyta lykilorði</string>
+  <string name="delete_account">Fjarlægja notandaaðgang</string>
   <string name="create_account">Stofna aðgang</string>
+  <string name="upload_chooser_title">Senda inn frá ...</string>
   <string name="uploader_info_dirname">Nafn möppu</string>
+  <string name="uploader_upload_in_progress_ticker">Sendi inn ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Sendi inn %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Innsending tókst</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s sent inn</string>
+  <string name="uploader_upload_failed_ticker">Innsending mistókst</string>
+  <string name="uploader_upload_failed_content_single">Ekki var hægt að ljúka innsendingu á %1$s</string>
+  <string name="uploader_upload_failed_credentials_error">Innsending mistókst, þú verður að skrá þig inn aftur</string>
+  <string name="downloader_download_in_progress_ticker">Sæki ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Sæki %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Niðurhal tókst</string>
+  <string name="downloader_download_succeeded_content">%1$s niðurhalað</string>
   <string name="downloader_download_failed_ticker">Niðurhal mistókst</string>
+  <string name="downloader_download_failed_content">Ekki var hægt að ljúka niðurhali á %1$s</string>
+  <string name="downloader_not_downloaded_yet">Ekki ennþá búið að sækja</string>
+  <string name="downloader_download_failed_credentials_error">Niðurhal mistókst, þú verður að skrá þig inn aftur</string>
+  <string name="common_choose_account">Veldu aðgang</string>
+  <string name="sync_fail_ticker">Samstilling mistókst</string>
+  <string name="sync_fail_ticker_unauthorized">Samstilling mistókst, þú verður að skrá þig inn aftur</string>
+  <string name="sync_fail_content">Ekki var hægt að ljúka samstillingu á %1$s</string>
+  <string name="sync_fail_content_unauthorized">Ógilt lykilorð fyrir %1$s</string>
+  <string name="sync_conflicts_in_favourites_ticker">Árekstrar fundust</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d skrár merktar fyrir samstillingu var ekki hægt að samstilla</string>
+  <string name="sync_fail_in_favourites_ticker">Skrár merktar fyrir samstillingu mistókust</string>
+  <string name="sync_fail_in_favourites_content">Efni %1$d skráa var ekki hægt að samstilla (%2$d árekstrar)</string>
+  <string name="sync_foreign_files_forgotten_ticker">Sumar staðværar skrár gleymdust</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d skrár úr %2$s möppunni var ekki hægt að afrita í</string>
+  <string name="sync_current_folder_was_removed">Mappan %1$s er ekki lengur til staðar</string>
   <string name="foreign_files_move">Færa allt</string>
+  <string name="foreign_files_success">Allar skrár voru færðar</string>
+  <string name="foreign_files_fail">Ekki tókst að færa allar skrár</string>
+  <string name="foreign_files_local_text">Staðvært: %1$s</string>
+  <string name="foreign_files_remote_text">Fjartengt: %1$s</string>
+  <string name="upload_query_move_foreign_files">Það er ekki nægilegt pláss til að afrita völdu skrárnar í %1$s möppuna. Vilt þú kannski færa þær í staðinn? </string>
+  <string name="pass_code_enter_pass_code">Settu inn lykilorðið þitt</string>
+  <string name="pass_code_configure_your_pass_code">Settu inn lykilorð</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Lykilorðsins verður krafist í hvert skipti sem appið er ræst</string>
+  <string name="pass_code_reenter_your_pass_code">Settu aftur inn lykilorðið þitt</string>
+  <string name="pass_code_remove_your_pass_code">Fjarlægðu lykilorðið þitt</string>
+  <string name="pass_code_mismatch">Lykilorðin eru ekki eins</string>
+  <string name="pass_code_wrong">Rangt lykilorð</string>
+  <string name="pass_code_removed">Fjarlægði lykilorð</string>
+  <string name="pass_code_stored">Geymdi lykilorð</string>
+  <string name="media_notif_ticker">%1$s tónlistarspilari</string>
+  <string name="media_state_playing">%1$s (afspilun)</string>
+  <string name="media_state_loading">%1$s (hleð)</string>
+  <string name="media_event_done">%1$s afspilun lokið</string>
+  <string name="media_err_nothing_to_play">Engin margmiðlunarskrá fannst</string>
+  <string name="media_err_no_account">Enginn notandaaðgangur uppgefinn</string>
+  <string name="media_err_not_in_owncloud">Skrá er ekki á gildum aðgangi</string>
+  <string name="media_err_unsupported">Óstudd margmiðlunarlyklun (codec)</string>
+  <string name="media_err_io">Ekki tókst að lesa margmiðlunarskrá</string>
+  <string name="media_err_malformed">Margmiðlunarskrá er ekki rétt kóðuð</string>
+  <string name="media_err_timeout">Féll á tíma við að reyna að spila</string>
+  <string name="media_err_invalid_progressive_playback">Ekki tókst að streyma margmiðlunarskrá</string>
+  <string name="media_err_unknown">Ekki tókst að spila skrána í meðfylgjandi margmiðlunarspilara</string>
+  <string name="media_err_security_ex">Öryggisvilla kom upp við að reyna að spila  %1$s</string>
+  <string name="media_err_io_ex">Inntaksvilla kom upp við að reyna að spila  %1$s</string>
+  <string name="media_err_unexpected">Óvænt villa kom upp við að reyna að spila  %1$s</string>
+  <string name="media_rewind_description">Spóla-til-baka hnappur</string>
+  <string name="media_play_pause_description">Afspilun-eða-hlé hnappur</string>
+  <string name="media_forward_description">Spóla-hratt-áfram hnappur</string>
+  <string name="auth_getting_authorization">Fæ heimild ...</string>
+  <string name="auth_trying_to_login">Reyni að skrá inn …</string>
+  <string name="auth_no_net_conn_title">Engin nettenging</string>
+  <string name="auth_nossl_plain_ok_title">Örugg tenging ekki tiltæk.</string>
+  <string name="auth_connection_established">Tengingu komið á</string>
+  <string name="auth_testing_connection">Prófa tengingu</string>
+  <string name="auth_not_configured_title">Gölluð uppsetning þjóns</string>
+  <string name="auth_account_not_new">Aðgangur fyrir sama notanda og sama þjón er þegar fyrir hendi á tækinu</string>
+  <string name="auth_account_not_the_same">Notandanafnið sem sett var inn samsvarar ekki notanda þessa aðgangs</string>
+  <string name="auth_unknown_error_title">Óþekkt villa kom upp!</string>
+  <string name="auth_unknown_host_title">Fann ekki hýsilvél</string>
+  <string name="auth_incorrect_path_title">Tilvik þjóns fannst ekki</string>
+  <string name="auth_timeout_title">Þjónninn var of lengi að svara</string>
+  <string name="auth_incorrect_address_title">Rangt snið á vistfangi þjóns</string>
+  <string name="auth_ssl_general_error_title">Mistókst að frumstilla SSL</string>
+  <string name="auth_ssl_unverified_server_title">Gat ekki sannreynt auðkenni SSL-þjóns</string>
+  <string name="auth_bad_oc_version_title">Óþekkjanleg útgáfa af þjóni</string>
+  <string name="auth_wrong_connection_title">Gat ekki komið á tengingu</string>
+  <string name="auth_secure_connection">Öruggri tengingu komið á</string>
+  <string name="auth_unauthorized">Rangt notandanafn eða lykilorð</string>
+  <string name="auth_oauth_error">Auðkenning mistókst</string>
+  <string name="auth_oauth_error_access_denied">Aðgangi hafnað af auðkenningarþjóni</string>
+  <string name="auth_wtf_reenter_URL">Óvænt staða, settu aftur inn vistfang þjónsins</string>
+  <string name="auth_expired_oauth_token_toast">Heimild þín er útrunnin. Skráðu þig aftur inn.</string>
+  <string name="auth_expired_basic_auth_toast">Settu inn núgildandi lykilorð</string>
+  <string name="auth_expired_saml_sso_token_toast">Setan þín er útrunnin. Skráðu þig aftur inn.</string>
+  <string name="auth_connecting_auth_server">Tengist við auðkenningarþjón …</string>
+  <string name="auth_unsupported_auth_method">Þjónninn styður ekki þessa auðkenningaraðferð</string>
+  <string name="auth_unsupported_multiaccount">%1$s styður ekki fjölaðganga</string>
+  <string name="auth_fail_get_user_name">Þjónninn skilar ekki réttu notandaauðkenni, hafðu samband við kerfisstjóra
+	</string>
+  <string name="auth_can_not_auth_against_server">Get ekki auðkennt á þessum þjóni</string>
+  <string name="auth_account_does_not_exist">Aðgangur er ekki ennþá fyrir hendi á tækinu</string>
   <string name="favorite">Uppáhalds</string>
+  <string name="unfavorite">Taka úr eftirlæti</string>
   <string name="common_rename">Endurnefna</string>
   <string name="common_remove">Fjarlægja</string>
+  <string name="confirmation_remove_alert">Ertu viss um að þú viljir fjarlægja %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Ertu viss um að þú viljir fjarlægja %1$s og innihald þess?</string>
+  <string name="confirmation_remove_local">Einungis staðvært</string>
+  <string name="remove_success_msg">Fjarlæging tókst</string>
+  <string name="remove_fail_msg">Fjarlæging mistókst</string>
+  <string name="rename_dialog_title">Settu inn nýtt nafn</string>
+  <string name="rename_local_fail_msg">Ekki var hægt að endurnefna staðvært afrit; prófaðu annað nafn</string>
+  <string name="rename_server_fail_msg">Ekki var hægt að ljúka endurnefningu</string>
+  <string name="sync_file_fail_msg">Ekki var hægt að athuga fjartengda skrá</string>
+  <string name="sync_file_nothing_to_do_msg">Efni skrár er þegar samstillt</string>
+  <string name="create_dir_fail_msg">Tókst ekki að búa til möppu</string>
+  <string name="filename_forbidden_characters">Óleyfilegir stafir: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">Skráarheitið inniheldur að minnsta kosti einn ógildan staf</string>
+  <string name="filename_empty">Skráarheiti má ekki vera tómt</string>
+  <string name="wait_a_moment">Bíddu aðeins</string>
+  <string name="filedisplay_unexpected_bad_get_content">Óvænt vandamál; veldu skrána úr öðru forriti</string>
+  <string name="filedisplay_no_file_selected">Engin skrá var valin</string>
+  <string name="activity_chooser_title">Senda tengil til ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Afrita skrá úr einkageymslu</string>
+  <string name="oauth_check_onoff">Skrá inn með oAuth2</string>
+  <string name="oauth_login_connection">Tengist við oAuth2-þjón…</string>
+  <string name="ssl_validator_header">Ekki var hægt að sannreyna auðkenni vefsvæðisins</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Skilríki þjónsins er ekki treyst</string>
+  <string name="ssl_validator_reason_cert_expired">- Skilríki þjónsins er útrunnið</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Skilríki þjónsins er með gildistíma í framtíðinni</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Slóðin samsvarar ekki vélarheitinu í skilríkinu</string>
+  <string name="ssl_validator_question">Viltu samt treysta þessu skilríki?</string>
+  <string name="ssl_validator_not_saved">Ekki var hægt að vista þetta skilríki</string>
   <string name="ssl_validator_btn_details_see">Nánar</string>
   <string name="ssl_validator_btn_details_hide">Fela</string>
+  <string name="ssl_validator_label_subject">Gefið út fyrir:</string>
+  <string name="ssl_validator_label_issuer">Gefið út af:</string>
+  <string name="ssl_validator_label_CN">Almennt heiti:</string>
+  <string name="ssl_validator_label_O">Stofnun/Fyrirtæki/Félag (O):</string>
+  <string name="ssl_validator_label_OU">Deild (OU):</string>
   <string name="ssl_validator_label_C">Land:</string>
   <string name="ssl_validator_label_ST">Sýsla:</string>
+  <string name="ssl_validator_label_L">Staðsetning:</string>
+  <string name="ssl_validator_label_validity">Gildir:</string>
   <string name="ssl_validator_label_validity_from">Frá:</string>
   <string name="ssl_validator_label_validity_to">Til:</string>
+  <string name="ssl_validator_label_signature">Undirritun:</string>
+  <string name="ssl_validator_label_signature_algorithm">Reiknirit:</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Fingrafar:</string>
+  <string name="certificate_load_problem">Það kom upp vandamál við að lesa inn skilríkið.</string>
+  <string name="ssl_validator_null_cert">Ekki var hægt að birta þetta skilríki.</string>
+  <string name="ssl_validator_no_info_about_error">- Engar upplýsingar um villuna</string>
+  <string name="placeholder_sentence">Þetta er frátökutákn</string>
   <string name="placeholder_filename">staðgengi.txt</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="instant_upload_on_wifi">Senda inn myndir einungis um þráðlaus net</string>
+  <string name="instant_video_upload_on_wifi">Senda inn myndskeið einungis um þráðlaus net</string>
   <string name="conflict_title">Árekstur skráa</string>
   <string name="conflict_message">Ef þú velur báðar útgáfur, þá mun verða bætt tölustaf aftan við heiti skrárinnar á tölvunni.</string>
   <string name="conflict_keep_both">Halda báðum</string>
   <string name="conflict_use_local_version">útgáfu á tölvu</string>
   <string name="conflict_use_server_version">útgáfu á þjóni</string>
+  <string name="preview_image_description">Forskoðun myndar</string>
+  <string name="preview_image_error_unknown_format">Ekki er hægt að birta myndina</string>
+  <string name="error__upload__local_file_not_copied">%1$s var ekki hægt að afrita í staðværu %2$s möppuna</string>
+  <string name="prefs_instant_upload_path_title">Innsendingarslóð</string>
+  <string name="share_link_no_support_share_api">Því miður, deiling gagna er ekki virk á þjóninum. Hafðu samband við
+		kerfisstjóra.</string>
+  <string name="share_link_file_no_exist">Get ekki deilt. Athugaðu hvort skráin sé til</string>
+  <string name="share_link_file_error">Villa kom upp við að reyna að deila þessari skrá eða möppu</string>
+  <string name="unshare_link_file_no_exist">Get ekki hætt deilingu. Athugaðu hvort skráin sé til</string>
+  <string name="unshare_link_file_error">Villa kom upp við að reyna að hætta deilingu á þessari skrá eða möppu</string>
+  <string name="update_link_file_no_exist">Get ekki uppfært. Athugaðu hvort skráin sé til</string>
+  <string name="update_link_file_error">Villa kom upp við að reyna að uppfæra sameignina</string>
+  <string name="share_link_password_title">Settu inn lykilorð</string>
+  <string name="share_link_empty_password">Þú verður að setja inn lykilorð</string>
   <string name="activity_chooser_send_file_title">Senda</string>
+  <string name="copy_link">Afrita tengil</string>
   <string name="clipboard_text_copied">Afritað á klippispjaldið</string>
+  <string name="error_cant_bind_to_operations_service">Alvarleg villa: get ekki framkvæmt aðgerðir</string>
+  <string name="network_error_socket_exception">Villa kom upp við að tengjast við þjóninn.</string>
+  <string name="network_host_not_available">Ekki er hægt að ljúka aðgerðinni, þjónninn er ekki tiltækur</string>
   <string name="empty"></string>
+  <string name="forbidden_permissions">Þú hefur ekki heimild %s</string>
+  <string name="forbidden_permissions_rename">til að endurnefna þessa skrá</string>
+  <string name="forbidden_permissions_delete">til að eyða þessari skrá</string>
+  <string name="share_link_forbidden_permissions">til að deila þessari skrá</string>
+  <string name="unshare_link_forbidden_permissions">til að hætta deilingu á þessari skrá</string>
+  <string name="update_link_forbidden_permissions">til að uppfæra þessa sameign</string>
+  <string name="forbidden_permissions_create">til að búa til skrána</string>
+  <string name="uploader_upload_forbidden_permissions">til að senda inn í þessa möppu</string>
+  <string name="downloader_download_file_not_found">Skráin er ekki lengur tiltæk á þjóninum</string>
   <string name="prefs_category_accounts">Notandaaðgangar</string>
+  <string name="prefs_add_account">Bæta við notandaaðgangi</string>
+  <string name="auth_redirect_non_secure_connection_title">Öruggri tengingu er endurbeint í gegnum óörugga leið.</string>
+  <string name="actionbar_logger">Annálar</string>
+  <string name="log_send_history_button">Ferill sendinga</string>
+  <string name="log_send_no_mail_app">Ekkert forrit fannst til að senda annála. Settu upp eitthvað tölvupóstforrit.</string>
+  <string name="log_send_mail_subject">%1$s annálar Android-forrita</string>
+  <string name="log_progress_dialog_text">Hleð inn gögnum …</string>
   <string name="saml_authentication_required_text">Auðkenningar krafist</string>
   <string name="saml_authentication_wrong_pass">Rangt lykilorð</string>
   <string name="actionbar_move">Færa</string>
+  <string name="file_list_empty_moving">Ekkert hér. Þú getur bætt við möppu!</string>
   <string name="folder_picker_choose_button_text">Veldu</string>
+  <string name="move_file_not_found">Get ekki fært. Athugaðu hvort skráin sé til</string>
+  <string name="move_file_invalid_overwrite">Skráin er þegar til í úttaksmöppunni</string>
+  <string name="move_file_error">Villa kom upp við að reyna að færa þessa skrá eða möppu</string>
+  <string name="forbidden_permissions_move">til að færa þessa skrá</string>
+  <string name="copy_file_not_found">Get ekki afritað. Athugaðu hvort skráin sé til</string>
+  <string name="copy_file_invalid_overwrite">Skráin er þegar til í úttaksmöppunni</string>
+  <string name="copy_file_error">Villa kom upp við að reyna að afrita þessa skrá eða möppu</string>
+  <string name="forbidden_permissions_copy">til að afrita þessa skrá</string>
+  <string name="prefs_category_instant_uploading">Beinar innsendingar</string>
   <string name="prefs_category_details">Nánar</string>
+  <string name="prefs_instant_video_upload_path_title">Innsendingarslóð myndskeiða</string>
+  <string name="sync_folder_failed_content">Ekki var hægt að ljúka samstillingu á %1$s möppunni</string>
+  <string name="shared_subject_header">deilt</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="subject_shared_with_you">\"%1$s\" hefur verið deilt með þér</string>
+  <string name="auth_refresh_button">Endurlesa tengingu</string>
   <string name="auth_host_address">Host nafn netþjóns</string>
+  <string name="common_error_out_memory">Ekki nægilegt minni</string>
   <string name="username">Notendanafn</string>
   <string name="file_list__footer__folder">1 mappa</string>
+  <string name="file_list__footer__folders">%1$d möppur</string>
   <string name="file_list__footer__file">1 skrá</string>
+  <string name="file_list__footer__file_and_folder">1 skrá, 1 mappa</string>
+  <string name="file_list__footer__file_and_folders">1 skrá, %1$d möppur</string>
+  <string name="file_list__footer__files">%1$d skrár</string>
+  <string name="file_list__footer__files_and_folder">%1$d skrár, 1 mappa</string>
+  <string name="file_list__footer__files_and_folders">%1$d skrár, %2$d möppur</string>
+  <string name="prefs_instant_behaviour_dialogTitle">Upprunaleg skrá verður...</string>
+  <string name="prefs_instant_behaviour_title">Upprunaleg skrá verður...</string>
+  <string name="upload_copy_files">Afrita skrá</string>
+  <string name="upload_move_files">Færa skrá</string>
+  <string name="pref_behaviour_entries_keep_file">áfram í upprunalegri möppu</string>
+  <string name="pref_behaviour_entries_move">færð í forritsmöppu</string>
   <string name="share_dialog_title">Deiling</string>
+  <string name="share_file">Deila %1$s</string>
+  <string name="share_with_user_section_title">Deila með notendum eða hópum</string>
+  <string name="share_no_users">Engum gögnum ennþá deilt með notendum</string>
+  <string name="share_add_user_or_group">Bæta við notanda eða hóp</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_via_link_password_title">Öruggt</string>
+  <string name="share_via_link_edit_permission_label">Leyfa breytingar</string>
+  <string name="share_get_public_link_button">Ná í tengil</string>
+  <string name="share_with_title">Deila með ...</string>
+  <string name="share_with_edit_title">Deila með %1$s</string>
   <string name="share_search">Leita</string>
   <string name="search_users_and_groups_hint">Leita að notendum eða hópum</string>
   <string name="share_group_clarification">%1$s (hópur)</string>
+  <string name="share_remote_clarification">%1$s (fjartengt)</string>
+  <string name="share_known_remote_clarification">%1$s ( á %2$s )</string>
+  <string name="share_sharee_unavailable">Því miður, deiling gagna með notendum innan forrita er ekki leyfð í þessari útgáfu þjónsins. 
+\nHafðu samband við kerfisstjóra</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>
@@ -117,6 +362,9 @@
   <string name="edit_share_done">lokið</string>
   <string name="action_switch_grid_view">Reitir</string>
   <string name="action_switch_list_view">Listi</string>
+  <string name="manage_space_title">Sýsla með geymslurými</string>
+  <string name="manage_space_description">Stillingar, gagnagrunnur og skilríki þjóna verður eytt endanlega úr gögnum %1$s. \n\nSóttar skrár verða skildar eftir ósnertar.\n\nÞetta ferli getur tekið drjúgan tíma.</string>
   <string name="manage_space_clear_data">Hreinsa gögn</string>
   <string name="manage_space_error">Ekki tókst að eyða öllum skrám.</string>
+  <string name="permission_storage_access">Aukinna heimilda er krafist til að geta sent inn og sótt skrár.</string>
 </resources>

+ 4 - 0
res/values-it/strings.xml

@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">lasciato nella cartella originale</string>
   <string name="pref_behaviour_entries_move">spostato nella cartella dell\'applicazione</string>
   <string name="share_dialog_title">Condivisione</string>
+  <string name="share_file">Condividi %1$s</string>
   <string name="share_with_user_section_title">Condividi con utenti e gruppi</string>
   <string name="share_no_users">Ancora nessun dato condiviso con gli utenti </string>
   <string name="share_add_user_or_group">Aggiungi utente o gruppo</string>
@@ -348,7 +349,10 @@
   <string name="share_via_link_expiration_date_label">Imposta data di scadenza</string>
   <string name="share_via_link_password_label">Proteggi con password</string>
   <string name="share_via_link_password_title">Protetto</string>
+  <string name="share_via_link_edit_permission_label">Consenti la modifica</string>
   <string name="share_get_public_link_button">Ottieni collegamento</string>
+  <string name="share_with_title">Condividi con...</string>
+  <string name="share_with_edit_title">Condividi con %1$s</string>
   <string name="share_search">Cerca</string>
   <string name="search_users_and_groups_hint">Cerca utenti e gruppi</string>
   <string name="share_group_clarification">%1$s (gruppo)</string>

+ 1 - 0
res/values-ja-rJP/strings.xml

@@ -349,6 +349,7 @@
   <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_via_link_edit_permission_label">編集を許可</string>
   <string name="share_get_public_link_button">リンクを取得</string>
   <string name="share_search">検索</string>
   <string name="search_users_and_groups_hint">ユーザーとグループを検索</string>

+ 1 - 0
res/values-kn/strings.xml

@@ -42,6 +42,7 @@
   <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_edit_permission_label">ಸಂಪಾದನೆಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ</string>
   <string name="share_search">ಹುಡುಕು</string>
   <string name="share_privilege_can_share">ಹಂಚಿಕೊಳ್ಳಬಹುದು</string>
   <string name="share_privilege_can_edit">ಸಂಪಾದಿಸಬಹುದು</string>

+ 1 - 0
res/values-ko/strings.xml

@@ -307,6 +307,7 @@
   <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_via_link_edit_permission_label">편집 허용</string>
   <string name="share_get_public_link_button">링크 얻기</string>
   <string name="share_search">검색</string>
   <string name="search_users_and_groups_hint">유저와 그룹 검색하기</string>

+ 1 - 0
res/values-lt-rLT/strings.xml

@@ -307,6 +307,7 @@
   <string name="share_via_link_expiration_date_label">Nustatykite galiojimo laiką</string>
   <string name="share_via_link_password_label">Apsaugotas slaptažodžiu</string>
   <string name="share_via_link_password_title">Apsaugota</string>
+  <string name="share_via_link_edit_permission_label">Leisti redaguoti</string>
   <string name="share_get_public_link_button">Gauti nuorodą</string>
   <string name="share_search">Ieškoti</string>
   <string name="search_users_and_groups_hint">Surasti vartotoją ar grupę</string>

+ 1 - 0
res/values-mk/strings.xml

@@ -267,6 +267,7 @@
   <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_edit_permission_label">Овозможи уредување</string>
   <string name="share_search">Барај</string>
   <string name="share_privilege_can_share">може да споделува</string>
   <string name="share_privilege_can_edit">може да се измени</string>

+ 1 - 0
res/values-nb-rNO/strings.xml

@@ -348,6 +348,7 @@
   <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_via_link_edit_permission_label">Tillat redigering</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>

+ 4 - 0
res/values-nl/strings.xml

@@ -344,6 +344,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="pref_behaviour_entries_keep_file">bewaard in originele map</string>
   <string name="pref_behaviour_entries_move">verplaatst naar app map</string>
   <string name="share_dialog_title">Delen</string>
+  <string name="share_file">Deel %1$s</string>
   <string name="share_with_user_section_title">Delen met gebruikers en groepen</string>
   <string name="share_no_users">Nog geen gegevens met gebruikers gedeeld</string>
   <string name="share_add_user_or_group">Voeg gebruiker of groep toe</string>
@@ -351,7 +352,10 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="share_via_link_expiration_date_label">Stel vervaldatum in</string>
   <string name="share_via_link_password_label">Wachtwoord beveiligd</string>
   <string name="share_via_link_password_title">Beveiligd</string>
+  <string name="share_via_link_edit_permission_label">Toestaan bewerken</string>
   <string name="share_get_public_link_button">Ophalen link</string>
+  <string name="share_with_title">Deel met ...</string>
+  <string name="share_with_edit_title">Deel met %1$s</string>
   <string name="share_search">Zoeken</string>
   <string name="search_users_and_groups_hint">Zoeken naar gebruikers en groepen</string>
   <string name="share_group_clarification">%1$s (groep)</string>

+ 1 - 0
res/values-oc/strings.xml

@@ -301,6 +301,7 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an
   <string name="share_via_link_section_title">Partejar lo ligam</string>
   <string name="share_via_link_expiration_date_label">Especificar una data d\'expiracion</string>
   <string name="share_via_link_password_label">Protegir per un senhal</string>
+  <string name="share_via_link_edit_permission_label">Permetre la modificacion</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>

+ 1 - 0
res/values-pl/strings.xml

@@ -348,6 +348,7 @@
   <string name="share_via_link_expiration_date_label">Ustaw datę wygaśnięcia</string>
   <string name="share_via_link_password_label">Zabezpieczone hasłem</string>
   <string name="share_via_link_password_title">Zabezpieczone</string>
+  <string name="share_via_link_edit_permission_label">Pozwól na edycję</string>
   <string name="share_get_public_link_button">Pobierz link</string>
   <string name="share_search">Wyszukaj</string>
   <string name="search_users_and_groups_hint">Szukaj użytkowników i grup</string>

+ 4 - 0
res/values-pt-rBR/strings.xml

@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">manter na pasta original</string>
   <string name="pref_behaviour_entries_move">movido para a pasta app</string>
   <string name="share_dialog_title">Compartilhamento</string>
+  <string name="share_file">Compartilhar %1$s</string>
   <string name="share_with_user_section_title">Compartilhar com usuários e grupos</string>
   <string name="share_no_users">Ainda não existe nenhum dado compartilhado com usuários</string>
   <string name="share_add_user_or_group">Adicionar usuário ou grupo</string>
@@ -348,7 +349,10 @@
   <string name="share_via_link_expiration_date_label">Definir data de expiração</string>
   <string name="share_via_link_password_label">Proteger com senha</string>
   <string name="share_via_link_password_title">Asegurado</string>
+  <string name="share_via_link_edit_permission_label">Permitir edição</string>
   <string name="share_get_public_link_button">Obter link</string>
+  <string name="share_with_title">Compartilhar com …</string>
+  <string name="share_with_edit_title">Compartilhar com %1$s</string>
   <string name="share_search">Perquisar</string>
   <string name="search_users_and_groups_hint">Pesquisar usuários e grupos</string>
   <string name="share_group_clarification">%1$s (grupo)</string>

+ 5 - 1
res/values-pt-rPT/strings.xml

@@ -124,7 +124,7 @@
   <string name="sync_fail_in_favourites_content">Não foi possível sincronizar  o conteúdo de %1$d ficheiros  (%2$d conflitos)</string>
   <string name="sync_foreign_files_forgotten_ticker">Alguns ficheiros locais ficaram esquecidos</string>
   <string name="sync_foreign_files_forgotten_content">Nao foi possivel copiar os ficheiros %1$d da pasta %2$s para</string>
-  <string name="sync_foreign_files_forgotten_explanation">Tal como na versão 1.3.16, os ficheiros que foram enviados deste dispositivo são copiados para a pasta local %1$s para prevenir perda de dados quando um ficheiro é partilhado com várias contas.\n\nDevido a esta alteração, todos os ficheiros das versões anteriores foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão deste processo durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover o link para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar o link para %4$s. \n\nEm baixo estão listados ficheiro(s) locais e remotos em %5$s que foram ligados.</string>
+  <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os ficheiros que forem enviados deste dispositivo são copiados para a pasta local %1$s para prevenir perda de dados quando um ficheiro é sincronizado com várias contas.\n\nDevido a esta alteração, todos os ficheiros subidos em as versões anteriores desta app foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão deste processo durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover o link para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar o link para %4$s.\n\nEm baixo estão listados os ficheiro(s) locais e remotos em %5$s que foram ligados.</string>
   <string name="sync_current_folder_was_removed">A pasta %1$s já não existe</string>
   <string name="foreign_files_move">Mover Todos</string>
   <string name="foreign_files_success">Foram movidos todos os ficheiros</string>
@@ -339,6 +339,7 @@
   <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_file">Partilhar %1$s</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 utilizador ou grupo</string>
@@ -346,7 +347,10 @@
   <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_via_link_edit_permission_label">Permitir edição</string>
   <string name="share_get_public_link_button">Obter ligação</string>
+  <string name="share_with_title">Partilhar com ...</string>
+  <string name="share_with_edit_title">Partilhar com %1$s</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>

+ 1 - 0
res/values-ro/strings.xml

@@ -287,6 +287,7 @@
   <string name="share_via_link_section_title">Partajază legătură</string>
   <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_via_link_edit_permission_label">Permite editarea</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>

+ 6 - 0
res/values-ru/strings.xml

@@ -342,6 +342,7 @@
   <string name="pref_behaviour_entries_keep_file">остался в исходной папке</string>
   <string name="pref_behaviour_entries_move">перемещен в папку приложения</string>
   <string name="share_dialog_title">Общий доступ</string>
+  <string name="share_file">Поделиться %1$s</string>
   <string name="share_with_user_section_title">Поделиться с пользователями и группами</string>
   <string name="share_no_users">Нет данных используемых совместно с другими пользователями</string>
   <string name="share_add_user_or_group">Добавить пользователя или группу</string>
@@ -349,10 +350,15 @@
   <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_via_link_edit_permission_label">Разрешить редактирование</string>
   <string name="share_get_public_link_button">Получить ссылку</string>
+  <string name="share_with_title">Поделиться с …</string>
+  <string name="share_with_edit_title">Поделиться с %1$s</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_remote_clarification">%1$s (в общем доступе)</string>
+  <string name="share_known_remote_clarification">%1$s ( в %2$s )</string>
   <string name="share_sharee_unavailable">Извините, версия вашего сервера не позволяет поделиться с пользователями через клиент. \nПожалуйста обратитесь к администратору</string>
   <string name="share_privilege_can_share">можно поделиться</string>
   <string name="share_privilege_can_edit">можно редактировать</string>

+ 1 - 0
res/values-sk-rSK/strings.xml

@@ -300,6 +300,7 @@
   <string name="share_via_link_section_title">Zdieľať linku</string>
   <string name="share_via_link_expiration_date_label">Nastaviť dátum expirácie</string>
   <string name="share_via_link_password_label">Chrániť heslom</string>
+  <string name="share_via_link_edit_permission_label">Povoliť úpravy</string>
   <string name="share_search">Hľadať</string>
   <string name="search_users_and_groups_hint">Vyhľadať používateľov alebo skupiny</string>
   <string name="share_group_clarification">%1$s (skupina)</string>

+ 4 - 0
res/values-sl/strings.xml

@@ -341,6 +341,7 @@
   <string name="pref_behaviour_entries_keep_file">ohrani v izvorni mapi</string>
   <string name="pref_behaviour_entries_move">premakni v mapo programa</string>
   <string name="share_dialog_title">Souporaba</string>
+  <string name="share_file">Omogoči souporabo %1$s</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>
@@ -348,7 +349,10 @@
   <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_via_link_edit_permission_label">Dovoli urejanje</string>
   <string name="share_get_public_link_button">Pridobi povezavo</string>
+  <string name="share_with_title">Omogoči souporabo z ...</string>
+  <string name="share_with_edit_title">Omogoči souporabo z %1$s</string>
   <string name="share_search">Poišči</string>
   <string name="search_users_and_groups_hint">Iskanje uporabnikov in skupin</string>
   <string name="share_group_clarification">%1$s (skupina)</string>

+ 4 - 0
res/values-sq/strings.xml

@@ -338,6 +338,7 @@
   <string name="pref_behaviour_entries_keep_file">mbajtur në dosjen origjinale</string>
   <string name="pref_behaviour_entries_move">u kalua te dosja e aplikacionit</string>
   <string name="share_dialog_title">Ndarje me të tjerët</string>
+  <string name="share_file">Ndajeni %1$s</string>
   <string name="share_with_user_section_title">Ndajeni me përdorues dhe grupe</string>
   <string name="share_no_users">Ende pa të dhëna të ndara me përdorues</string>
   <string name="share_add_user_or_group">Shtoni përdorues ose grup</string>
@@ -345,7 +346,10 @@
   <string name="share_via_link_expiration_date_label">Caktoni datë skadimi</string>
   <string name="share_via_link_password_label">Mbroje me fjalëkalim</string>
   <string name="share_via_link_password_title">E siguruar</string>
+  <string name="share_via_link_edit_permission_label">Lejo përpunim</string>
   <string name="share_get_public_link_button">Merreni lidhjen</string>
+  <string name="share_with_title">Ndajeni me …</string>
+  <string name="share_with_edit_title">Ndajeni me %1$s</string>
   <string name="share_search">Kërko</string>
   <string name="search_users_and_groups_hint">Kërkoni për grupe dhe përdorues</string>
   <string name="share_group_clarification">%1$s (grup)</string>

+ 1 - 0
res/values-sr-rSP/strings.xml

@@ -74,6 +74,7 @@
   <string name="share_via_link_section_title">Veza deljenja</string>
   <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_via_link_edit_permission_label">Dozvoli uređivanje</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>

+ 1 - 0
res/values-sr/strings.xml

@@ -345,6 +345,7 @@
   <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_via_link_edit_permission_label">уређивање</string>
   <string name="share_get_public_link_button">Добави везу</string>
   <string name="share_search">Тражи</string>
   <string name="search_users_and_groups_hint">Претражи кориснике и групе</string>

+ 1 - 0
res/values-sv/strings.xml

@@ -348,6 +348,7 @@
   <string name="share_via_link_expiration_date_label">Sätt utgångsdatum</string>
   <string name="share_via_link_password_label">Lösenordsskydda</string>
   <string name="share_via_link_password_title">Säkrad</string>
+  <string name="share_via_link_edit_permission_label">Tillåt redigering</string>
   <string name="share_get_public_link_button">Hämta länk</string>
   <string name="share_search">Sök</string>
   <string name="search_users_and_groups_hint">Sök användare och grupper</string>

+ 1 - 0
res/values-th-rTH/strings.xml

@@ -345,6 +345,7 @@
   <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_via_link_edit_permission_label">อนุญาตให้แก้ไข</string>
   <string name="share_get_public_link_button">รับลิงค์</string>
   <string name="share_search">ค้นหา</string>
   <string name="search_users_and_groups_hint">ค้นหาผู้ใช้และกลุ่ม</string>

+ 1 - 0
res/values-tr/strings.xml

@@ -337,6 +337,7 @@
   <string name="share_via_link_expiration_date_label">Son kullanma tarihini ayarla</string>
   <string name="share_via_link_password_label">Parola koruması</string>
   <string name="share_via_link_password_title">Güvenli</string>
+  <string name="share_via_link_edit_permission_label">Düzenlemeye izin ver</string>
   <string name="share_get_public_link_button">Bağlantıyı al</string>
   <string name="share_search">Ara</string>
   <string name="search_users_and_groups_hint">Kullanıcı ve Grupları Ara</string>

+ 1 - 0
res/values-uk/strings.xml

@@ -313,6 +313,7 @@
   <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_edit_permission_label">Дозволити редагування</string>
   <string name="share_search">Пошук</string>
   <string name="share_privilege_can_share">може ділитися з іншими</string>
   <string name="share_privilege_can_edit">може редагувати</string>

+ 1 - 0
res/values-zh-rCN/strings.xml

@@ -347,6 +347,7 @@
   <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_via_link_edit_permission_label">允许编辑</string>
   <string name="share_get_public_link_button">获取链接</string>
   <string name="share_search">搜索</string>
   <string name="search_users_and_groups_hint">搜索用户和组</string>

+ 36 - 0
res/values-zh-rTW/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">%1$s 安卓軟體</string>
   <string name="about_version">版本 %1$s</string>
   <string name="actionbar_sync">更新檔案列表</string>
   <string name="actionbar_upload">上傳檔案</string>
@@ -36,8 +37,11 @@
   <string name="prefs_instant_upload_summary">即時上傳相機照片</string>
   <string name="prefs_instant_video_upload">即時影像上傳</string>
   <string name="prefs_instant_video_upload_summary">將照相機所拍攝完成的影像即時上傳</string>
+  <string name="prefs_log_title">啓用記錄</string>
   <string name="prefs_log_summary">這個用來記錄執行的動作以找出問題點</string>
+  <string name="prefs_log_title_history">歷史記錄</string>
   <string name="prefs_log_summary_history">顯示之前的記錄檔</string>
+  <string name="prefs_log_delete_history_button">刪除記錄</string>
   <string name="prefs_help">說明</string>
   <string name="prefs_recommend">推薦給朋友</string>
   <string name="prefs_feedback">反饋</string>
@@ -46,6 +50,7 @@
   <string name="prefs_remember_last_upload_location_summary">記住上次分享上傳位置</string>
   <string name="recommend_subject">在您的手機中試用%1$s!</string>
   <string name="recommend_text">我想邀請您在您的手機上使用 %1$s ! 可以由這兒下載: %2$s</string>
+  <string name="auth_check_server">檢查伺服器</string>
   <string name="auth_host_url">伺服器位址 https://...</string>
   <string name="auth_username">使用者名稱</string>
   <string name="auth_password">密碼</string>
@@ -56,6 +61,7 @@
   <string name="uploader_btn_new_folder_text">新資料夾</string>
   <string name="uploader_top_message">選取上傳目錄:</string>
   <string name="uploader_wrn_no_account_title">找不到帳號</string>
+  <string name="uploader_wrn_no_account_text">無%1$s帳號,請先建立帳號。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
   <string name="uploader_wrn_no_account_quit_btn_text">離開</string>
   <string name="uploader_wrn_no_content_title">沒有上載的內容</string>
@@ -65,6 +71,7 @@
   <string name="file_list_seconds_ago">幾秒前</string>
   <string name="file_list_empty">這裡還沒有東西,上傳一些吧!</string>
   <string name="file_list_loading">載入中…</string>
+  <string name="file_list_no_app_for_file_type">檔案格式無對應app可開啟</string>
   <string name="local_file_list_empty">這個目錄中沒有任何檔案.</string>
   <string name="filedetails_select_file">在檔案上輕觸來顯示更多資訊。</string>
   <string name="filedetails_size">容量:</string>
@@ -74,31 +81,41 @@
   <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>
   <string name="common_loading">載入 …</string>
   <string name="common_error_unknown">未知的錯誤</string>
   <string name="about_title">關於</string>
   <string name="change_password">變更密碼</string>
+  <string name="delete_account">刪除帳號</string>
   <string name="create_account">建立帳號</string>
   <string name="upload_chooser_title">更新自 ...</string>
   <string name="uploader_info_dirname">資料夾名稱</string>
   <string name="uploader_upload_in_progress_ticker">更新中 ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% 上傳中 %2$s</string>
   <string name="uploader_upload_succeeded_ticker">更新成功</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s 已上傳</string>
   <string name="uploader_upload_failed_ticker">上傳失敗</string>
   <string name="uploader_upload_failed_content_single">上傳 %1$s 未完成</string>
+  <string name="uploader_upload_failed_credentials_error">上傳失敗,請重新登入。</string>
   <string name="downloader_download_in_progress_ticker">下載中 ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% 下載中 %2$s</string>
   <string name="downloader_download_succeeded_ticker">下載成功</string>
+  <string name="downloader_download_succeeded_content">%1$s 已下載</string>
   <string name="downloader_download_failed_ticker">下載失敗</string>
   <string name="downloader_download_failed_content">下載 %1$s 未完成</string>
   <string name="downloader_not_downloaded_yet">尚未下載</string>
+  <string name="downloader_download_failed_credentials_error">下載失敗,請重新登入。</string>
   <string name="common_choose_account">選擇帳號</string>
+  <string name="sync_fail_ticker">同步失敗</string>
+  <string name="sync_fail_ticker_unauthorized">同步失敗,請重新登入。</string>
   <string name="sync_fail_content_unauthorized">無效的密碼 %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">出現衝突</string>
   <string name="sync_conflicts_in_favourites_content">%1$d 持續同步未被同步的檔案</string>
@@ -113,8 +130,10 @@
   <string name="foreign_files_fail">部份文件無法被移動</string>
   <string name="foreign_files_local_text">本地: %1$s</string>
   <string name="foreign_files_remote_text">遠端: %1$s</string>
+  <string name="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>
@@ -139,6 +158,8 @@
   <string name="media_rewind_description">重新播放按鍵</string>
   <string name="media_play_pause_description">播放或暫停按鍵</string>
   <string name="media_forward_description">快轉按鍵</string>
+  <string name="auth_getting_authorization">授權中... ...</string>
+  <string name="auth_trying_to_login">登入中... ...</string>
   <string name="auth_no_net_conn_title">沒有網際網路連線</string>
   <string name="auth_nossl_plain_ok_title">安全連線不可用。</string>
   <string name="auth_connection_established">連線已建立</string>
@@ -150,6 +171,7 @@
   <string name="auth_unknown_host_title">找不到伺服器</string>
   <string name="auth_incorrect_path_title">找不到伺服器</string>
   <string name="auth_timeout_title">伺服器回應逾時</string>
+  <string name="auth_incorrect_address_title">伺服器地址格式錯誤</string>
   <string name="auth_ssl_general_error_title">SSL 初始化失敗</string>
   <string name="auth_ssl_unverified_server_title">無法驗證 SSL 伺服器身份</string>
   <string name="auth_bad_oc_version_title">無法辨識的伺服器版本</string>
@@ -159,11 +181,14 @@
   <string name="auth_oauth_error">未成功登入</string>
   <string name="auth_oauth_error_access_denied">被授登伺服器拒絕登入</string>
   <string name="auth_expired_oauth_token_toast">你的登入授權已過期. 請再次登入</string>
+  <string name="auth_expired_basic_auth_toast">請輸入目前的密碼</string>
   <string name="auth_expired_saml_sso_token_toast">您的連接已逾期. 請重新連線.</string>
+  <string name="auth_connecting_auth_server">連接驗證伺服器中...</string>
   <string name="auth_unsupported_auth_method">伺服器不支援這種認證方式</string>
   <string name="auth_unsupported_multiaccount">%1$s 不支援複數賬戶</string>
   <string name="auth_fail_get_user_name">你的伺服器並沒有傳回正確的使用者 ID, 請聯絡伺服器的管理員
 	</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>
@@ -221,6 +246,8 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
+  <string name="instant_upload_on_wifi">經由 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>
@@ -236,6 +263,8 @@
   <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>
@@ -252,13 +281,17 @@
   <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="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 Android 應用程式記錄</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>
@@ -269,6 +302,8 @@
   <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="prefs_category_details">詳細資料</string>
   <string name="shared_subject_header">以分享的</string>
@@ -292,6 +327,7 @@
   <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_edit_permission_label">允許編輯</string>
   <string name="share_search">搜尋</string>
   <string name="share_privilege_can_share">可分享</string>
   <string name="share_privilege_can_edit">可編輯</string>

+ 3 - 0
res/values/strings.xml

@@ -403,6 +403,7 @@
     <string name="pref_behaviour_entries_move">moved to app folder</string>
 
     <string name="share_dialog_title">Sharing</string>
+    <string name="share_file">Share %1$s</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>
@@ -412,6 +413,8 @@
     <string name="share_via_link_password_title">Secured</string>
     <string name="share_via_link_edit_permission_label">Allow editing</string>
     <string name="share_get_public_link_button">Get link</string>
+    <string name="share_with_title">Share with &#8230;</string>
+    <string name="share_with_edit_title">Share with %1$s</string>
 
     <string name="share_search">Search</string>
 

+ 23 - 0
res/values/styles.xml

@@ -30,6 +30,7 @@
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 		<item name="android:windowBackground">@color/background_color</item>
+		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 	</style>
 
 	<!-- seperate action bar style for activities without an action bar -->
@@ -42,6 +43,7 @@
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 		<item name="android:windowBackground">@color/background_color</item>
+		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
     </style>
 
 	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
@@ -51,10 +53,12 @@
 	<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:textColorPrimary">@color/primary</item>
+		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 	</style>
 
 	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
+		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 	</style>
 
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
@@ -65,6 +69,15 @@
 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
 	</style>
 
+	<style name="ownCloud.SearchView" parent="Widget.AppCompat.SearchView">
+		<!-- Close button icon -->
+		<item name="closeIcon">@drawable/ic_close</item>
+		<!-- Search button icon -->
+		<item name="searchIcon">@drawable/ic_search</item>
+		<!-- Layout for query suggestion rows // unused for now, staying with the standard layout -->
+		<!--<item name="suggestionRowLayout">...</item>-->
+	</style>
+
 	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
 		<item name="colorButtonNormal">@color/primary</item>
 	</style>
@@ -132,6 +145,16 @@
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
 	</style>
 
+	<style name="Theme.ownCloud.Dialog.NoTitle" parent="style/Theme.ownCloud.Dialog">
+		<item name="windowNoTitle">true</item>
+		<item name="colorAccent">@color/owncloud_blue_accent</item>
+	</style>
+
+	<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="style/Theme.AppCompat.Light.Dialog.Alert">
+		<item name="windowNoTitle">false</item>
+		<item name="colorAccent">@color/owncloud_blue_accent</item>
+	</style>
+
 	<style name="menu_labels_style">
 		<item name="android:background">@drawable/fab_label_background</item>
 		<item name="android:textColor">@color/fab_white</item>

+ 7 - 1
src/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -63,6 +63,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
     private static final String[] COLUMNS = {
             BaseColumns._ID,
             SearchManager.SUGGEST_COLUMN_TEXT_1,
+            SearchManager.SUGGEST_COLUMN_ICON_1,
             SearchManager.SUGGEST_COLUMN_INTENT_DATA
     };
 
@@ -122,7 +123,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
      * @param selection     Expected to be NULL.
      * @param selectionArgs Expected to be NULL.
      * @param sortOrder     Expected to be NULL.
-     * @return Cursor with users and groups in the ownCloud server that match 'userQuery'.
+     * @return              Cursor with users and groups in the ownCloud server that match 'userQuery'.
      */
     @Nullable
     @Override
@@ -171,6 +172,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
             Iterator<JSONObject> namesIt = names.iterator();
             JSONObject item;
             String displayName = null;
+            int icon = 0;
             Uri dataUri = null;
             int count = 0;
 
@@ -192,8 +194,10 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
                     if (ShareType.GROUP.getValue() == type) {
                         displayName = getContext().getString(R.string.share_group_clarification, userName);
+                        icon = R.drawable.ic_group;
                         dataUri = Uri.withAppendedPath(groupBaseUri, shareWith);
                     } else if (ShareType.FEDERATED.getValue() == type && federatedShareAllowed) {
+                        icon = R.drawable.ic_user;
                         if (userName.equals(shareWith)) {
                             displayName = getContext().getString(R.string.share_remote_clarification, userName);
                         } else {
@@ -204,6 +208,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
                         dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
                     } else if (ShareType.USER.getValue() == type) {
                         displayName = userName;
+                        icon = R.drawable.ic_user;
                         dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
                     }
 
@@ -211,6 +216,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
                         response.newRow()
                             .add(count++)             // BaseColumns._ID
                             .add(displayName)         // SearchManager.SUGGEST_COLUMN_TEXT_1
+                            .add(icon)                // SearchManager.SUGGEST_COLUMN_ICON_1
                             .add(dataUri);
                     }
                 }

+ 2 - 2
src/com/owncloud/android/ui/activity/Uploader.java

@@ -243,7 +243,7 @@ public class Uploader extends FileActivity
             });
             return pDialog;
         case DIALOG_NO_ACCOUNT:
-            builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setIcon(R.drawable.ic_warning);
             builder.setTitle(R.string.uploader_wrn_no_account_title);
             builder.setMessage(String.format(
                     getString(R.string.uploader_wrn_no_account_text),
@@ -309,7 +309,7 @@ public class Uploader extends FileActivity
             });
             return builder.create();
         case DIALOG_NO_STREAM:
-            builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setIcon(R.drawable.ic_warning);
             builder.setTitle(R.string.uploader_wrn_no_content_title);
             builder.setMessage(R.string.uploader_wrn_no_content_text);
             builder.setCancelable(false);

+ 5 - 0
src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java

@@ -21,6 +21,7 @@
 package com.owncloud.android.ui.adapter;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -76,11 +77,15 @@ public class ShareUserListAdapter extends ArrayAdapter {
             OCShare share = mShares.get(position);
 
             TextView userName = (TextView) view.findViewById(R.id.userOrGroupName);
+            ImageView iconView = (ImageView) view.findViewById(R.id.icon);
             String name = share.getSharedWithDisplayName();
+            Drawable icon = getContext().getResources().getDrawable(R.drawable.ic_user);
             if (share.getShareType() == ShareType.GROUP) {
                 name = getContext().getString(R.string.share_group_clarification, name);
+                icon = getContext().getResources().getDrawable(R.drawable.ic_group);
             }
             userName.setText(name);
+            iconView.setImageDrawable(icon);
 
             /// bind listener to edit privileges
             final ImageView editShareButton = (ImageView) view.findViewById(R.id.editShareButton);

+ 2 - 1
src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java

@@ -83,7 +83,8 @@ public class SharePasswordDialogFragment extends DialogFragment
         inputText.requestFocus();
 
         // Build the dialog
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
+                R.style.Theme_ownCloud_Dialog_NoButtonBarStyle);
         builder.setView(v)
                .setPositiveButton(R.string.common_ok, this)
                .setNegativeButton(R.string.common_cancel, this)

+ 15 - 11
src/com/owncloud/android/ui/fragment/EditShareFragment.java

@@ -24,12 +24,13 @@ package com.owncloud.android.ui.fragment;
 import android.accounts.Account;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.Switch;
+import android.widget.TextView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -130,6 +131,9 @@ public class EditShareFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.edit_share_layout, container, false);
 
+        ((TextView)view.findViewById(R.id.editShareTitle)).setText(
+                getResources().getString(R.string.share_with_edit_title, mShare.getSharedWithDisplayName()));
+
         // Setup layout
         refreshUiFromState(view);
 
@@ -224,7 +228,7 @@ public class EditShareFragment extends Fragment {
             implements CompoundButton.OnCheckedChangeListener {
 
         /**
-         * Called by every {@link Switch} and {@link CheckBox} in the fragment to update
+         * Called by every {@link SwitchCompat} and {@link CheckBox} in the fragment to update
          * the state of its associated permission.
          *
          * @param compound  {@link CompoundButton} toggled by the user
@@ -309,7 +313,7 @@ public class EditShareFragment extends Fragment {
         }
 
         /**
-         * Sync value of "can edit" {@link Switch} according to a change in one of its subordinate checkboxes.
+         * Sync value of "can edit" {@link SwitchCompat} according to a change in one of its subordinate checkboxes.
          *
          * If all the subordinates are disabled, "can edit" has to be disabled.
          *
@@ -427,23 +431,23 @@ public class EditShareFragment extends Fragment {
     }
 
     /**
-     * Shortcut to access {@link Switch} R.id.canShareSwitch
+     * Shortcut to access {@link SwitchCompat} R.id.canShareSwitch
      *
-     * @return  {@link Switch} R.id.canShareCheckBox or null if called before
+     * @return  {@link SwitchCompat} R.id.canShareCheckBox or null if called before
      *          {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} finished.
      */
-    private Switch getCanShareSwitch() {
-        return (Switch) getView().findViewById(R.id.canShareSwitch);
+    private SwitchCompat getCanShareSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.canShareSwitch);
     }
 
     /**
-     * Shortcut to access {@link Switch} R.id.canEditSwitch
+     * Shortcut to access {@link SwitchCompat} R.id.canEditSwitch
      *
-     * @return  {@link Switch} R.id.canEditSwitch or null if called before
+     * @return  {@link SwitchCompat} R.id.canEditSwitch or null if called before
      *          {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} finished.
      */
-    private Switch getCanEditSwitch() {
-        return (Switch) getView().findViewById(R.id.canEditSwitch);
+    private SwitchCompat getCanEditSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.canEditSwitch);
     }
 
     /**

+ 2 - 2
src/com/owncloud/android/ui/fragment/SearchShareesFragment.java

@@ -27,13 +27,13 @@ import android.app.SearchManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
-import android.widget.SearchView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
@@ -147,7 +147,7 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        getActivity().setTitle(R.string.share_dialog_title);
+        getActivity().setTitle(R.string.share_with_title);
 
         // Load data into the list
         refreshUsersOrGroupsListFromDB();

+ 24 - 26
src/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -27,6 +27,7 @@ import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatButton;
+import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,7 +37,6 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.ScrollView;
-import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -201,8 +201,8 @@ public class ShareFileFragment extends Fragment
             }
         }
         // Name
-        TextView filename = (TextView) view.findViewById(R.id.shareFileName);
-        filename.setText(mFile.getFileName());
+        TextView fileNameHeader = (TextView) view.findViewById(R.id.shareFileName);
+        fileNameHeader.setText(getResources().getString(R.string.share_file, mFile.getFileName()));
         // Size
         TextView size = (TextView) view.findViewById(R.id.shareFileSize);
         if (mFile.isFolder()) {
@@ -252,7 +252,7 @@ public class ShareFileFragment extends Fragment
      */
     private void initShareViaLinkListener(View shareView) {
         mOnShareViaLinkSwitchCheckedChangeListener = new OnShareViaLinkListener();
-        Switch shareViaLinkSwitch = (Switch) shareView.findViewById(R.id.shareViaLinkSectionSwitch);
+        SwitchCompat shareViaLinkSwitch = (SwitchCompat) shareView.findViewById(R.id.shareViaLinkSectionSwitch);
         shareViaLinkSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener);
     }
 
@@ -265,7 +265,7 @@ public class ShareFileFragment extends Fragment
         /**
          * Called by R.id.shareViaLinkSectionSwitch to create or delete a public link.
          *
-         * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkSectionSwitch
+         * @param switchView {@link SwitchCompat} toggled by the user, R.id.shareViaLinkSectionSwitch
          * @param isChecked  New switch state.
          */
         @Override
@@ -314,7 +314,7 @@ public class ShareFileFragment extends Fragment
     private void initExpirationListener(View shareView) {
         mOnExpirationDateInteractionListener = new OnExpirationDateInteractionListener();
 
-        ((Switch) shareView.findViewById(R.id.shareViaLinkExpirationSwitch)).
+        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkExpirationSwitch)).
                 setOnCheckedChangeListener(mOnExpirationDateInteractionListener);
 
         shareView.findViewById(R.id.shareViaLinkExpirationLabel).
@@ -333,7 +333,7 @@ public class ShareFileFragment extends Fragment
         /**
          * Called by R.id.shareViaLinkExpirationSwitch to set or clear the expiration date.
          *
-         * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkExpirationSwitch
+         * @param switchView {@link SwitchCompat} toggled by the user, R.id.shareViaLinkExpirationSwitch
          * @param isChecked  New switch state.
          */
         @Override
@@ -398,7 +398,7 @@ public class ShareFileFragment extends Fragment
     private void initPasswordListener(View shareView) {
         mOnPasswordInteractionListener = new OnPasswordInteractionListener();
 
-        ((Switch) shareView.findViewById(R.id.shareViaLinkPasswordSwitch)).
+        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkPasswordSwitch)).
                 setOnCheckedChangeListener(mOnPasswordInteractionListener);
 
         shareView.findViewById(R.id.shareViaLinkPasswordLabel).
@@ -418,7 +418,7 @@ public class ShareFileFragment extends Fragment
         /**
          * Called by R.id.shareViaLinkPasswordSwitch to set or clear the password.
          *
-         * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkPasswordSwitch
+         * @param switchView {@link SwitchCompat} toggled by the user, R.id.shareViaLinkPasswordSwitch
          * @param isChecked  New switch state.
          */
         @Override
@@ -466,7 +466,7 @@ public class ShareFileFragment extends Fragment
     private void initEditPermissionListener(View shareView) {
         mOnEditPermissionInteractionListener = new OnEditPermissionInteractionListener();
 
-        ((Switch) shareView.findViewById(R.id.shareViaLinkEditPermissionSwitch)).
+        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkEditPermissionSwitch)).
                 setOnCheckedChangeListener(mOnEditPermissionInteractionListener);
 
     }
@@ -480,7 +480,7 @@ public class ShareFileFragment extends Fragment
         /**
          * Called by R.id.shareViaLinkEditPermissionSwitch to set or clear the edit permission.
          *
-         * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkEditPermissionSwitch
+         * @param switchView {@link SwitchCompat} toggled by the user, R.id.shareViaLinkEditPermissionSwitch
          * @param isChecked  New switch state.
          */
         @Override
@@ -512,8 +512,6 @@ public class ShareFileFragment extends Fragment
         super.onActivityCreated(savedInstanceState);
         Log_OC.d(TAG, "onActivityCreated");
 
-        getActivity().setTitle(R.string.share_dialog_title);
-
         // Load known capabilities of the server from DB
         refreshCapabilitiesFromDB();
 
@@ -660,7 +658,7 @@ public class ShareFileFragment extends Fragment
     private void updatePublicShareSection() {
         if (mPublicShare != null && ShareType.PUBLIC_LINK.equals(mPublicShare.getShareType())) {
             /// public share bound -> expand section
-            Switch shareViaLinkSwitch = getShareViaLinkSwitch();
+            SwitchCompat shareViaLinkSwitch = getShareViaLinkSwitch();
             if (!shareViaLinkSwitch.isChecked()) {
                 // set null listener before setChecked() to prevent infinite loop of calls
                 shareViaLinkSwitch.setOnCheckedChangeListener(null);
@@ -690,7 +688,7 @@ public class ShareFileFragment extends Fragment
             });
 
             /// update state of expiration date switch and message depending on expiration date
-            Switch expirationDateSwitch = getExpirationDateSwitch();
+            SwitchCompat expirationDateSwitch = getExpirationDateSwitch();
             // set null listener before setChecked() to prevent infinite loop of calls
             expirationDateSwitch.setOnCheckedChangeListener(null);
             long expirationDate = mPublicShare.getExpirationDate();
@@ -715,7 +713,7 @@ public class ShareFileFragment extends Fragment
             );
 
             /// update state of password switch and message depending on password protection
-            Switch passwordSwitch = getPasswordSwitch();
+            SwitchCompat passwordSwitch = getPasswordSwitch();
             // set null listener before setChecked() to prevent infinite loop of calls
             passwordSwitch.setOnCheckedChangeListener(null);
             if (mPublicShare.isPasswordProtected()) {
@@ -735,7 +733,7 @@ public class ShareFileFragment extends Fragment
             );
 
             /// update state of the edit permission switch
-            Switch editPermissionSwitch = getEditPermissionSwitch();
+            SwitchCompat editPermissionSwitch = getEditPermissionSwitch();
 
             // set null listener before setChecked() to prevent infinite loop of calls
             editPermissionSwitch.setOnCheckedChangeListener(null);
@@ -755,7 +753,7 @@ public class ShareFileFragment extends Fragment
 
         } else {
             /// no public share -> collapse section
-            Switch shareViaLinkSwitch = getShareViaLinkSwitch();
+            SwitchCompat shareViaLinkSwitch = getShareViaLinkSwitch();
             if (shareViaLinkSwitch.isChecked()) {
                 shareViaLinkSwitch.setOnCheckedChangeListener(null);
                 getShareViaLinkSwitch().setChecked(false);
@@ -773,16 +771,16 @@ public class ShareFileFragment extends Fragment
 
     /// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes
 
-    private Switch getShareViaLinkSwitch() {
-        return (Switch) getView().findViewById(R.id.shareViaLinkSectionSwitch);
+    private SwitchCompat getShareViaLinkSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkSectionSwitch);
     }
 
     private View getExpirationDateSection() {
         return getView().findViewById(R.id.shareViaLinkExpirationSection);
     }
 
-    private Switch getExpirationDateSwitch() {
-        return (Switch) getView().findViewById(R.id.shareViaLinkExpirationSwitch);
+    private SwitchCompat getExpirationDateSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkExpirationSwitch);
     }
 
     private TextView getExpirationDateValue() {
@@ -793,8 +791,8 @@ public class ShareFileFragment extends Fragment
         return getView().findViewById(R.id.shareViaLinkPasswordSection);
     }
 
-    private Switch getPasswordSwitch() {
-        return (Switch) getView().findViewById(R.id.shareViaLinkPasswordSwitch);
+    private SwitchCompat getPasswordSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkPasswordSwitch);
     }
 
     private TextView getPasswordValue() {
@@ -805,8 +803,8 @@ public class ShareFileFragment extends Fragment
         return getView().findViewById(R.id.shareViaLinkEditPermissionSection);
     }
 
-    private Switch getEditPermissionSwitch() {
-        return (Switch) getView().findViewById(R.id.shareViaLinkEditPermissionSwitch);
+    private SwitchCompat getEditPermissionSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkEditPermissionSwitch);
     }
 
     private AppCompatButton getGetLinkButton() {