Browse Source

Merge branch 'master' of github.com:owncloud/android

tobiasKaminsky 9 năm trước cách đây
mục cha
commit
2c516e37f1
100 tập tin đã thay đổi với 1563 bổ sung436 xóa
  1. 1 1
      .classpath
  2. 1 0
      .gitignore
  3. 21 11
      AndroidManifest.xml
  4. 4 13
      CONTRIBUTING.md
  5. 1 3
      SETUP.md
  6. 5 0
      issue_template.md
  7. 1 1
      owncloud-android-library
  8. BIN
      res/drawable-hdpi/ic_close.png
  9. BIN
      res/drawable-hdpi/ic_group.png
  10. BIN
      res/drawable-hdpi/ic_refresh.png
  11. BIN
      res/drawable-hdpi/ic_search.png
  12. BIN
      res/drawable-hdpi/ic_user.png
  13. BIN
      res/drawable-mdpi/ic_cancel.png
  14. BIN
      res/drawable-mdpi/ic_close.png
  15. BIN
      res/drawable-mdpi/ic_group.png
  16. BIN
      res/drawable-mdpi/ic_refresh.png
  17. BIN
      res/drawable-mdpi/ic_search.png
  18. BIN
      res/drawable-mdpi/ic_uploads.png
  19. BIN
      res/drawable-mdpi/ic_user.png
  20. BIN
      res/drawable-xhdpi/ic_close.png
  21. BIN
      res/drawable-xhdpi/ic_group.png
  22. BIN
      res/drawable-xhdpi/ic_refresh.png
  23. BIN
      res/drawable-xhdpi/ic_search.png
  24. BIN
      res/drawable-xhdpi/ic_uploads.png
  25. BIN
      res/drawable-xhdpi/ic_user.png
  26. BIN
      res/drawable-xxhdpi/ic_close.png
  27. BIN
      res/drawable-xxhdpi/ic_group.png
  28. BIN
      res/drawable-xxhdpi/ic_refresh.png
  29. BIN
      res/drawable-xxhdpi/ic_search.png
  30. BIN
      res/drawable-xxhdpi/ic_uploads.png
  31. BIN
      res/drawable-xxhdpi/ic_user.png
  32. BIN
      res/drawable-xxxhdpi/ic_refresh.png
  33. BIN
      res/drawable-xxxhdpi/ic_uploads.png
  34. 46 0
      res/drawable/btn_small_round.xml
  35. BIN
      res/drawable/upload_failed.png
  36. BIN
      res/drawable/upload_finished.png
  37. BIN
      res/drawable/upload_in_progress.png
  38. 33 11
      res/layout/edit_share_layout.xml
  39. 11 0
      res/layout/errorhandling_showerror.xml
  40. 45 0
      res/layout/list_fragment_expandable.xml
  41. 2 1
      res/layout/password_dialog.xml
  42. 17 4
      res/layout/search_users_groups_layout.xml
  43. 208 165
      res/layout/share_file_layout.xml
  44. 21 15
      res/layout/share_user_item.xml
  45. 2 11
      res/layout/sso_dialog.xml
  46. 19 0
      res/layout/upload_list_group.xml
  47. 127 0
      res/layout/upload_list_item.xml
  48. 24 0
      res/layout/upload_list_layout.xml
  49. 34 0
      res/menu/upload_list_menu.xml
  50. 7 5
      res/values-ar/strings.xml
  51. 7 5
      res/values-az/strings.xml
  52. 9 5
      res/values-bg-rBG/strings.xml
  53. 4 5
      res/values-bn-rBD/strings.xml
  54. 0 1
      res/values-bn-rIN/strings.xml
  55. 4 1
      res/values-bs/strings.xml
  56. 11 5
      res/values-ca/strings.xml
  57. 31 5
      res/values-cs-rCZ/strings.xml
  58. 0 4
      res/values-cy-rGB/strings.xml
  59. 19 5
      res/values-da/strings.xml
  60. 14 5
      res/values-de-rAT/strings.xml
  61. 39 6
      res/values-de-rDE/strings.xml
  62. 38 5
      res/values-de/strings.xml
  63. 58 5
      res/values-el/strings.xml
  64. 18 5
      res/values-en-rGB/strings.xml
  65. 15 5
      res/values-eo/strings.xml
  66. 7 5
      res/values-es-rAR/strings.xml
  67. 1 5
      res/values-es-rCL/strings.xml
  68. 2 5
      res/values-es-rMX/strings.xml
  69. 38 5
      res/values-es/strings.xml
  70. 30 5
      res/values-et-rEE/strings.xml
  71. 10 5
      res/values-eu/strings.xml
  72. 15 5
      res/values-fa/strings.xml
  73. 25 5
      res/values-fi-rFI/strings.xml
  74. 28 5
      res/values-fr/strings.xml
  75. 16 5
      res/values-gl/strings.xml
  76. 21 5
      res/values-he/strings.xml
  77. 0 1
      res/values-hi/strings.xml
  78. 6 1
      res/values-hr/strings.xml
  79. 11 5
      res/values-hu-rHU/strings.xml
  80. 1 1
      res/values-hy/strings.xml
  81. 2 1
      res/values-ia/strings.xml
  82. 16 5
      res/values-id/strings.xml
  83. 251 2
      res/values-is/strings.xml
  84. 38 5
      res/values-it/strings.xml
  85. 16 5
      res/values-ja-rJP/strings.xml
  86. 2 5
      res/values-ka-rGE/strings.xml
  87. 1 2
      res/values-km/strings.xml
  88. 2 1
      res/values-kn/strings.xml
  89. 16 5
      res/values-ko/strings.xml
  90. 0 1
      res/values-ku-rIQ/strings.xml
  91. 5 3
      res/values-lb/strings.xml
  92. 1 0
      res/values-lo/strings.xml
  93. 9 5
      res/values-lt-rLT/strings.xml
  94. 7 5
      res/values-lv/strings.xml
  95. 7 5
      res/values-mk/strings.xml
  96. 1 0
      res/values-mn/strings.xml
  97. 4 1
      res/values-ms-rMY/strings.xml
  98. 38 5
      res/values-nb-rNO/strings.xml
  99. 38 5
      res/values-nl/strings.xml
  100. 1 4
      res/values-nn-rNO/strings.xml

+ 1 - 1
.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

+ 1 - 0
.gitignore

@@ -21,6 +21,7 @@ oc_workaround/local.properties
 oc_framework/local.properties
 oc_framework-test-project/local.properties
 tests/local.properties
+lint.xml
 
 # Mac .DS_Store files
 .DS_Store

+ 21 - 11
AndroidManifest.xml

@@ -71,7 +71,9 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity" />
-        <activity android:name=".ui.activity.Uploader" >
+        <activity android:name=".ui.activity.Uploader"
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -163,12 +165,23 @@
         <service android:name=".media.MediaService" />
 
         <activity android:name=".ui.activity.PassCodeActivity" />
-        <activity android:name=".ui.activity.ConflictsResolveActivity" />
-        <activity android:name=".ui.activity.GenericExplanationActivity" />
-        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity" />
-        <activity android:name=".ui.activity.LogHistoryActivity" />
-
-        <receiver android:name=".files.InstantUploadBroadcastReceiver" >
+        <activity android:name=".ui.activity.ConflictsResolveActivity"/>
+        <activity android:name=".ui.activity.GenericExplanationActivity"/>
+        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
+        
+        <activity android:name=".ui.activity.LogHistoryActivity"/>
+
+        <activity android:name=".ui.errorhandling.ErrorShowActivity" />
+        <activity android:name=".ui.activity.UploadListActivity" />
+        
+        <receiver android:name=".files.services.ConnectivityActionReceiver"
+		    android:enabled="true" android:label="ConnectivityActionReceiver">
+		    <intent-filter>
+		        <!--action android:name="android.net.conn.CONNECTIVITY_CHANGE"/-->
+		        <action android:name="android.net.wifi.STATE_CHANGE"/>
+		    </intent-filter>
+		</receiver>
+		<receiver android:name=".files.InstantUploadBroadcastReceiver">
             <intent-filter>
 
                 <!-- unofficially supported by many Android phones but not by HTC devices: -->
@@ -183,9 +196,6 @@
 
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
         </receiver>
         <receiver android:name=".files.BootupBroadcastReceiver" >
             <intent-filter>
@@ -208,7 +218,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>

+ 4 - 13
CONTRIBUTING.md

@@ -16,7 +16,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
 [template]: https://raw.github.com/owncloud/android/master/issue_template.md
-[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/user
 [forum]: http://forum.owncloud.org/
 [irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
 
@@ -35,19 +35,10 @@ Before we're able to merge your code into the ownCloud app for Android, you need
 
 ### 1. Fork and download android/master repository:
 
-NOTE: You must have the git installation folder in your environment variable PATH to perform the next operations.
+* Please follow [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) to setup ownCloud Android app work environment.
 
-* In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
-* In a command line prompt, clone your new repo: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
-* Move to the project folder with ```cd android```.
-* Checkout the remote branch 'master' in your own local branch: ```git checkout -b master remotes/origin/master```.
-* Pull any changes from your remote branch 'master': ```git pull origin master```
-* Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
-* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
-* Make sure you read [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) when you start working on this project.
 
-
-### 7. Create pull request:
+### 2. Create pull request:
 
 NOTE: You must sign the [Contributor Agreement][agreement] before your changes can be accepted!
 
@@ -56,7 +47,7 @@ NOTE: You must sign the [Contributor Agreement][agreement] before your changes c
 * Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
 * Enter description and send pull request.
 
-### 8. Create another pull request:
+### 3. Create another pull request:
 
 To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/master.
 

+ 1 - 3
SETUP.md

@@ -1,4 +1,3 @@
-
 These instructions will help you to set up your development environment, get the source code of the ownCloud for Android app and build it by yourself. If you want to help developing the app take a look to the [contribution guidelines][0].
 
 Sections 1) and 2) are common for any environment. The rest of the sections describe how to set up a project in different tool environments. Choose the build tool or IDE you prefer and follow the instructions in its specific section. Nowadays we recommend to use Android Studio (section 2), but the decision is up to you.
@@ -10,7 +9,7 @@ If you have any problem, remove the 'android' folder, start again from 1) and wo
 
 There are some tools needed, no matter what is your specific IDE or build tool of preference.
 
-[git][1] is used to access to the different versions of the ownCloud's source code. Download and install the version appropiate for your operating system from [here][2]. Add the full path to the 'bin/' directory from your git installation into the PATH variable of your environment so that it can be used from any location.
+[git][1] is used to access to the different versions of the ownCloud's source code. Download and install the version appropriate for your operating system from [here][2]. Add the full path to the 'bin/' directory from your git installation into the PATH variable of your environment so that it can be used from any location.
 
 The [Android SDK][3] is necessary to build the app. There are different options to install it in your system, depending of the IDE you decide to use. Check Google documentation about [installation][4] for more details on these options. After installing it, add the full path to the directories 'tools/' and 'platform-tools/' from your Android SDK installation into the PATH variable of your environment.
 
@@ -36,7 +35,6 @@ Next steps will assume you have a Github account and that you will get the code
 * Open a terminal and go on with the next steps in it.
 * Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
 * Move to the project folder with ```cd android```.
-* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout master remotes/origin/master```.
 * Pull any changes from your remote branch 'master': ```git pull origin master```
 * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
 * Make sure to get the latest changes from official android/master branch: ```git pull upstream master```

+ 5 - 0
issue_template.md

@@ -9,6 +9,11 @@ Tell us what happens instead
 2. 
 3. 
 
+
+Can this problem be reproduced with the official owncloud server?
+(url: https://demo.owncloud.org, user: test, password: test)
+
+
 ### Environment data
 Android version:
 

+ 1 - 1
owncloud-android-library

@@ -1 +1 @@
-Subproject commit 1007a80534827479b0874ae942c8c7dbe87cac35
+Subproject commit 39e3ddaa07b0943b034b34a84a33b4dc4c7475d0

BIN
res/drawable-hdpi/ic_close.png


BIN
res/drawable-hdpi/ic_group.png


BIN
res/drawable-hdpi/ic_refresh.png


BIN
res/drawable-hdpi/ic_search.png


BIN
res/drawable-hdpi/ic_user.png


BIN
res/drawable-mdpi/ic_cancel.png


BIN
res/drawable-mdpi/ic_close.png


BIN
res/drawable-mdpi/ic_group.png


BIN
res/drawable-mdpi/ic_refresh.png


BIN
res/drawable-mdpi/ic_search.png


BIN
res/drawable-mdpi/ic_uploads.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_refresh.png


BIN
res/drawable-xhdpi/ic_search.png


BIN
res/drawable-xhdpi/ic_uploads.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_refresh.png


BIN
res/drawable-xxhdpi/ic_search.png


BIN
res/drawable-xxhdpi/ic_uploads.png


BIN
res/drawable-xxhdpi/ic_user.png


BIN
res/drawable-xxxhdpi/ic_refresh.png


BIN
res/drawable-xxxhdpi/ic_uploads.png


+ 46 - 0
res/drawable/btn_small_round.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- pressed state of button, only change: color of actual button -->
+    <item android:state_pressed="true" >
+        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+            <!-- shadow, a little down and a little to the right -->
+            <item><shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#99000000" android:startColor="#99000000" />
+                </shape></item>
+            <!-- this is the actual button -->
+            <item android:bottom="1px" android:right="1px"><shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#47ffffff" android:startColor="#97ffffff" />
+                </shape></item>
+        </layer-list>
+    </item>
+ 
+    <!-- focused state of button, only change: color of actual button -->
+    <item android:state_focused="true" >
+        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+            <!-- shadow, a little down and a little to the right -->
+            <item><shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#22000000" android:startColor="#22000000" />
+                </shape></item>
+            <!-- this is the actual button -->
+            <item android:bottom="1px" android:right="1px"><shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#47ffffff" android:startColor="#97ffffff" />
+                </shape></item>
+        </layer-list>
+    </item>

   <!-- normal state of button. Template for other states. -->
+    <item>
+        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+            <!-- shadow, a little down and a little to the right -->
+            <item>
+                <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#55000000" android:startColor="#55000000" />
+                </shape></item>
+            <!-- this is the actual button -->
+            <item android:bottom="1px" android:right="1px">
+                <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+                    <gradient android:angle="270" android:endColor="#47ffffff" android:startColor="#97ffffff" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>

BIN
res/drawable/upload_failed.png


BIN
res/drawable/upload_finished.png


BIN
res/drawable/upload_in_progress.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>

+ 11 - 0
res/layout/errorhandling_showerror.xml

@@ -0,0 +1,11 @@
+<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" >
+
+    <TextView
+        android:id="@+id/errorTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</ScrollView>

+ 45 - 0
res/layout/list_fragment_expandable.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This must be a clone of list_fragment.xml 
+
+EXCEPT: ExpandableListView must be used for @+id/swipe_refresh_files_emptyView
+ -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="0dp"
+	android:layout_height="match_parent"
+	android:layout_weight="1" >
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_files"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <ExpandableListView 
+            android:id="@+id/list_root"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_files_emptyView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" >
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+	            <TextView
+			        android:id="@+id/empty_list_view"
+			        android:layout_width="match_parent"
+			        android:layout_height="wrap_content"
+			        android:gravity="center_vertical|center_horizontal"
+			        android:text="@string/empty"
+					android:layout_gravity="center"
+			        android:visibility="visible" />
+
+        </ScrollView>
+    </android.support.v4.widget.SwipeRefreshLayout>
+</FrameLayout>

+ 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>

+ 208 - 165
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,211 +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
-            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"
+        <LinearLayout
             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"
+                <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"
+                    />
+
+            </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:paddingTop="8dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/share_via_link_password_label"
-                android:textSize="16sp"
-                />
+                >
 
-            <TextView
-                android:id="@+id/shareViaLinkPasswordValue"
-                android:layout_width="wrap_content"
+                <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"
+                    />
+
+                <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"
+                    />
+
+                <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"
+                    />
+
+            </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/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/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>

+ 2 - 11
res/layout/sso_dialog.xml

@@ -17,17 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
     
-    <!--  com.owncloud.android.ui.dialog.SsoWebView
-    	android:layout_width="wrap_content"
-    	android:layout_height="wrap_content"
-        android:id="@+id/sso_webview"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:clickable="true"
-        /-->
-
 </RelativeLayout>

+ 19 - 0
res/layout/upload_list_group.xml

@@ -0,0 +1,19 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="3dp" >
+
+   <TextView
+       android:id="@+id/uploadListGroupName"
+       style="?android:attr/listSeparatorTextViewStyle"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center_vertical"
+       android:divider="@null"
+       android:dividerHeight="0dp"
+       android:ellipsize="middle"
+       android:showDividers="none"
+       android:textColor="@color/color_accent"
+       android:paddingLeft="16dp"
+	/>
+
+</RelativeLayout>

+ 127 - 0
res/layout/upload_list_item.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ListItemLayout"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/standard_half_padding"
+    android:paddingBottom="@dimen/standard_half_padding"
+    >
+
+    <FrameLayout
+        android:layout_width="60dp"
+        android:layout_height="72dp"
+        android:focusable="false"
+        android:focusableInTouchMode="false">
+
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_menu_archive" />
+  
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/upload_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:textColor="@color/textColor"
+            android:text="@string/placeholder_filename"
+            android:textSize="16sp" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/upload_file_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:ellipsize="middle"
+                android:singleLine="true"
+                android:text="@string/placeholder_filesize"
+                android:textSize="12sp"/>
+            <TextView
+                android:id="@+id/upload_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:text="@string/placeholder_timestamp"
+                android:textSize="12sp"/>
+            <TextView
+                android:id="@+id/upload_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:text="@string/uploads_view_upload_status_succeeded"
+                android:textSize="12sp"/>
+
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/upload_progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/upload_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:singleLine="true"
+            android:text="@string/auth_username"
+            android:textSize="12dip"/>
+
+        <TextView
+            android:id="@+id/upload_remote_path"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:text="@string/instant_upload_path"
+            android:textSize="12dip"/>
+
+    </LinearLayout>
+
+    
+    <FrameLayout
+        android:layout_width="56dp"
+        android:layout_height="72dp"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:layout_gravity="center_vertical"
+        android:paddingLeft="8dp"
+     >
+
+        <ImageButton
+            android:id="@+id/upload_right_button"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+     />
+
+	</FrameLayout>
+    
+    
+</LinearLayout>

+ 24 - 0
res/layout/upload_list_layout.xml

@@ -0,0 +1,24 @@
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/background_color">
+
+        <FrameLayout
+            android:id="@+id/upload_list_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+
+    <include
+        layout="@layout/drawer"
+        android:layout_width="240dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"/>
+
+</android.support.v4.widget.DrawerLayout>

+ 34 - 0
res/menu/upload_list_menu.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_retry_uploads"
+        android:title="@string/action_retry_uploads"/>
+    <item
+        android:id="@+id/action_clear_failed_uploads"
+        android:title="@string/action_clear_failed_uploads"/>
+    <item
+        android:id="@+id/action_clear_successfull_uploads"
+        android:title="@string/action_clear_successful_uploads"/>
+    <item
+        android:id="@+id/action_clear_finished_uploads"
+        android:title="@string/action_clear_finished_uploads"/>
+</menu>

+ 7 - 5
res/values-ar/strings.xml

@@ -51,19 +51,18 @@
   <string name="sync_string_files">الملفات</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">رفع</string>
-  <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_setup_btn_text">تهيئة</string>
   <string name="uploader_wrn_no_account_quit_btn_text">خروج</string>
-  <string name="uploader_wrn_no_content_title">لا يوجد محتوى للرفع</string>
-  <string name="uploader_wrn_no_content_text">لم يتم استلام أي محتوى. لا شيء للرفع.</string>
-  <string name="uploader_error_forbidden_content">%1$s  غير مسموح له بالوصول للمحتوى المشارك</string>
-  <string name="uploader_info_uploading">يتم الرفع</string>
   <string name="file_list_seconds_ago">منذ ثواني</string>
   <string name="file_list_empty">لا يوجد شيء هنا. إرفع بعض الملفات!</string>
   <string name="file_list_loading">تحميل ...</string>
   <string name="local_file_list_empty">لا توجد ملفات في هذا المجلد</string>
+  <string name="file_list_folder">مجلد</string>
+  <string name="file_list_folders">مجلدات</string>
+  <string name="file_list_file">ملف</string>
+  <string name="file_list_files">ملفات</string>
   <string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
   <string name="filedetails_size">الحجم :</string>
   <string name="filedetails_type">النوع :</string>
@@ -89,6 +88,8 @@
   <string name="uploader_upload_succeeded_ticker">تم الرفع بنجاح</string>
   <string name="uploader_upload_failed_ticker">فشل الرفع</string>
   <string name="uploader_upload_failed_content_single">لم يكتمل رفع  %1$s </string>
+  <string name="uploads_view_group_current_uploads">الحالي</string>
+  <string name="uploads_view_upload_status_unknown_fail">خطأ غير معروف. </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>
@@ -232,6 +233,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>

+ 7 - 5
res/values-az/strings.xml

@@ -47,18 +47,17 @@
   <string name="sync_string_files">Fayllar</string>
   <string name="setup_btn_connect">Qoşul</string>
   <string name="uploader_btn_upload_text">Serverə yüklə</string>
-  <string name="uploader_btn_new_folder_text">Yeni qovluq</string>
   <string name="uploader_top_message">Yüklənmə qovluöunu seçin:</string>
   <string name="uploader_wrn_no_account_title">Hesab tapılmadı</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Qurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıx</string>
-  <string name="uploader_wrn_no_content_title">Yükləmək üçün kontent yoxdur</string>
-  <string name="uploader_wrn_no_content_text">Heç bir kontent gəlmədi. Yukləmək üçün heçnə yoxdur.</string>
-  <string name="uploader_error_forbidden_content">%1$s yayımlanmış kontent üçün yetkili deyil</string>
-  <string name="uploader_info_uploading">Yüklənmə gedir</string>
   <string name="file_list_seconds_ago">saniyələr öncə</string>
   <string name="file_list_empty">Burda heçnə yoxdur. Nese yükləyin!</string>
   <string name="local_file_list_empty">Bu qovluqda heç bir fayl movcud deyil.</string>
+  <string name="file_list_folder">qovluq</string>
+  <string name="file_list_folders">qovluqlar</string>
+  <string name="file_list_file">fayl</string>
+  <string name="file_list_files">fayllar</string>
   <string name="filedetails_select_file">Faylın üstünə sıxın ki, əlavə məlumat ekrana çıxsın.</string>
   <string name="filedetails_size">Həcm:</string>
   <string name="filedetails_type">Tip:</string>
@@ -84,6 +83,9 @@
   <string name="uploader_upload_succeeded_ticker">Uğurla yükləndi</string>
   <string name="uploader_upload_failed_ticker">Yüklənmədə səhv baş verdi</string>
   <string name="uploader_upload_failed_content_single">%1$s yüklənməsi bitə bilməz</string>
+  <string name="uploads_view_group_current_uploads">Mövcud</string>
+  <string name="uploads_view_upload_status_succeeded">Bitmişdir</string>
+  <string name="uploads_view_upload_status_unknown_fail">Bəlli olmayan səhv baş verdi</string>
   <string name="downloader_download_in_progress_ticker">Endirilir ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Endirilir %2$s</string>
   <string name="downloader_download_succeeded_ticker">Endirim uğurla bitdi</string>

+ 9 - 5
res/values-bg-rBG/strings.xml

@@ -52,19 +52,18 @@
   <string name="sync_string_files">Файлове</string>
   <string name="setup_btn_connect">Свързване</string>
   <string name="uploader_btn_upload_text">Качване</string>
-  <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_setup_btn_text">Настройка</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Изход</string>
-  <string name="uploader_wrn_no_content_title">Няма съдържание за качване</string>
-  <string name="uploader_wrn_no_content_text">Не беше получено съдържание. Няма какво да се качи.</string>
-  <string name="uploader_error_forbidden_content">%1$s няма разрешен достъп до споделеното съдържание.</string>
-  <string name="uploader_info_uploading">Качване</string>
   <string name="file_list_seconds_ago">преди секунди</string>
   <string name="file_list_empty">Тук няма нищо. Качете нещо!</string>
   <string name="file_list_loading">Зарежда…</string>
   <string name="local_file_list_empty">Няма файлове в тази папка.</string>
+  <string name="file_list_folder">папка</string>
+  <string name="file_list_folders">папки</string>
+  <string name="file_list_file">файл</string>
+  <string name="file_list_files">файл</string>
   <string name="filedetails_select_file">Натисни върху файл, за да видиш допълнителна информация.</string>
   <string name="filedetails_size">Размер:</string>
   <string name="filedetails_type">Тип:</string>
@@ -90,6 +89,10 @@
   <string name="uploader_upload_succeeded_ticker">Качването е успешно.</string>
   <string name="uploader_upload_failed_ticker">Качването е неуспешно.</string>
   <string name="uploader_upload_failed_content_single">Качването на %1$s не може да бъде завършено.</string>
+  <string name="uploads_view_group_current_uploads">Текущ</string>
+  <string name="uploads_view_group_finished_uploads">Качени</string>
+  <string name="uploads_view_upload_status_succeeded">Завършено</string>
+  <string name="uploads_view_upload_status_unknown_fail">Непозната грешка.</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>
@@ -283,6 +286,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>

+ 4 - 5
res/values-bn-rBD/strings.xml

@@ -38,15 +38,10 @@
   <string name="sync_string_files">ফাইল</string>
   <string name="setup_btn_connect">সংযুক্ত হও</string>
   <string name="uploader_btn_upload_text">আপলোড</string>
-  <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_setup_btn_text">সেট-আপ</string>
   <string name="uploader_wrn_no_account_quit_btn_text">বন্ধ</string>
-  <string name="uploader_wrn_no_content_title">আপলোডের কনটেনট নেই</string>
-  <string name="uploader_wrn_no_content_text">কোন কনটেনট আসেনি৷ আপলোডের কনটেনট নেই</string>
-  <string name="uploader_error_forbidden_content">এই যৌথ কনটেন্ট এ %1$s এর প্রবেশ অনুমোদিত নয়</string>
-  <string name="uploader_info_uploading">আপলোড করা হচ্ছে</string>
   <string name="file_list_seconds_ago">সেকেন্ড পূর্বে</string>
   <string name="file_list_empty">এখানে কিছুই নেই। কিছু আপলোড করুন !</string>
   <string name="local_file_list_empty">এই ফোলডারে কোন ফাইল নেই</string>
@@ -75,6 +70,10 @@
   <string name="uploader_upload_succeeded_ticker">আপলোড সফল</string>
   <string name="uploader_upload_failed_ticker">আপলোড হয়নি</string>
   <string name="uploader_upload_failed_content_single">%1$s আপলোড সম্পন্ন করা যায়নি</string>
+  <string name="uploads_view_group_current_uploads">বর্তমান</string>
+  <string name="uploads_view_group_finished_uploads">আপলোড করা হয়েছে</string>
+  <string name="uploads_view_upload_status_succeeded">সুসম্পন্ন</string>
+  <string name="uploads_view_upload_status_unknown_fail">অজানা জটিলতা</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>

+ 0 - 1
res/values-bn-rIN/strings.xml

@@ -14,7 +14,6 @@
   <string name="prefs_imprint">অঙ্কিত করা</string>
   <string name="auth_username">ইউজারনেম</string>
   <string name="sync_string_files">ফাইলস</string>
-  <string name="uploader_btn_new_folder_text">নতুন ফোল্ডার</string>
   <string name="filedetails_download">ডাউনলোড করুন</string>
   <string name="action_share">শেয়ার</string>
   <string name="common_cancel">বাতিল করা</string>

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

@@ -18,7 +18,6 @@
   <string name="auth_password">Lozinka</string>
   <string name="sync_string_files">Datoteke</string>
   <string name="uploader_btn_upload_text">Učitaj</string>
-  <string name="uploader_btn_new_folder_text">Novi direktorij</string>
   <string name="filedetails_download">Preuzmite</string>
   <string name="action_share">Dijeli</string>
   <string name="common_yes">Da</string>
@@ -29,6 +28,9 @@
   <string name="common_error_unknown">Nepoznata greška</string>
   <string name="change_password">Promijeni lozinku</string>
   <string name="create_account">Kreiraj račun</string>
+  <string name="uploads_view_group_current_uploads">Trenutno</string>
+  <string name="uploads_view_upload_status_succeeded">Zavrženo</string>
+  <string name="uploads_view_upload_status_unknown_fail">Nepoznata greška</string>
   <string name="favorite">Favorit</string>
   <string name="common_rename">Preimenuj</string>
   <string name="activity_chooser_send_file_title">Pošalji</string>
@@ -41,6 +43,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>

+ 11 - 5
res/values-ca/strings.xml

@@ -48,18 +48,17 @@
   <string name="sync_string_files">Fitxers</string>
   <string name="setup_btn_connect">Connecta</string>
   <string name="uploader_btn_upload_text">Puja</string>
-  <string name="uploader_btn_new_folder_text">Carpeta nova</string>
   <string name="uploader_top_message">Seleccioneu la carpeta de pujada:</string>
   <string name="uploader_wrn_no_account_title">No s\'ha trobat el compte</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configura</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Surt</string>
-  <string name="uploader_wrn_no_content_title">No hi ha continguts per pujar</string>
-  <string name="uploader_wrn_no_content_text">No s\'ha rebut cap contingut. Res per pujar</string>
-  <string name="uploader_error_forbidden_content">%1$s no pot accedir al contingut compartit</string>
-  <string name="uploader_info_uploading">S\'està pujant</string>
   <string name="file_list_seconds_ago">segons enrere</string>
   <string name="file_list_empty">Res per aquí. Pugeu alguna cosa!</string>
   <string name="local_file_list_empty">No hi ha arxius a aquesta carpeta</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetes</string>
+  <string name="file_list_file">fitxer</string>
+  <string name="file_list_files">fitxer</string>
   <string name="filedetails_select_file">Feu clic en un fitxer per mostrar informació addicional.</string>
   <string name="filedetails_size">Mida:</string>
   <string name="filedetails_type">Tipus:</string>
@@ -85,6 +84,11 @@
   <string name="uploader_upload_succeeded_ticker">La pujada ha estat correcte</string>
   <string name="uploader_upload_failed_ticker">La pujada ha fallat</string>
   <string name="uploader_upload_failed_content_single">La pujada de %1$s no s\'ha pogut acabar</string>
+  <string name="uploads_view_group_current_uploads">Actual</string>
+  <string name="uploads_view_group_finished_uploads">Carregat</string>
+  <string name="uploads_view_upload_status_succeeded">Completat</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error desconegut</string>
   <string name="downloader_download_in_progress_ticker">S\'està baixant ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% pujant %2$s</string>
   <string name="downloader_download_succeeded_ticker">La baixada ha estat correcte</string>
@@ -237,10 +241,12 @@
   <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>
   <string name="share_privilege_can_edit_create">crea</string>
   <string name="share_privilege_can_edit_change">canvi</string>
   <string name="share_privilege_can_edit_delete">elimina</string>
+  <string name="edit_share_unshare">Deixar de compartir</string>
 </resources>

+ 31 - 5
res/values-cs-rCZ/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Nastavení</string>
+  <string name="drawer_item_uploads_list">Nahrání</string>
   <string name="drawer_item_logs">Logy</string>
   <string name="drawer_close">Zavřít</string>
   <string name="drawer_open">Otevřít</string>
@@ -58,21 +59,20 @@
   <string name="sync_string_files">Soubory</string>
   <string name="setup_btn_connect">Připojit</string>
   <string name="uploader_btn_upload_text">Nahrát</string>
-  <string name="uploader_btn_new_folder_text">Nová složka</string>
   <string name="uploader_top_message">Vyberte adresář pro nahrání:</string>
   <string name="uploader_wrn_no_account_title">Nenalezen žádný účet</string>
   <string name="uploader_wrn_no_account_text">Na tomto přístroji nejsou žádné %1$s účty. Nejdříve prosím zadejte účet.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavení</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Ukončit</string>
-  <string name="uploader_wrn_no_content_title">Žádný obsah k odeslání</string>
-  <string name="uploader_wrn_no_content_text">Neobdržen žádný obsah. Nic k odeslání.</string>
-  <string name="uploader_error_forbidden_content">%1$s nemá právo přistupovat ke sdílenému obsahu</string>
-  <string name="uploader_info_uploading">Odesílání</string>
   <string name="file_list_seconds_ago">před pár sekundami</string>
   <string name="file_list_empty">Žádný obsah. Nahrajte něco!</string>
   <string name="file_list_loading">Načítání...</string>
   <string name="file_list_no_app_for_file_type">Pro tento typ souboru nebyla nalezena aplikace!</string>
   <string name="local_file_list_empty">V tomto adresáři nejsou žádné soubory.</string>
+  <string name="file_list_folder">adresář</string>
+  <string name="file_list_folders">adresářů</string>
+  <string name="file_list_file">soubor</string>
+  <string name="file_list_files">souborů</string>
   <string name="filedetails_select_file">Více informací získáte klepnutím na soubor.</string>
   <string name="filedetails_size">Velikost:</string>
   <string name="filedetails_type">Typ:</string>
@@ -86,6 +86,7 @@
   <string name="common_yes">Ano</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">OK</string>
+  <string name="common_retry_upload">Opakovat nahrání</string>
   <string name="common_cancel_sync">Zrušit synchronizaci</string>
   <string name="common_cancel">Zrušit</string>
   <string name="common_save_exit">Uložit &amp; ukončit</string>
@@ -105,6 +106,21 @@
   <string name="uploader_upload_failed_ticker">Odesílání selhalo</string>
   <string name="uploader_upload_failed_content_single">Odesílání %1$s nemohlo být dokončeno</string>
   <string name="uploader_upload_failed_credentials_error">Nahrání selhalo, je třeba se znovu přihlásit</string>
+  <string name="uploads_view_title">Nahrání</string>
+  <string name="uploads_view_group_current_uploads">Aktuální</string>
+  <string name="uploads_view_group_finished_uploads">Odesláno</string>
+  <string name="uploads_view_upload_status_succeeded">Dokončeno</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Chyba připojení</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Chyba přihlašovacích údajů</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Chyba adresáře</string>
+  <string name="uploads_view_upload_status_failed_file_error">Chyba souboru</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Místní soubor nenalezen</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Chyba oprávnění</string>
+  <string name="uploads_view_upload_status_conflict">Konflikt</string>
+  <string name="uploads_view_upload_status_service_interrupted">Aplikace byla ukončena</string>
+  <string name="uploads_view_upload_status_unknown_fail">Neznámá chyba</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Čekání na wifi připojení</string>
+  <string name="uploads_view_later_waiting_to_upload">Čekání na nahrávání</string>
   <string name="downloader_download_in_progress_ticker">Stahuji ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Stahuji %2$s</string>
   <string name="downloader_download_succeeded_ticker">Stažení úspěšné</string>
@@ -340,6 +356,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 +364,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>
@@ -360,6 +382,10 @@ správce systému.</string>
   <string name="share_privilege_can_edit_delete">smazat</string>
   <string name="edit_share_unshare">Ukončit sdílení</string>
   <string name="edit_share_done">dokončeno</string>
+  <string name="action_retry_uploads">Opakování selhalo</string>
+  <string name="action_clear_failed_uploads">Vyčištění selhalo</string>
+  <string name="action_clear_successful_uploads">Vyčištění úspěšné</string>
+  <string name="action_clear_finished_uploads">Vyčistit všechny ukončené</string>
   <string name="action_switch_grid_view">Zobrazení v mřížce</string>
   <string name="action_switch_list_view">Zobrazení v seznamu</string>
   <string name="manage_space_title">Spravovat úložný prostor</string>

+ 0 - 4
res/values-cy-rGB/strings.xml

@@ -24,10 +24,6 @@
   <string name="uploader_wrn_no_account_title">Heb ganfod cyfrif</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Gosod</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Gadael</string>
-  <string name="uploader_wrn_no_content_title">Dim cynnwys i lwytho i fyny</string>
-  <string name="uploader_wrn_no_content_text">Heb dderbyn cynnwys. Dim cynnwys i lwytho i fyny</string>
-  <string name="uploader_error_forbidden_content">Does dim mynediad gan %1$s i gynnwys a rennir</string>
-  <string name="uploader_info_uploading">Yn llwytho i fyny</string>
   <string name="file_list_seconds_ago">eiliad yn ôl</string>
   <string name="file_list_empty">Does dim byd fan hyn. Llwythwch rhywbeth i fyny!</string>
   <string name="filedetails_select_file">Tapiwch ffeil i ddangos gwybodaeth ychwanegol</string>

+ 19 - 5
res/values-da/strings.xml

@@ -24,6 +24,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Indstillinger</string>
+  <string name="drawer_item_uploads_list">Uploade filer</string>
   <string name="drawer_item_logs">Logregistreringer</string>
   <string name="drawer_close">Luk</string>
   <string name="drawer_open">Åbn</string>
@@ -36,8 +37,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>
@@ -53,19 +57,18 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Tilslut</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_btn_new_folder_text">Ny mappe</string>
   <string name="uploader_top_message">Vælg upload-mappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto fundet</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Opsætning</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afslut</string>
-  <string name="uploader_wrn_no_content_title">Intet indhold at uploade</string>
-  <string name="uploader_wrn_no_content_text">Intet indhold blev modtaget. Intet at uploade.</string>
-  <string name="uploader_error_forbidden_content">%1$s er ikke tilladt adgang til delt indhold</string>
-  <string name="uploader_info_uploading">Uploader</string>
   <string name="file_list_seconds_ago">sekunder siden</string>
   <string name="file_list_empty">Her er tomt. Upload noget!</string>
   <string name="file_list_loading">Indlæser...</string>
   <string name="local_file_list_empty">Der er ingen filer i denne mappe.</string>
+  <string name="file_list_folder">mappe</string>
+  <string name="file_list_folders">mapper</string>
+  <string name="file_list_file">fil</string>
+  <string name="file_list_files">fil</string>
   <string name="filedetails_select_file">Tryk på en fil for at vise yderligere information.</string>
   <string name="filedetails_size">Størelse:</string>
   <string name="filedetails_type">Type:</string>
@@ -91,6 +94,16 @@
   <string name="uploader_upload_succeeded_ticker">Upload færdig</string>
   <string name="uploader_upload_failed_ticker">Upload fejlede</string>
   <string name="uploader_upload_failed_content_single">Upload af %1$s kunne ikke gennemføres</string>
+  <string name="uploads_view_title">Uploade filer</string>
+  <string name="uploads_view_group_current_uploads">Nuværende</string>
+  <string name="uploads_view_group_finished_uploads">Sendt</string>
+  <string name="uploads_view_upload_status_succeeded">Fuldført</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Godkendelsesfejl</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Mappefejl</string>
+  <string name="uploads_view_upload_status_failed_file_error">Filfejl</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Manglende rettigheder</string>
+  <string name="uploads_view_upload_status_unknown_fail">Ukendt fejl</string>
+  <string name="uploads_view_later_waiting_to_upload">Venter med upload</string>
   <string name="downloader_download_in_progress_ticker">Downloader ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Downloader %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download fuldført</string>
@@ -294,6 +307,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>

+ 14 - 5
res/values-de-rAT/strings.xml

@@ -37,16 +37,15 @@
   <string name="sync_string_files">Dateien</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_btn_new_folder_text">Neuer Ordner</string>
   <string name="uploader_wrn_no_account_title">Kein Benutzerkonto gefunden</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Schließen</string>
-  <string name="uploader_wrn_no_content_title">Kein Inhalt zum hochladen</string>
-  <string name="uploader_wrn_no_content_text">Es wurde kein Inhalt empfangen. Nichts zum hochladen.</string>
-  <string name="uploader_error_forbidden_content">%1$s ist es nicht erlaubt auf den geiteilten Inhalt zuzugreifen</string>
-  <string name="uploader_info_uploading">Lade hoch</string>
   <string name="file_list_seconds_ago">Sekunden zuvor</string>
   <string name="file_list_empty">Es ist nichts hier. Lade etwas hoch!</string>
   <string name="local_file_list_empty">Es sind keine Dateien in diesem Ordner.</string>
+  <string name="file_list_folder">Ordner</string>
+  <string name="file_list_folders">Ordner</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
   <string name="filedetails_select_file">Auf eine Datei drücken, um mehr Informationen zu erhalten.</string>
   <string name="filedetails_size">Größe:</string>
   <string name="filedetails_type">Typ:</string>
@@ -70,6 +69,7 @@
   <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
   <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
   <string name="uploader_upload_failed_content_single">Hochladen von %1$s konnte nicht fertig gestellt werden</string>
+  <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>
   <string name="downloader_download_in_progress_ticker">Lade herunter ...</string>
   <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
   <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
@@ -86,13 +86,22 @@
   <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
   <string name="foreign_files_fail">Ein paar Dateien konnten nicht verschoben werden</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
+  <string name="common_rename">Umbenennen</string>
   <string name="ssl_validator_btn_details_see">Details</string>
   <string name="activity_chooser_send_file_title">Senden</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Konten</string>
+  <string name="folder_picker_choose_button_text">Auswählen</string>
   <string name="prefs_category_details">Details</string>
   <string name="auth_host_address">Adresse des Servers</string>
   <string name="share_via_link_section_title">Link teilen</string>
+  <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_edit_permission_label">Bearbeitung erlauben</string>
+  <string name="share_search">Suche</string>
   <string name="share_privilege_can_share">Kann teilen</string>
   <string name="share_privilege_can_edit">Kann bearbeiten</string>
+  <string name="share_privilege_can_edit_create">erstellen</string>
+  <string name="share_privilege_can_edit_change">Ändern</string>
+  <string name="share_privilege_can_edit_delete">löschen</string>
 </resources>

+ 39 - 6
res/values-de-rDE/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Einstellungen</string>
+  <string name="drawer_item_uploads_list">Uploads</string>
   <string name="drawer_item_logs">Protokolle</string>
   <string name="drawer_close">Schließen</string>
   <string name="drawer_open">Öffnen</string>
@@ -58,21 +59,21 @@
   <string name="sync_string_files">Dateien</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_btn_new_folder_text">Neuer Ordner</string>
   <string name="uploader_top_message">Uploadordner auswählen:</string>
   <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Konten auf Ihrem Gerät eingerichtet. Bitte richten Sie zuerst ein Konto ein.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Beenden</string>
-  <string name="uploader_wrn_no_content_title">Keine Inhalte zum Hochladen vorhanden</string>
-  <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
-  <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
-  <string name="uploader_info_uploading">Lade hoch</string>
   <string name="file_list_seconds_ago">Gerade eben</string>
   <string name="file_list_empty">Alles leer. Laden Sie etwas hoch!</string>
   <string name="file_list_loading">Lade…</string>
   <string name="file_list_no_app_for_file_type">Es wurde keine App für die Datei gefunden!</string>
   <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
+  <string name="upload_list_empty">Keine Uploads verfügbar</string>
+  <string name="file_list_folder">Ordner</string>
+  <string name="file_list_folders">Ordner</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
   <string name="filedetails_type">Art:</string>
@@ -82,10 +83,12 @@
   <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>
+  <string name="common_remove_upload">Upload entfernen</string>
+  <string name="common_retry_upload">Upload wiederholen</string>
   <string name="common_cancel_sync">Synchronisation abbrechen</string>
   <string name="common_cancel">Abbrechen</string>
   <string name="common_save_exit">Speichern &amp; Schließen</string>
@@ -105,6 +108,25 @@
   <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
   <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
   <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, Sie müssen sich erneut anmelden.</string>
+  <string name="uploads_view_title">Uploads</string>
+  <string name="uploads_view_group_current_uploads">Aktuell</string>
+  <string name="uploads_view_group_failed_uploads">Fehlgeschlagen (Tippen zum Wiederholen)</string>
+  <string name="uploads_view_group_finished_uploads">Hochgeladen</string>
+  <string name="uploads_view_upload_status_succeeded">Fertiggestellt</string>
+  <string name="uploads_view_upload_status_cancelled">Abgebrochen</string>
+  <string name="uploads_view_upload_status_paused">Pausiert</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Verbindungsfehler</string>
+  <string name="uploads_view_upload_status_failed_retry">Der Upload wird in Kürze erneut versucht</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Zugangsdaten falsch</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Ordnerfehler</string>
+  <string name="uploads_view_upload_status_failed_file_error">Dateifehler</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Lokale Datei nicht gefunden</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Berechtigungsfehler</string>
+  <string name="uploads_view_upload_status_conflict">Konflikt</string>
+  <string name="uploads_view_upload_status_service_interrupted">Die Anwendung wurde beendet</string>
+  <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Warte auf die drahtlose Verbindung</string>
+  <string name="uploads_view_later_waiting_to_upload">Warten auf das Hochladen</string>
   <string name="downloader_download_in_progress_ticker">Herunterladen...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
   <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
@@ -212,6 +234,7 @@
   <string name="filename_forbidden_charaters_from_server">Der Dateiname enthält mindestens ein ungültiges Zeichen</string>
   <string name="filename_empty">Dateiname darf nicht leer sein</string>
   <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
+  <string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
   <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuchen Sie, die Datei in einer anderen App zu öffnen.</string>
   <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
   <string name="activity_chooser_title">Link senden an …</string>
@@ -341,6 +364,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 +372,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>
@@ -361,6 +390,10 @@
   <string name="share_privilege_can_edit_delete">löschen</string>
   <string name="edit_share_unshare">Freigabe löschen</string>
   <string name="edit_share_done">Erledigt</string>
+  <string name="action_retry_uploads">Wiederholung fehlgeschlagen</string>
+  <string name="action_clear_failed_uploads">Löschen fehlgeschlagen</string>
+  <string name="action_clear_successful_uploads">Löschen erfolgreich</string>
+  <string name="action_clear_finished_uploads">\"Alle Löschen\" abgeschlossen</string>
   <string name="action_switch_grid_view">Zur Rasteransicht wechseln</string>
   <string name="action_switch_list_view">Zur Listenansicht wechseln</string>
   <string name="manage_space_title">Speicher verwalten</string>

+ 38 - 5
res/values-de/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Einstellungen</string>
+  <string name="drawer_item_uploads_list">Uploads</string>
   <string name="drawer_item_logs">Protokolle</string>
   <string name="drawer_close">Schließen</string>
   <string name="drawer_open">Öffnen</string>
@@ -58,21 +59,21 @@
   <string name="sync_string_files">Dateien</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_btn_new_folder_text">Neuer Ordner</string>
   <string name="uploader_top_message">Wähle Zielordner:</string>
   <string name="uploader_wrn_no_account_title">Kein Account gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s Konten auf deinem Gerät eingerichtet. Bitte erstelle zuerst ein Konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Beenden</string>
-  <string name="uploader_wrn_no_content_title">Keine Inhalte zum Hochladen vorhanden</string>
-  <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
-  <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
-  <string name="uploader_info_uploading">Lade hoch</string>
   <string name="file_list_seconds_ago">Gerade eben</string>
   <string name="file_list_empty">Alles leer. Lade etwas hoch!</string>
   <string name="file_list_loading">Lade…</string>
   <string name="file_list_no_app_for_file_type">Es wurde keine App für diesen Dateityp gefunden!</string>
   <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
+  <string name="upload_list_empty">Es</string>
+  <string name="file_list_folder">Ordner</string>
+  <string name="file_list_folders">Ordner</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
   <string name="filedetails_type">Art:</string>
@@ -86,6 +87,8 @@
   <string name="common_yes">Ja</string>
   <string name="common_no">Nein</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Upload entfernen</string>
+  <string name="common_retry_upload">hochladen erneut versuchen</string>
   <string name="common_cancel_sync">Synchronisation abbrechen</string>
   <string name="common_cancel">Abbrechen</string>
   <string name="common_save_exit">Speichern &amp; verlassen</string>
@@ -105,6 +108,25 @@
   <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
   <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
   <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, du musst dich erneut anmelden</string>
+  <string name="uploads_view_title">Uploads</string>
+  <string name="uploads_view_group_current_uploads">Wird hochgeladen</string>
+  <string name="uploads_view_group_failed_uploads">Fehlgeschlagen (Tippen zum Wiederholen)</string>
+  <string name="uploads_view_group_finished_uploads">Hochgeladen</string>
+  <string name="uploads_view_upload_status_succeeded">Fertiggestellt</string>
+  <string name="uploads_view_upload_status_cancelled">abgebrochen</string>
+  <string name="uploads_view_upload_status_paused">pausiert</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Verbindungs Fehler</string>
+  <string name="uploads_view_upload_status_failed_retry">Der Upload wird in Kürze erneut versucht</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Zugangsdaten ffalsch</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Ziel-Ordner fehlt</string>
+  <string name="uploads_view_upload_status_failed_file_error">Dateifehler</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Lokale Datei nicht gefunden</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Berechtigungsfehler</string>
+  <string name="uploads_view_upload_status_conflict">Konflikt</string>
+  <string name="uploads_view_upload_status_service_interrupted">Die Anwendung wurde beendet</string>
+  <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">warten auf eine WLAN Verbindung </string>
+  <string name="uploads_view_later_waiting_to_upload">Warten auf hochladen</string>
   <string name="downloader_download_in_progress_ticker">Herunterladen…</string>
   <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
   <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
@@ -212,6 +234,7 @@
   <string name="filename_forbidden_charaters_from_server">Der Dateiname enthält mindestens ein ungültiges Zeichen</string>
   <string name="filename_empty">Dateiname darf nicht leer sein</string>
   <string name="wait_a_moment">Bitte warte einen Moment.</string>
+  <string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
   <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
   <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
   <string name="activity_chooser_title">Link senden an…</string>
@@ -341,6 +364,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,10 +372,15 @@
   <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>
+  <string name="share_remote_clarification">%1$s (remote)</string>
+  <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
   <string name="share_sharee_unavailable">Entschuldigung, Deine Serverversion erlaubt das Teilen mit Nutzern innerhalb der Clients nicht.
 \nBitte kontaktiere Deinen Administrator</string>
   <string name="share_privilege_can_share">kann teilen</string>
@@ -361,6 +390,10 @@
   <string name="share_privilege_can_edit_delete">löschen</string>
   <string name="edit_share_unshare">Freigabe löschen</string>
   <string name="edit_share_done">Erledigt</string>
+  <string name="action_retry_uploads">Wiederholung fehlgeschlagen</string>
+  <string name="action_clear_failed_uploads">Löschen fehlgeschlagen</string>
+  <string name="action_clear_successful_uploads">Löschen erfolgreich</string>
+  <string name="action_clear_finished_uploads">\"Alle Löschen\" abgeschlossen</string>
   <string name="action_switch_grid_view">Rasteransicht</string>
   <string name="action_switch_list_view">Listenansicht</string>
   <string name="manage_space_title">verwalte Speicherplatz</string>

+ 58 - 5
res/values-el/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Ρυθμίσεις</string>
+  <string name="drawer_item_uploads_list">Μεταφορτώσεις</string>
   <string name="drawer_item_logs">Αρχεία καταγραφών</string>
   <string name="drawer_close">Κλείσιμο</string>
   <string name="drawer_open">Άνοιγμα</string>
@@ -37,7 +38,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>
@@ -56,19 +59,20 @@
   <string name="sync_string_files">Αρχεία</string>
   <string name="setup_btn_connect">Σύνδεση</string>
   <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
-  <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>
-  <string name="uploader_wrn_no_content_text">Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να μεταφορτώσετε.</string>
-  <string name="uploader_error_forbidden_content">Ο %1$s δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
-  <string name="uploader_info_uploading">Μεταφόρτωση</string>
   <string name="file_list_seconds_ago">δευτερόλεπτα πριν</string>
   <string name="file_list_empty">Δεν υπάρχει τίποτα εδώ. Μεταφορτώστε κάτι!</string>
   <string name="file_list_loading">Φόρτωση...</string>
+  <string name="file_list_no_app_for_file_type">Δεν βρέθηκε εφαρμογή για τον τύπο αρχείου!</string>
   <string name="local_file_list_empty">Δεν υπάρχουν αρχεία σε αυτό τον φάκελο.</string>
+  <string name="file_list_folder">φάκελος</string>
+  <string name="file_list_folders">φάκελοι</string>
+  <string name="file_list_file">αρχείο</string>
+  <string name="file_list_files">αρχείο</string>
   <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
   <string name="filedetails_size">Μέγεθος:</string>
   <string name="filedetails_type">Τύπος:</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,20 @@
   <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="uploads_view_title">Μεταφορτώσεις</string>
+  <string name="uploads_view_group_current_uploads">Τρέχουσα</string>
+  <string name="uploads_view_group_finished_uploads">Μεταφορτώθηκε</string>
+  <string name="uploads_view_upload_status_succeeded">Ολοκληρωμένες</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Σφάλμα διαπιστευτηρίων</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Σφάλμα φακέλου</string>
+  <string name="uploads_view_upload_status_failed_file_error">Σφάλμα αρχείου</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Σφάλμα δικαιωμάτων</string>
+  <string name="uploads_view_upload_status_unknown_fail">Άγνωστο σφάλμα</string>
+  <string name="uploads_view_later_waiting_to_upload">Αναμονή για μεταφόρτωση</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 +125,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 +141,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 +170,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 +192,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 +272,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 +297,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 +306,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 +324,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 +344,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 +376,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>

+ 18 - 5
res/values-en-rGB/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Settings</string>
+  <string name="drawer_item_uploads_list">Uploads</string>
   <string name="drawer_item_logs">Logs</string>
   <string name="drawer_close">Close</string>
   <string name="drawer_open">Open</string>
@@ -58,21 +59,20 @@
   <string name="sync_string_files">Files</string>
   <string name="setup_btn_connect">Connect</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_btn_new_folder_text">New folder</string>
   <string name="uploader_top_message">Choose upload folder:</string>
   <string name="uploader_wrn_no_account_title">No account found</string>
   <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please set up an account first.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
-  <string name="uploader_wrn_no_content_title">No content to upload</string>
-  <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
-  <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
-  <string name="uploader_info_uploading">Uploading</string>
   <string name="file_list_seconds_ago">seconds ago</string>
   <string name="file_list_empty">Nothing in here. Upload something!</string>
   <string name="file_list_loading">Loading…</string>
   <string name="file_list_no_app_for_file_type">No app found for file type!</string>
   <string name="local_file_list_empty">There are no files in this folder.</string>
+  <string name="file_list_folder">folder</string>
+  <string name="file_list_folders">folders</string>
+  <string name="file_list_file">file</string>
+  <string name="file_list_files">file</string>
   <string name="filedetails_select_file">Tap on a file to display additional information.</string>
   <string name="filedetails_size">Size:</string>
   <string name="filedetails_type">Type:</string>
@@ -105,6 +105,16 @@
   <string name="uploader_upload_failed_ticker">Upload failed</string>
   <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
   <string name="uploader_upload_failed_credentials_error">Upload failed, you need to log in again</string>
+  <string name="uploads_view_title">Uploads</string>
+  <string name="uploads_view_group_current_uploads">Current</string>
+  <string name="uploads_view_group_finished_uploads">Uploaded</string>
+  <string name="uploads_view_upload_status_succeeded">Completed</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Credentials error</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Folder error</string>
+  <string name="uploads_view_upload_status_failed_file_error">File error</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Permission error</string>
+  <string name="uploads_view_upload_status_unknown_fail">Unknown error</string>
+  <string name="uploads_view_later_waiting_to_upload">Waiting to upload</string>
   <string name="downloader_download_in_progress_ticker">Downloading …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@ -348,10 +358,13 @@
   <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>
   <string name="share_group_clarification">%1$s (group)</string>
+  <string name="share_remote_clarification">%1$s (remote)</string>
+  <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
   <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
         \nPlease contact your administrator</string>
   <string name="share_privilege_can_share">can share</string>

+ 15 - 5
res/values-eo/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Agordo</string>
+  <string name="drawer_item_uploads_list">Alŝutoj</string>
   <string name="drawer_item_logs">Protokoloj</string>
   <string name="drawer_close">Fermi</string>
   <string name="drawer_open">Malfermi</string>
@@ -44,20 +45,19 @@
   <string name="sync_string_files">Dosieroj</string>
   <string name="setup_btn_connect">Konekti</string>
   <string name="uploader_btn_upload_text">Alŝuti</string>
-  <string name="uploader_btn_new_folder_text">Nova dosierujo</string>
   <string name="uploader_top_message">Elektu alŝutan dosierujon:</string>
   <string name="uploader_wrn_no_account_title">Neniu konto troviĝis</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Agordi</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Forlasi</string>
-  <string name="uploader_wrn_no_content_title">Neniu enhavo alŝutota</string>
-  <string name="uploader_wrn_no_content_text">Neniu enhavo riceviĝis. Nenio alŝutota.</string>
-  <string name="uploader_error_forbidden_content">$1%s ne estas permesata aliri la kunhavigitan enhavon</string>
-  <string name="uploader_info_uploading">Alŝutante</string>
   <string name="file_list_seconds_ago">sekundoj antaŭe</string>
   <string name="file_list_empty">Nenio estas ĉi tie. Alŝutu ion!</string>
   <string name="file_list_loading">Ŝargante...</string>
   <string name="file_list_no_app_for_file_type">Neniu aplikaĵo troviĝis por la dosiertipo!</string>
   <string name="local_file_list_empty">Estas neniu dosiero en ĉi tiu dosierujo.</string>
+  <string name="file_list_folder">dosierujo</string>
+  <string name="file_list_folders">dosierujoj</string>
+  <string name="file_list_file">dosiero</string>
+  <string name="file_list_files">dosiero</string>
   <string name="filedetails_size">Grando:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Kreita je:</string>
@@ -88,6 +88,15 @@
   <string name="uploader_upload_failed_ticker">Alŝuto malsukcesis</string>
   <string name="uploader_upload_failed_content_single">Alŝuto de %1s ne eblis plenumiĝi</string>
   <string name="uploader_upload_failed_credentials_error">Alŝuto malsukcesis, vi devas ensaluti ree</string>
+  <string name="uploads_view_title">Alŝutoj</string>
+  <string name="uploads_view_group_current_uploads">Nuna</string>
+  <string name="uploads_view_group_finished_uploads">Alŝutita</string>
+  <string name="uploads_view_upload_status_succeeded">Plenumita</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Eraro pri dosierujo</string>
+  <string name="uploads_view_upload_status_failed_file_error">Eraro pri dosiero</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Permesa eraro</string>
+  <string name="uploads_view_upload_status_unknown_fail">Nekonata eraro</string>
+  <string name="uploads_view_later_waiting_to_upload">Atendante por alŝuti</string>
   <string name="downloader_download_in_progress_ticker">Elŝutante...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Elŝutante %2$s</string>
   <string name="downloader_download_succeeded_ticker">Elŝuto sukcesis</string>
@@ -266,6 +275,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>

+ 7 - 5
res/values-es-rAR/strings.xml

@@ -49,18 +49,17 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_btn_new_folder_text">Nueva Carpeta</string>
   <string name="uploader_top_message">Elija la carpeta de subida:</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
-  <string name="uploader_wrn_no_content_title">No hay contenido para subir</string>
-  <string name="uploader_wrn_no_content_text">No se recibió ningún contenido. No hay nada para subir.</string>
-  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
-  <string name="uploader_info_uploading">Subiendo</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">No hay nada. ¡Subí contenido!</string>
   <string name="local_file_list_empty">No existen archivos en esta carpeta.</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetas</string>
+  <string name="file_list_file">archivo</string>
+  <string name="file_list_files">archivo</string>
   <string name="filedetails_select_file">Pulsá sobre un archivo para mostrar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -86,6 +85,9 @@
   <string name="uploader_upload_succeeded_ticker">Subido con éxito</string>
   <string name="uploader_upload_failed_ticker">Error al subir el archivo</string>
   <string name="uploader_upload_failed_content_single">No se pudo completar la subida de %1$s </string>
+  <string name="uploads_view_group_finished_uploads">Subido</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
   <string name="downloader_download_in_progress_ticker">Descargando ...</string>
   <string name="downloader_download_in_progress_content">%1$d%%  descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completa</string>

+ 1 - 5
res/values-es-rCL/strings.xml

@@ -25,15 +25,10 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_btn_new_folder_text">Nuevo directorio</string>
   <string name="uploader_top_message">Elija el directorio donde subir los archivos:</string>
   <string name="uploader_wrn_no_account_title">No se encuentra la cuenta</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
-  <string name="uploader_wrn_no_content_title">ningun contenido para subir</string>
-  <string name="uploader_wrn_no_content_text">No se ha recibido ningún contenido. No hay nada para subir.</string>
-  <string name="uploader_error_forbidden_content">%1$s no esta autorizado para acceder al contenido compartido</string>
-  <string name="uploader_info_uploading">Subiendo</string>
   <string name="file_list_seconds_ago">segundos antes</string>
   <string name="filedetails_select_file">Seleccione un archivo para desplegar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
@@ -59,6 +54,7 @@
   <string name="uploader_upload_succeeded_ticker">Subida correcta</string>
   <string name="uploader_upload_failed_ticker">Subida fallida</string>
   <string name="uploader_upload_failed_content_single">La subida de %1$s no pudo ser completada</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
   <string name="downloader_download_in_progress_ticker">Descargando...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completada</string>

+ 2 - 5
res/values-es-rMX/strings.xml

@@ -35,14 +35,9 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_btn_new_folder_text">Nueva carpeta</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
-  <string name="uploader_wrn_no_content_title">No hay contenido para subir</string>
-  <string name="uploader_wrn_no_content_text">Ningún contenido ha sido recibido. No hay nada que subir.</string>
-  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
-  <string name="uploader_info_uploading">Enviando</string>
   <string name="file_list_seconds_ago">hace segundos</string>
   <string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
   <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
@@ -70,6 +65,8 @@
   <string name="uploader_upload_succeeded_ticker">Subido con éxito</string>
   <string name="uploader_upload_failed_ticker">Error en la subida</string>
   <string name="uploader_upload_failed_content_single">La subida de %1$s no se pudo completar</string>
+  <string name="uploads_view_upload_status_succeeded">Completado</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
   <string name="downloader_download_in_progress_ticker">Descargando ...</string>
   <string name="downloader_download_in_progress_content">%1$s Descargada de %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completa</string>

+ 38 - 5
res/values-es/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Ajustes</string>
+  <string name="drawer_item_uploads_list">Cargas</string>
   <string name="drawer_item_logs">Registros</string>
   <string name="drawer_close">Cerrar</string>
   <string name="drawer_open">Abrir</string>
@@ -58,21 +59,21 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_btn_new_folder_text">Nueva carpeta</string>
   <string name="uploader_top_message">Escoger carpeta de carga:</string>
   <string name="uploader_wrn_no_account_title">No se encontró la cuenta</string>
   <string name="uploader_wrn_no_account_text">No hay %1$s cuentas en tu dispositivo. Por favor añade una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
-  <string name="uploader_wrn_no_content_title">No hay contenido para subir</string>
-  <string name="uploader_wrn_no_content_text">Ningún contenido ha sido recibido. No hay nada que subir.</string>
-  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
-  <string name="uploader_info_uploading">Subiendo...</string>
   <string name="file_list_seconds_ago">hace segundos</string>
   <string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
   <string name="file_list_loading">Cargando...</string>
   <string name="file_list_no_app_for_file_type">¡Aplicación no encontrada para el tipo de archivo!</string>
   <string name="local_file_list_empty">No hay archivos en esta carpeta.</string>
+  <string name="upload_list_empty">Sin datos para subir.</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetas</string>
+  <string name="file_list_file">fichero</string>
+  <string name="file_list_files">ficheros</string>
   <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -86,6 +87,8 @@
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">Aceptar</string>
+  <string name="common_remove_upload">Quitar los datos para subir</string>
+  <string name="common_retry_upload">Reintentar la subida</string>
   <string name="common_cancel_sync">Cancelar sincronización</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar &amp; salir</string>
@@ -105,6 +108,25 @@
   <string name="uploader_upload_failed_ticker">Error en la subida</string>
   <string name="uploader_upload_failed_content_single">La subida de %1$s no se pudo completar</string>
   <string name="uploader_upload_failed_credentials_error">Subida fallida, necesita volver a iniciar sesión</string>
+  <string name="uploads_view_title">Cargas</string>
+  <string name="uploads_view_group_current_uploads">Actual</string>
+  <string name="uploads_view_group_failed_uploads">Fallido (presiona para reintentarlo)</string>
+  <string name="uploads_view_group_finished_uploads">Subidos</string>
+  <string name="uploads_view_upload_status_succeeded">Completada</string>
+  <string name="uploads_view_upload_status_cancelled">Cancelado</string>
+  <string name="uploads_view_upload_status_paused">Pausado</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Error de conexión</string>
+  <string name="uploads_view_upload_status_failed_retry">La subida se volverá a intentar en breve</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Error de credenciales</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Error de carpeta</string>
+  <string name="uploads_view_upload_status_failed_file_error">Error de fichero</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Archivo local no encontrado</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
+  <string name="uploads_view_upload_status_conflict">Conflicto</string>
+  <string name="uploads_view_upload_status_service_interrupted">La aplicación se ha interrumpido</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Esperando a la conexión wifi</string>
+  <string name="uploads_view_later_waiting_to_upload">Esperando para subir</string>
   <string name="downloader_download_in_progress_ticker">Descargando...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Descargado de %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completa</string>
@@ -212,6 +234,7 @@
   <string name="filename_forbidden_charaters_from_server">Nombre de archivo contiene al menos un caracter no válido</string>
   <string name="filename_empty">El nombre de archivo no puede estar vacío</string>
   <string name="wait_a_moment">Espere un momento</string>
+  <string name="wait_checking_credentials">Comprobando las credenciales guardadas</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, pruebe otra app para seleccionar el archivo</string>
   <string name="filedisplay_no_file_selected">No hay ficheros seleccionados.</string>
   <string name="activity_chooser_title">Enviar enlace a...</string>
@@ -341,6 +364,7 @@
   <string name="pref_behaviour_entries_keep_file">dejado en la carpeta original</string>
   <string name="pref_behaviour_entries_move">movido a la carpeta apps</string>
   <string name="share_dialog_title">Compartiendo</string>
+  <string name="share_file">Compartir %1$s</string>
   <string name="share_with_user_section_title">Compartir con usuarios y grupos</string>
   <string name="share_no_users">Aún no se ha compartido con ningún usuario.</string>
   <string name="share_add_user_or_group">Añadir usuario o grupo</string>
@@ -348,10 +372,15 @@
   <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_with_title">Compartir con...</string>
+  <string name="share_with_edit_title">Compartir con %1$s</string>
   <string name="share_search">Buscar</string>
   <string name="search_users_and_groups_hint">Buscar usuarios y grupos</string>
   <string name="share_group_clarification">%1$s (grupo)</string>
+  <string name="share_remote_clarification">%1$s (remoto)</string>
+  <string name="share_known_remote_clarification">%1$s ( en %2$s )</string>
   <string name="share_sharee_unavailable">Lo siento, compartir no está disponible en su servidor.\nPor favor, contacte con su administrador</string>
   <string name="share_privilege_can_share">puede compartir</string>
   <string name="share_privilege_can_edit">puede editar</string>
@@ -360,6 +389,10 @@
   <string name="share_privilege_can_edit_delete">borrar</string>
   <string name="edit_share_unshare">Parar de compatir</string>
   <string name="edit_share_done">hecho</string>
+  <string name="action_retry_uploads">Reintento fallido</string>
+  <string name="action_clear_failed_uploads">Limpiar fallido</string>
+  <string name="action_clear_successful_uploads">Limpiar exitoso</string>
+  <string name="action_clear_finished_uploads">Limpiar todo lo terminado</string>
   <string name="action_switch_grid_view">Vista de rejilla</string>
   <string name="action_switch_list_view">Ver lista</string>
   <string name="manage_space_title">Gestionar espacio</string>

+ 30 - 5
res/values-et-rEE/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Seaded</string>
+  <string name="drawer_item_uploads_list">Üleslaadimised</string>
   <string name="drawer_item_logs">Logid</string>
   <string name="drawer_close">Sulge</string>
   <string name="drawer_open">Ava</string>
@@ -58,19 +59,18 @@
   <string name="sync_string_files">Failid</string>
   <string name="setup_btn_connect">Ühenda</string>
   <string name="uploader_btn_upload_text">Lae üles</string>
-  <string name="uploader_btn_new_folder_text">Uus kaust</string>
   <string name="uploader_top_message">Vali kataloog serveris: </string>
   <string name="uploader_wrn_no_account_title">Kontot ei leitud</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Seadista</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Lõpeta</string>
-  <string name="uploader_wrn_no_content_title">Pole sisu, mida üles laadida</string>
-  <string name="uploader_wrn_no_content_text">Sisu ei saadud. Pole midagi üles laadida.</string>
-  <string name="uploader_error_forbidden_content">%1$sile pole lubatud ligipääs jagatud sisule</string>
-  <string name="uploader_info_uploading">Üleslaadimine</string>
   <string name="file_list_seconds_ago">sekundit tagasi</string>
   <string name="file_list_empty">Siin pole midagi. Lae midagi üles!</string>
   <string name="file_list_loading">Laadimine...</string>
   <string name="local_file_list_empty">Kaustas pole faile.</string>
+  <string name="file_list_folder">kaust</string>
+  <string name="file_list_folders">kaustad</string>
+  <string name="file_list_file">fail</string>
+  <string name="file_list_files">failid</string>
   <string name="filedetails_select_file">Lisainfo vaatamiseks vajuta failile.</string>
   <string name="filedetails_size">Suurus:</string>
   <string name="filedetails_type">Tüüp:</string>
@@ -100,6 +100,22 @@
   <string name="uploader_upload_succeeded_ticker">Üleslaadimine oli edukas</string>
   <string name="uploader_upload_failed_ticker">Üleslaadimine ebaõnnestus</string>
   <string name="uploader_upload_failed_content_single">%1$s üleslaadimise lõpetamine ebaõnnestus</string>
+  <string name="uploads_view_title">Üleslaadimised</string>
+  <string name="uploads_view_group_current_uploads">Praegune</string>
+  <string name="uploads_view_group_finished_uploads">Üles laetud</string>
+  <string name="uploads_view_upload_status_succeeded">Lõpetatud</string>
+  <string name="uploads_view_upload_status_cancelled">Tühistatud</string>
+  <string name="uploads_view_upload_status_paused">Peatatud</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Ühenduse viga</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Autentimisandmete tõrge</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Kausta tõrge</string>
+  <string name="uploads_view_upload_status_failed_file_error">Faili tõrge</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Kohalikku faili ei leitud</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Õiguse viga</string>
+  <string name="uploads_view_upload_status_conflict">Konflikt</string>
+  <string name="uploads_view_upload_status_service_interrupted">Rakendus suleti jõuga</string>
+  <string name="uploads_view_upload_status_unknown_fail">Tundmatu viga</string>
+  <string name="uploads_view_later_waiting_to_upload">Üleslaadimise ootamine</string>
   <string name="downloader_download_in_progress_ticker">Allalaadimine ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% allalaadimine %2$s</string>
   <string name="downloader_download_succeeded_ticker">Allalaadimine oli edukas</string>
@@ -128,6 +144,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="pass_code_enter_pass_code">Palun sisesta oma parool</string>
   <string name="pass_code_configure_your_pass_code">Sisesta oma parool</string>
   <string name="pass_code_configure_your_pass_code_explanation">Parooli küsitakse iga kord, kui sa selle rakenduse käivitad</string>
+  <string name="pass_code_reenter_your_pass_code">Palun sisesta parool uuesti</string>
   <string name="pass_code_remove_your_pass_code">Eemalda oma parool</string>
   <string name="pass_code_mismatch">Paroolid pole samad</string>
   <string name="pass_code_wrong">Vale parool</string>
@@ -318,11 +335,14 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="share_dialog_title">Jagamine</string>
   <string name="share_with_user_section_title">Jaga kasutajate ja gruppidega</string>
   <string name="share_no_users">Kasutajatega pole veel midagi jagatud</string>
+  <string name="share_add_user_or_group">Lisa kasutaja või grupp</string>
   <string name="share_via_link_section_title">Jaga linki</string>
   <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_with_title">Jaga ...</string>
   <string name="share_search">Otsi</string>
   <string name="search_users_and_groups_hint">Otsi kasutajaid ja gruppe</string>
   <string name="share_group_clarification">%1$s (grupp)</string>
@@ -333,8 +353,13 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="share_privilege_can_edit_delete">kustuta</string>
   <string name="edit_share_unshare">Lõpeta jagamine</string>
   <string name="edit_share_done">valmis</string>
+  <string name="action_retry_uploads">Uuesti proovimine ebaõnnestus</string>
+  <string name="action_clear_failed_uploads">Eemaldamine ebaõnnestus</string>
+  <string name="action_clear_successful_uploads">Eemaldatud</string>
+  <string name="action_clear_finished_uploads">Eemalda kõik lõpetatud</string>
   <string name="action_switch_grid_view">Võrgustikuvaade</string>
   <string name="action_switch_list_view">kirjavaade</string>
   <string name="manage_space_title">Ruumi haldamine</string>
   <string name="manage_space_clear_data">Tühjenda andmed</string>
+  <string name="manage_space_error">Mõningate failide kustutamine ebaõnnestus.</string>
 </resources>

+ 10 - 5
res/values-eu/strings.xml

@@ -54,18 +54,17 @@
   <string name="sync_string_files">Fitxategiak</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
-  <string name="uploader_btn_new_folder_text">Karpeta berria</string>
   <string name="uploader_top_message">Hautatu igoera karpeta:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>
-  <string name="uploader_wrn_no_content_title">Ez dago igotzeko edukirik</string>
-  <string name="uploader_wrn_no_content_text">Ez da edukirik jaso. Ez dago ezer igotzeko.</string>
-  <string name="uploader_error_forbidden_content">%1$s-(e)k ez du baimenik elkarbanatutako edukian sartzeko</string>
-  <string name="uploader_info_uploading">Igotzen</string>
   <string name="file_list_seconds_ago">segundu</string>
   <string name="file_list_empty">Ez dago ezer. Igo zerbait!</string>
   <string name="local_file_list_empty">Ez dago fitxategirik karpeta honetan.</string>
+  <string name="file_list_folder">karpeta</string>
+  <string name="file_list_folders">Karpetak</string>
+  <string name="file_list_file">fitxategia</string>
+  <string name="file_list_files">fitxategia</string>
   <string name="filedetails_select_file">Sakatu fitxategi baten gainean informazio gehiago lortzeko</string>
   <string name="filedetails_size">Tamaina:</string>
   <string name="filedetails_type">Mota:</string>
@@ -91,6 +90,11 @@
   <string name="uploader_upload_succeeded_ticker">Igotzea ongi burutu da</string>
   <string name="uploader_upload_failed_ticker">igotzeak huts egin du</string>
   <string name="uploader_upload_failed_content_single">%1$s fitxategiaren igoera ezin izan da burutu</string>
+  <string name="uploads_view_group_current_uploads">Unekoa</string>
+  <string name="uploads_view_group_finished_uploads">Igoa</string>
+  <string name="uploads_view_upload_status_succeeded">Betea</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Baimen errorea.</string>
+  <string name="uploads_view_upload_status_unknown_fail">Errore ezezaguna</string>
   <string name="downloader_download_in_progress_ticker">Deskargatzen ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Deskargatzen %2$s</string>
   <string name="downloader_download_succeeded_ticker">Deskarga ongi burutu da</string>
@@ -258,6 +262,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>

+ 15 - 5
res/values-fa/strings.xml

@@ -20,6 +20,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">تنظیمات</string>
+  <string name="drawer_item_uploads_list">آپلودها</string>
   <string name="drawer_item_logs">لاگ‌ها</string>
   <string name="drawer_close">بستن</string>
   <string name="drawer_open">باز کردن</string>
@@ -44,19 +45,18 @@
   <string name="sync_string_files">پرونده‌ها</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">بارگزاری</string>
-  <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_setup_btn_text">نصب</string>
   <string name="uploader_wrn_no_account_quit_btn_text">خروج</string>
-  <string name="uploader_wrn_no_content_title">هیچ مطلبی بارگزاری نشده‌ است</string>
-  <string name="uploader_wrn_no_content_text">هیچ مطلبی دریافت نشده است. هیچ‌‌چیزی بارگزاری نشده.</string>
-  <string name="uploader_error_forbidden_content">%1$s اجازه ی دسترسی به محتوای مشترک را نمی دهد</string>
-  <string name="uploader_info_uploading">در حال بارگزاری</string>
   <string name="file_list_seconds_ago">ثانیه‌ها پیش</string>
   <string name="file_list_empty">اینجا هیچ چیز نیست.</string>
   <string name="file_list_loading">بارگذاری ...</string>
   <string name="local_file_list_empty">هیچ فایلی در این پوشه نیست.</string>
+  <string name="file_list_folder">پوشه</string>
+  <string name="file_list_folders">پوشه ها</string>
+  <string name="file_list_file">پرونده</string>
+  <string name="file_list_files">پرونده</string>
   <string name="filedetails_select_file">روی هر فایل کلیک کنید تا اطلاعات اضافی نمایش داده شود.</string>
   <string name="filedetails_size">اندازه</string>
   <string name="filedetails_type">نوع:</string>
@@ -82,6 +82,15 @@
   <string name="uploader_upload_succeeded_ticker">بارگزاری موفقیت‌آمیز بود</string>
   <string name="uploader_upload_failed_ticker">بارگزاری ناموفق بود</string>
   <string name="uploader_upload_failed_content_single">بارگزاری %1$s نتوانست به طور کامل انجام شود</string>
+  <string name="uploads_view_title">آپلودها</string>
+  <string name="uploads_view_group_current_uploads">کنونی</string>
+  <string name="uploads_view_group_finished_uploads">بارگذاری شده است.</string>
+  <string name="uploads_view_upload_status_succeeded">نکمیل شده</string>
+  <string name="uploads_view_upload_status_failed_folder_error">حطای پوشه</string>
+  <string name="uploads_view_upload_status_failed_file_error">خطای فایل</string>
+  <string name="uploads_view_upload_status_failed_permission_error">خطای دسترسی</string>
+  <string name="uploads_view_upload_status_unknown_fail">خطای نامشخص</string>
+  <string name="uploads_view_later_waiting_to_upload">درحال انتظار برای آپلود</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>
@@ -266,6 +275,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>

+ 25 - 5
res/values-fi-rFI/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Asetukset</string>
+  <string name="drawer_item_uploads_list">Lataukset</string>
   <string name="drawer_item_logs">Lokit</string>
   <string name="drawer_close">Sulje</string>
   <string name="drawer_open">Avaa</string>
@@ -58,21 +59,20 @@
   <string name="sync_string_files">Tiedostot</string>
   <string name="setup_btn_connect">Yhdistä</string>
   <string name="uploader_btn_upload_text">Lähetä</string>
-  <string name="uploader_btn_new_folder_text">Luo kansio</string>
   <string name="uploader_top_message">Valitse lähetyskansio:</string>
   <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
   <string name="uploader_wrn_no_account_text">Laitteellasi ei ole %1$s-tilejä. Määritä tilin asetukset ensin.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Lopeta</string>
-  <string name="uploader_wrn_no_content_title">Ei sisältöä ladattavaksi</string>
-  <string name="uploader_wrn_no_content_text">Sisältöä ei saatu. Ei lähetettävää palvelimelle.</string>
-  <string name="uploader_error_forbidden_content">%1$silla ei ole oikeuksia jaettuun sisältöön</string>
-  <string name="uploader_info_uploading">Lähetetään</string>
   <string name="file_list_seconds_ago">sekuntia sitten</string>
   <string name="file_list_empty">Täällä ei ole mitään. Lähetä tänne jotakin!</string>
   <string name="file_list_loading">Ladataan…</string>
   <string name="file_list_no_app_for_file_type">Tälle tiedostotyypille ei löytynyt sovellusta!</string>
   <string name="local_file_list_empty">Tässä kansiossa ei ole tiedostoja</string>
+  <string name="file_list_folder">kansio</string>
+  <string name="file_list_folders">kansiot</string>
+  <string name="file_list_file">tiedosto</string>
+  <string name="file_list_files">Tiedostot</string>
   <string name="filedetails_select_file">Napauta tiedostoa nähdäksesi lisätietoja.</string>
   <string name="filedetails_size">Koko:</string>
   <string name="filedetails_type">Tyyppi:</string>
@@ -105,6 +105,22 @@
   <string name="uploader_upload_failed_ticker">Lähetys epäonnistui</string>
   <string name="uploader_upload_failed_content_single">%1$s :n lähetys palvelimelle jäi kesken</string>
   <string name="uploader_upload_failed_credentials_error">Lähetys epäonnistui, kirjaudu sisään uudelleen</string>
+  <string name="uploads_view_title">Lataukset</string>
+  <string name="uploads_view_group_current_uploads">Nykyiset</string>
+  <string name="uploads_view_group_finished_uploads">Lähetetty</string>
+  <string name="uploads_view_upload_status_succeeded">Valmiina</string>
+  <string name="uploads_view_upload_status_cancelled">Peruttu</string>
+  <string name="uploads_view_upload_status_paused">Keskeytetty</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Yhteysvirhe</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Valtuutusvirhe</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Kansiovirhe</string>
+  <string name="uploads_view_upload_status_failed_file_error">Tiedostovirhe</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Paikallista tiedostoa ei löydy</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Oikeusvirhe</string>
+  <string name="uploads_view_upload_status_conflict">Ristiriita</string>
+  <string name="uploads_view_upload_status_unknown_fail">Tuntematon virhe</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Odotetaan wifi-yhteyttä</string>
+  <string name="uploads_view_later_waiting_to_upload">Odottaa siirtoa</string>
   <string name="downloader_download_in_progress_ticker">Ladataan...</string>
   <string name="downloader_download_in_progress_content">%1$d%% ladataan palvelimelta %2$s</string>
   <string name="downloader_download_succeeded_ticker">Lataus tänne onnistui</string>
@@ -325,10 +341,14 @@
   <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>
+  <string name="share_remote_clarification">%1$s (etä)</string>
   <string name="share_privilege_can_share">jaa</string>
   <string name="share_privilege_can_edit">voi muokata</string>
   <string name="share_privilege_can_edit_create">luo</string>

+ 28 - 5
res/values-fr/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Paramètres</string>
+  <string name="drawer_item_uploads_list">Chargements</string>
   <string name="drawer_item_logs">Logs</string>
   <string name="drawer_close">Fermer</string>
   <string name="drawer_open">Ouvrir</string>
@@ -59,21 +60,20 @@ Téléchargez-le ici : %2$s</string>
   <string name="sync_string_files">Fichiers</string>
   <string name="setup_btn_connect">Connecter</string>
   <string name="uploader_btn_upload_text">Téléverser</string>
-  <string name="uploader_btn_new_folder_text">Nouveau dossier</string>
   <string name="uploader_top_message">Sélectionner le dossier d\'envoi :</string>
   <string name="uploader_wrn_no_account_title">Aucun compte n\'a été trouvé</string>
   <string name="uploader_wrn_no_account_text">Aucun compte %1$s sur l\'appareil. Veuillez configurer un compte au préalable.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuration</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Quitter</string>
-  <string name="uploader_wrn_no_content_title">Rien à envoyer</string>
-  <string name="uploader_wrn_no_content_text">Aucun contenu reçu. Rien à envoyer.</string>
-  <string name="uploader_error_forbidden_content">%1$s n\'est pas autorisé à accéder au contenu partagé</string>
-  <string name="uploader_info_uploading">Téléversement...</string>
   <string name="file_list_seconds_ago">il y a quelques secondes</string>
   <string name="file_list_empty">Il n\'y a rien ici ! Envoyez donc quelque chose :)</string>
   <string name="file_list_loading">Chargement...</string>
   <string name="file_list_no_app_for_file_type">Aucune application trouvée pour ce type de fichier !</string>
   <string name="local_file_list_empty">Aucun fichier n\'est présent dans ce dossier.</string>
+  <string name="file_list_folder">dossier</string>
+  <string name="file_list_folders">dossiers</string>
+  <string name="file_list_file">fichier</string>
+  <string name="file_list_files">fichiers</string>
   <string name="filedetails_select_file">Sélectionnez un fichier pour afficher des informations supplémentaires</string>
   <string name="filedetails_size">Taille :</string>
   <string name="filedetails_type">Type :</string>
@@ -106,6 +106,23 @@ Téléchargez-le ici : %2$s</string>
   <string name="uploader_upload_failed_ticker">Échec de l\'envoi</string>
   <string name="uploader_upload_failed_content_single">L\'envoi de %1$s a échoué</string>
   <string name="uploader_upload_failed_credentials_error">Le téléversement a échoué, vous devez vous reconnecter</string>
+  <string name="uploads_view_title">Chargements</string>
+  <string name="uploads_view_group_current_uploads">En ce moment</string>
+  <string name="uploads_view_group_failed_uploads">Échoué (appuyer pour réessayer)</string>
+  <string name="uploads_view_group_finished_uploads">Téléversé</string>
+  <string name="uploads_view_upload_status_succeeded">Terminé</string>
+  <string name="uploads_view_upload_status_cancelled">Annulé</string>
+  <string name="uploads_view_upload_status_paused">En pause</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Erreur de connexion</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Erreur d\'identifiants</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Erreur de dossier</string>
+  <string name="uploads_view_upload_status_failed_file_error">Erreur de fichier</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Fichier local non trouvé</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Erreur de permissions</string>
+  <string name="uploads_view_upload_status_conflict">Conflit</string>
+  <string name="uploads_view_upload_status_unknown_fail">Erreur inconnue </string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">En attente d\'une connexion wifi</string>
+  <string name="uploads_view_later_waiting_to_upload">En attente de chargement</string>
   <string name="downloader_download_in_progress_ticker">Téléchargement en cours…</string>
   <string name="downloader_download_in_progress_content">Téléchargement en cours de %2$s, %1$d%% effectués</string>
   <string name="downloader_download_succeeded_ticker">Téléchargement réussi</string>
@@ -345,6 +362,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,10 +370,15 @@ 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>
+  <string name="share_remote_clarification">%1$s (distant)</string>
+  <string name="share_known_remote_clarification">%1$s (sur %2$s)</string>
   <string name="share_sharee_unavailable">Désolé, la version du serveur ne permet pas aux applications d\'initier des partage avec d\'autres utilisateurs.
 \nVeuillez contacter votre administrateur</string>
   <string name="share_privilege_can_share">peut partager</string>

+ 16 - 5
res/values-gl/strings.xml

@@ -24,6 +24,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Axustes</string>
+  <string name="drawer_item_uploads_list">Envíos</string>
   <string name="drawer_item_logs">Rexistros</string>
   <string name="drawer_close">Pechar</string>
   <string name="drawer_open">Abrir</string>
@@ -54,19 +55,18 @@ Descárgueo de aquí: %2$s</string>
   <string name="sync_string_files">Ficheiros</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
-  <string name="uploader_btn_new_folder_text">Novo cartafol</string>
   <string name="uploader_top_message">Escolla o cartafol de envío:</string>
   <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Saír</string>
-  <string name="uploader_wrn_no_content_title">Non hai contido para enviar</string>
-  <string name="uploader_wrn_no_content_text">Non se recibiu contido. Non hai nada para enviar.</string>
-  <string name="uploader_error_forbidden_content">%1$s non ten permiso para acceder ao contido compartido</string>
-  <string name="uploader_info_uploading">Enviando</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">Aquí non hai nada. Envíe algo!</string>
   <string name="file_list_loading">Cargando...</string>
   <string name="local_file_list_empty">Non hai ficheiros neste cartafol.</string>
+  <string name="file_list_folder">cartafol</string>
+  <string name="file_list_folders">cartafoles</string>
+  <string name="file_list_file">ficheiro</string>
+  <string name="file_list_files">ficheiros</string>
   <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -93,6 +93,16 @@ Descárgueo de aquí: %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Enviado correctamente</string>
   <string name="uploader_upload_failed_ticker">Produciuse un fallou no envío</string>
   <string name="uploader_upload_failed_content_single">Non foi posíbel completar o envío de %1$s</string>
+  <string name="uploads_view_title">Envíos</string>
+  <string name="uploads_view_group_current_uploads">Actual</string>
+  <string name="uploads_view_group_finished_uploads">Enviado</string>
+  <string name="uploads_view_upload_status_succeeded">Completado</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Produciuse un erro de credenciais</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Produciuse un erro de cartafol</string>
+  <string name="uploads_view_upload_status_failed_file_error">Produciuse un erro de ficheiro</string>
+  <string name="uploads_view_upload_status_failed_permission_error"> Erro nos permisos   </string>
+  <string name="uploads_view_upload_status_unknown_fail">Produciuse un erro descoñecido</string>
+  <string name="uploads_view_later_waiting_to_upload">Agardando polo envío</string>
   <string name="downloader_download_in_progress_ticker">Descargando…</string>
   <string name="downloader_download_in_progress_content">%1$d%% descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Completouse a descarga</string>
@@ -298,6 +308,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>

+ 21 - 5
res/values-he/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">הגדרות</string>
+  <string name="drawer_item_uploads_list">העלאות</string>
   <string name="drawer_item_logs">לוגים</string>
   <string name="drawer_close">סגירה</string>
   <string name="drawer_open">פתיחה</string>
@@ -58,21 +59,20 @@
   <string name="sync_string_files">קבצים</string>
   <string name="setup_btn_connect">התחברות</string>
   <string name="uploader_btn_upload_text">העלאה</string>
-  <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>
-  <string name="uploader_wrn_no_content_text">לא התקבל תוכן. אין מה להעלות.</string>
-  <string name="uploader_error_forbidden_content">ל־%1$s אין הרשאה לגשת לתוכן המשותף שלך</string>
-  <string name="uploader_info_uploading">בהעלאה</string>
   <string name="file_list_seconds_ago">שניות</string>
   <string name="file_list_empty">אין כאן שום דבר. אולי ברצונך להעלות משהו?</string>
   <string name="file_list_loading">בטעינה …</string>
   <string name="file_list_no_app_for_file_type">לא נמצא יישום עבור סוג זה!</string>
   <string name="local_file_list_empty">אין קבצים בתיקייה זו:</string>
+  <string name="file_list_folder">תקיה</string>
+  <string name="file_list_folders">תקיות</string>
+  <string name="file_list_file">קובץ</string>
+  <string name="file_list_files">קובץ</string>
   <string name="filedetails_select_file">יש לגעת בקובץ כדי להציג פרטים נוספים.</string>
   <string name="filedetails_size">גודל:</string>
   <string name="filedetails_type">סוג:</string>
@@ -105,6 +105,16 @@
   <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="uploads_view_title">העלאות</string>
+  <string name="uploads_view_group_current_uploads">נוכחי</string>
+  <string name="uploads_view_group_finished_uploads">הועלה</string>
+  <string name="uploads_view_upload_status_succeeded">הושלם</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">שגיאת אישורי גישה</string>
+  <string name="uploads_view_upload_status_failed_folder_error">שגיאת תיקייה</string>
+  <string name="uploads_view_upload_status_failed_file_error">שגיאת קובץ</string>
+  <string name="uploads_view_upload_status_failed_permission_error">שגיאת הרשאה</string>
+  <string name="uploads_view_upload_status_unknown_fail">שגיאה בלתי ידועה</string>
+  <string name="uploads_view_later_waiting_to_upload">ממתין להעלאה</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>
@@ -341,6 +351,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,10 +359,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>

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

@@ -26,7 +26,6 @@
   <string name="sync_string_files">फाइलें </string>
   <string name="setup_btn_connect">जुड़ें </string>
   <string name="uploader_btn_upload_text">अपलोड </string>
-  <string name="uploader_btn_new_folder_text">नया फ़ोल्डर</string>
   <string name="action_share">साझा करें</string>
   <string name="common_cancel">रद्द करें </string>
   <string name="common_error">त्रुटि</string>

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

@@ -36,10 +36,13 @@
   <string name="sync_string_files">Datoteke</string>
   <string name="setup_btn_connect">Poveži</string>
   <string name="uploader_btn_upload_text">Učitaj</string>
-  <string name="uploader_btn_new_folder_text">Nova mapa</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Izlaz</string>
   <string name="file_list_seconds_ago">prije par sekundi</string>
   <string name="file_list_empty">Nema ničega u ovoj mapi. Pošalji nešto!</string>
+  <string name="file_list_folder">mapa</string>
+  <string name="file_list_folders">mape</string>
+  <string name="file_list_file">datoteka</string>
+  <string name="file_list_files">datoteka</string>
   <string name="filedetails_download">Preuzimanje</string>
   <string name="action_share">Dijeljenje</string>
   <string name="common_yes">Da</string>
@@ -50,6 +53,7 @@
   <string name="common_error_unknown">Nepoznata pogreška</string>
   <string name="change_password">Izmjena lozinke</string>
   <string name="uploader_info_dirname">Naziv mape</string>
+  <string name="uploads_view_upload_status_unknown_fail">Nepoznata pogreška</string>
   <string name="favorite">Favorit</string>
   <string name="common_rename">Promjeni ime</string>
   <string name="common_remove">Makni</string>
@@ -66,6 +70,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>

+ 11 - 5
res/values-hu-rHU/strings.xml

@@ -24,6 +24,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Beállítások</string>
+  <string name="drawer_item_uploads_list">Feltöltések</string>
   <string name="drawer_item_logs">Naplófájlok</string>
   <string name="drawer_close">Bezárás</string>
   <string name="drawer_open">Megnyitás</string>
@@ -50,19 +51,18 @@
   <string name="sync_string_files">Fájlok</string>
   <string name="setup_btn_connect">Kapcsolódás</string>
   <string name="uploader_btn_upload_text">Feltöltés</string>
-  <string name="uploader_btn_new_folder_text">Új mappa</string>
   <string name="uploader_top_message">Válassz feltöltési mappát:</string>
   <string name="uploader_wrn_no_account_title">Nincs ilyen felhasználói fiók</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Beállítás</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Kilépés</string>
-  <string name="uploader_wrn_no_content_title">Nincs feltölthető tartalom</string>
-  <string name="uploader_wrn_no_content_text">Nem jött tartalom. Nincs mit feltölteni.</string>
-  <string name="uploader_error_forbidden_content">%1$s nem jogosult a megosztott tartalom elérésére</string>
-  <string name="uploader_info_uploading">Feltöltés</string>
   <string name="file_list_seconds_ago">pár másodperce</string>
   <string name="file_list_empty">Itt nincs semmi. Töltsön fel valamit!</string>
   <string name="file_list_loading">Betöltés...</string>
   <string name="local_file_list_empty">Nincs fájl ebben a mappában.</string>
+  <string name="file_list_folder">mappa</string>
+  <string name="file_list_folders">mappák</string>
+  <string name="file_list_file">fájl</string>
+  <string name="file_list_files">fájl</string>
   <string name="filedetails_select_file">Érintsen meg egy fájlt a további információkért.</string>
   <string name="filedetails_size">Méret:</string>
   <string name="filedetails_type">Tipus:</string>
@@ -89,6 +89,11 @@
   <string name="uploader_upload_succeeded_ticker">A feltöltés sikerült</string>
   <string name="uploader_upload_failed_ticker">A feltöltés nem sikerült</string>
   <string name="uploader_upload_failed_content_single"> %1$s fájl feltöltése sikertelen</string>
+  <string name="uploads_view_title">Feltöltések</string>
+  <string name="uploads_view_group_current_uploads">Jelenlegi</string>
+  <string name="uploads_view_group_finished_uploads">Feltöltve</string>
+  <string name="uploads_view_upload_status_succeeded">Befejezve</string>
+  <string name="uploads_view_upload_status_unknown_fail">Ismeretlen hiba</string>
   <string name="downloader_download_in_progress_ticker">Letöltés ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Letöltés %2$s</string>
   <string name="downloader_download_succeeded_ticker">A letöltés sikeres</string>
@@ -251,6 +256,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 - 1
res/values-hy/strings.xml

@@ -23,7 +23,6 @@
   <string name="auth_password">Գաղտնաբառ</string>
   <string name="sync_string_files">Ֆայլեր</string>
   <string name="uploader_btn_upload_text">Բեռնել</string>
-  <string name="uploader_btn_new_folder_text">Նոր պանակ</string>
   <string name="file_list_seconds_ago">վրկ. առաջ</string>
   <string name="filedetails_size">Չափս.</string>
   <string name="filedetails_type">Տիպ.</string>
@@ -86,6 +85,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>

+ 2 - 1
res/values-ia/strings.xml

@@ -21,10 +21,10 @@
   <string name="sync_string_files">Files</string>
   <string name="setup_btn_connect">Connecte</string>
   <string name="uploader_btn_upload_text">Incargar</string>
-  <string name="uploader_btn_new_folder_text">Nove dossier</string>
   <string name="uploader_wrn_no_account_title">Nulle contos trovate</string>
   <string name="file_list_seconds_ago">secundas passate</string>
   <string name="file_list_empty">Nihil hic. Incarga alcun cosa!</string>
+  <string name="file_list_folder">dossier</string>
   <string name="filedetails_size">Dimension:</string>
   <string name="filedetails_type">Typo:</string>
   <string name="filedetails_download">Discargar</string>
@@ -38,6 +38,7 @@
   <string name="about_title">A proposito</string>
   <string name="change_password">Cambiar contrasigno</string>
   <string name="uploader_info_dirname">Nomine de dossier</string>
+  <string name="uploads_view_upload_status_unknown_fail">Error Incognite</string>
   <string name="activity_chooser_send_file_title">Invia</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Contos</string>

+ 16 - 5
res/values-id/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Pengaturan</string>
+  <string name="drawer_item_uploads_list">Unggah</string>
   <string name="drawer_item_logs">Log</string>
   <string name="drawer_close">Tutup</string>
   <string name="drawer_open">Buka</string>
@@ -56,19 +57,18 @@
   <string name="sync_string_files">Berkas</string>
   <string name="setup_btn_connect">Sambungkan</string>
   <string name="uploader_btn_upload_text">Unggah</string>
-  <string name="uploader_btn_new_folder_text">Folder baru</string>
   <string name="uploader_top_message">Pilih folder unggah:</string>
   <string name="uploader_wrn_no_account_title">Tidak ada akun yang ditemukan</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Pengaturan</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Keluar</string>
-  <string name="uploader_wrn_no_content_title">Tidak ada konten untuk diunggah</string>
-  <string name="uploader_wrn_no_content_text">Tidak ada konten yang diterima. Tidak ada yang diunggah</string>
-  <string name="uploader_error_forbidden_content">%1$s tidak diizinkan mengakses konten berbagi</string>
-  <string name="uploader_info_uploading">Mengunggah</string>
   <string name="file_list_seconds_ago">beberapa detik yang lalu</string>
   <string name="file_list_empty">Tidak ada apa-apa di sini. Unggah sesuatu!</string>
   <string name="file_list_loading">Memuat...</string>
   <string name="local_file_list_empty">Tidak ada satupun berkas dalam folder ini.</string>
+  <string name="file_list_folder">folder</string>
+  <string name="file_list_folders">folder</string>
+  <string name="file_list_file">berkas</string>
+  <string name="file_list_files">berkas</string>
   <string name="filedetails_select_file">Sentuh pada berkas untuk menampilkan informasi tambahan</string>
   <string name="filedetails_size">Ukuran:</string>
   <string name="filedetails_type">Tipe:</string>
@@ -98,6 +98,16 @@
   <string name="uploader_upload_failed_ticker">Gagal mengunggah</string>
   <string name="uploader_upload_failed_content_single">Unggah %1$s tidak selesai</string>
   <string name="uploader_upload_failed_credentials_error">Mungunggah gagal, kamu harus masuk log lagi</string>
+  <string name="uploads_view_title">Unggah</string>
+  <string name="uploads_view_group_current_uploads">Saat ini</string>
+  <string name="uploads_view_group_finished_uploads">Terunggah</string>
+  <string name="uploads_view_upload_status_succeeded">Selesai</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Kesalahan Kredensial</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Kesalahan folder</string>
+  <string name="uploads_view_upload_status_failed_file_error">Kesalahaan berkas</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Kesalahan hak akses</string>
+  <string name="uploads_view_upload_status_unknown_fail">Kesalahan tidak diketahui</string>
+  <string name="uploads_view_later_waiting_to_upload">Menunggu unggahan</string>
   <string name="downloader_download_in_progress_ticker">Mengunduh...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Mengunduh %2$s</string>
   <string name="downloader_download_succeeded_ticker">Berhasil mengunduh</string>
@@ -304,6 +314,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>

+ 251 - 2
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>
@@ -40,72 +58,300 @@
   <string name="sync_string_files">Skrár</string>
   <string name="setup_btn_connect">Tengjast</string>
   <string name="uploader_btn_upload_text">Senda inn</string>
-  <string name="uploader_btn_new_folder_text">Ný mappa</string>
+  <string name="uploader_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_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="uploads_view_group_current_uploads">Núverandi</string>
+  <string name="uploads_view_group_finished_uploads">Hlaðið inn</string>
+  <string name="uploads_view_upload_status_succeeded">Lokið</string>
+  <string name="uploads_view_upload_status_unknown_fail">Óþekkt villa</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>
@@ -115,6 +361,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>

+ 38 - 5
res/values-it/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Impostazioni</string>
+  <string name="drawer_item_uploads_list">Caricamenti</string>
   <string name="drawer_item_logs">Registri</string>
   <string name="drawer_close">Chiudi</string>
   <string name="drawer_open">Apri</string>
@@ -58,21 +59,21 @@
   <string name="sync_string_files">File</string>
   <string name="setup_btn_connect">Connetti</string>
   <string name="uploader_btn_upload_text">Carica</string>
-  <string name="uploader_btn_new_folder_text">Nuova cartella</string>
   <string name="uploader_top_message">Scegli la cartella da caricare:</string>
   <string name="uploader_wrn_no_account_title">Nessun account trovato</string>
   <string name="uploader_wrn_no_account_text">Non ci sono account %1$s sul tuo dispositivo. Configura prima un account.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurazione</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Esci</string>
-  <string name="uploader_wrn_no_content_title">Nessun contenuto da caricare</string>
-  <string name="uploader_wrn_no_content_text">Non è stato ricevuto alcun contenuto. Niente da caricare.</string>
-  <string name="uploader_error_forbidden_content">%1$s non è abilitato ad accedere al contenuto condiviso</string>
-  <string name="uploader_info_uploading">Caricamento in corso</string>
   <string name="file_list_seconds_ago">secondi fa</string>
   <string name="file_list_empty">Non c\'è niente qui. Carica qualcosa!</string>
   <string name="file_list_loading">Caricamento in corso...</string>
   <string name="file_list_no_app_for_file_type">Nessuna applicazione trovata per il tipo di file!</string>
   <string name="local_file_list_empty">Non ci sono file in questa cartella.</string>
+  <string name="upload_list_empty">Nessun caricamento disponibile.</string>
+  <string name="file_list_folder">cartella</string>
+  <string name="file_list_folders">cartelle</string>
+  <string name="file_list_file">file</string>
+  <string name="file_list_files">file</string>
   <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
   <string name="filedetails_size">Dimensione:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -86,6 +87,8 @@
   <string name="common_yes">Sì</string>
   <string name="common_no">No</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Rimuovi caricamento</string>
+  <string name="common_retry_upload">Riprova caricamento</string>
   <string name="common_cancel_sync">Annulla sincronizzazione</string>
   <string name="common_cancel">Annulla</string>
   <string name="common_save_exit">Salva ed esci</string>
@@ -105,6 +108,25 @@
   <string name="uploader_upload_failed_ticker">Caricamento non riuscito</string>
   <string name="uploader_upload_failed_content_single">Il caricamento di %1$s non può essere completato</string>
   <string name="uploader_upload_failed_credentials_error">Caricamento non riuscito, devi effettuare nuovamente l\'accesso</string>
+  <string name="uploads_view_title">Caricamenti</string>
+  <string name="uploads_view_group_current_uploads">Attuale</string>
+  <string name="uploads_view_group_failed_uploads">Non riuscito (tocca per riprovare)</string>
+  <string name="uploads_view_group_finished_uploads">Caricati</string>
+  <string name="uploads_view_upload_status_succeeded">Completati</string>
+  <string name="uploads_view_upload_status_cancelled">Annullati</string>
+  <string name="uploads_view_upload_status_paused">Sospesi</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Errore di connessione</string>
+  <string name="uploads_view_upload_status_failed_retry">Il caricamento sarà ritentato a breve</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Errore di credenziali</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Errore di cartella</string>
+  <string name="uploads_view_upload_status_failed_file_error">Errore di file</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">File locale non trovato</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Errore di permessi</string>
+  <string name="uploads_view_upload_status_conflict">Conflitto</string>
+  <string name="uploads_view_upload_status_service_interrupted">L\'applicazione è stata terminata</string>
+  <string name="uploads_view_upload_status_unknown_fail">Errore sconosciuto</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">In attesa della connettività wifi</string>
+  <string name="uploads_view_later_waiting_to_upload">In attesa di caricamento</string>
   <string name="downloader_download_in_progress_ticker">Scaricamento in corso...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Scaricamento di %2$s</string>
   <string name="downloader_download_succeeded_ticker">Scaricamento effettuato</string>
@@ -212,6 +234,7 @@
   <string name="filename_forbidden_charaters_from_server">Il nome del file contiene almeno un carattere non valido</string>
   <string name="filename_empty">Il nome del file non può essere vuoto</string>
   <string name="wait_a_moment">Attendi</string>
+  <string name="wait_checking_credentials">Controllo delle credenziali memorizzate</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inatteso; prova un\'altra applicazione per selezionare il file</string>
   <string name="filedisplay_no_file_selected">Non è stato selezionato alcun file</string>
   <string name="activity_chooser_title">Invia collegamento a...</string>
@@ -341,6 +364,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,10 +372,15 @@
   <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>
+  <string name="share_remote_clarification">%1$s (remota)</string>
+  <string name="share_known_remote_clarification">%1$s ( su %2$s )</string>
   <string name="share_sharee_unavailable">Spiacenti, la versione del tuo server non consente la condivisione con utenti dai client.
 \nContatta il tuo amministratore.</string>
   <string name="share_privilege_can_share">può condividere</string>
@@ -361,6 +390,10 @@
   <string name="share_privilege_can_edit_delete">elimina</string>
   <string name="edit_share_unshare">Interrompi la condivisione</string>
   <string name="edit_share_done">completato</string>
+  <string name="action_retry_uploads">Nuovo tentativo non riuscito</string>
+  <string name="action_clear_failed_uploads">Cancella non riusciti</string>
+  <string name="action_clear_successful_uploads">Cancella corretti</string>
+  <string name="action_clear_finished_uploads">Cancella tutti i completati</string>
   <string name="action_switch_grid_view">Vista Griglia</string>
   <string name="action_switch_list_view">Vista Elenco</string>
   <string name="manage_space_title">Gestisci lo spazio</string>

+ 16 - 5
res/values-ja-rJP/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">設定</string>
+  <string name="drawer_item_uploads_list">アップロード</string>
   <string name="drawer_item_logs">ログ</string>
   <string name="drawer_close">閉じる</string>
   <string name="drawer_open">開く</string>
@@ -59,21 +60,20 @@
   <string name="sync_string_files">ファイル</string>
   <string name="setup_btn_connect">接続</string>
   <string name="uploader_btn_upload_text">アップロード</string>
-  <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>
-  <string name="uploader_wrn_no_content_text">コンテンツを受信しませんでした。アップロードするものはありません。</string>
-  <string name="uploader_error_forbidden_content">%1$sで共有コンテンツへのアクセスが許可されていません。</string>
-  <string name="uploader_info_uploading">アップロード中</string>
   <string name="file_list_seconds_ago">数秒前</string>
   <string name="file_list_empty">ここには何もありません。何かアップロードしてください。</string>
   <string name="file_list_loading">読込中...</string>
   <string name="file_list_no_app_for_file_type">ファイルタイプ に対応するアプリはありません!</string>
   <string name="local_file_list_empty">このフォルダーにはファイルがありません。</string>
+  <string name="file_list_folder">フォルダー</string>
+  <string name="file_list_folders">フォルダー</string>
+  <string name="file_list_file">ファイル</string>
+  <string name="file_list_files">ファイル</string>
   <string name="filedetails_select_file">ファイルをタップすると追加情報が表示されます。</string>
   <string name="filedetails_size">サイズ:</string>
   <string name="filedetails_type">タイプ:</string>
@@ -106,6 +106,16 @@
   <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="uploads_view_title">アップロード</string>
+  <string name="uploads_view_group_current_uploads">現在</string>
+  <string name="uploads_view_group_finished_uploads">アップロード済み</string>
+  <string name="uploads_view_upload_status_succeeded">完了</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">資格情報エラー</string>
+  <string name="uploads_view_upload_status_failed_folder_error">フォルダーエラー</string>
+  <string name="uploads_view_upload_status_failed_file_error">ファイルエラー</string>
+  <string name="uploads_view_upload_status_failed_permission_error">権限エラー</string>
+  <string name="uploads_view_upload_status_unknown_fail">不明なエラー</string>
+  <string name="uploads_view_later_waiting_to_upload">アップロード待ち</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>
@@ -349,6 +359,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>

+ 2 - 5
res/values-ka-rGE/strings.xml

@@ -24,14 +24,9 @@
   <string name="sync_string_files">ფაილები</string>
   <string name="setup_btn_connect">დაკავშირება</string>
   <string name="uploader_btn_upload_text">ატვირთვა</string>
-  <string name="uploader_btn_new_folder_text">ახალი ფოლდერი</string>
   <string name="uploader_wrn_no_account_title">ანგარიში ვერ მოიძებნა</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>
-  <string name="uploader_wrn_no_content_text">კონტენტი არ იქნა მიღებული. არაფერია ასატვირთად.</string>
-  <string name="uploader_error_forbidden_content">%1$s–ი არ დაიშვება გაზიარებული კონტენტის სანახავად</string>
-  <string name="uploader_info_uploading">მიმდინარეობს ატვირთვა</string>
   <string name="file_list_seconds_ago">წამის წინ</string>
   <string name="file_list_empty">აქ არაფერი არ არის. ატვირთე რამე!</string>
   <string name="filedetails_select_file">დააჭირეთ ფაილს დამატებითი ინფორმაციის გამოსაჩენად.</string>
@@ -58,6 +53,8 @@
   <string name="uploader_upload_succeeded_ticker">ატვირთვა განხორციელდა</string>
   <string name="uploader_upload_failed_ticker">ატვირთვა ვერ განხორციელდა</string>
   <string name="uploader_upload_failed_content_single">%1$s ატვირთვა ვერ დასრულდა</string>
+  <string name="uploads_view_group_finished_uploads">ატვირთულია</string>
+  <string name="uploads_view_upload_status_unknown_fail">უცნობი შეცდომა</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>

+ 1 - 2
res/values-km/strings.xml

@@ -36,11 +36,9 @@
   <string name="sync_string_files">ឯកសារ</string>
   <string name="setup_btn_connect">ភ្ជាប់</string>
   <string name="uploader_btn_upload_text">ផ្ទុក​ឡើង</string>
-  <string name="uploader_btn_new_folder_text">ថត​ថ្មី</string>
   <string name="uploader_wrn_no_account_title">រកមិនឃើញ​គណនី</string>
   <string name="uploader_wrn_no_account_setup_btn_text">ដំឡើង</string>
   <string name="uploader_wrn_no_account_quit_btn_text">ចាក់ចេញ</string>
-  <string name="uploader_info_uploading">កំពុង​ផ្ទុក​ឡើង</string>
   <string name="file_list_seconds_ago">វិនាទី​មុន</string>
   <string name="file_list_empty">គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!</string>
   <string name="filedetails_select_file">ចុចមួយ​លើឯកសារ ដើម្បី​បង្ហាញ​ព័ត៌មាន​បន្ថែម។</string>
@@ -65,6 +63,7 @@
   <string name="uploader_upload_in_progress_ticker">កំពុង​តែផ្ទុកឡើង...</string>
   <string name="uploader_upload_succeeded_ticker">ការផ្ទុកឡើងបាន​ជោគជ័យ</string>
   <string name="uploader_upload_failed_ticker">ការផ្ទុកឡើងបាន​បរាជ័យ</string>
+  <string name="uploads_view_upload_status_unknown_fail">មិន​ស្គាល់​កំហុស</string>
   <string name="downloader_download_in_progress_ticker">កំពុង​ធ្វើការទាញយក...</string>
   <string name="downloader_download_succeeded_ticker">ការទាញយក​បានជោគជ័យ</string>
   <string name="downloader_download_failed_ticker">ការទាញយក​បានបរាជ័យ</string>

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

@@ -19,7 +19,6 @@
   <string name="auth_password">ಗುಪ್ತ ಪದ</string>
   <string name="sync_string_files">ಕಡತಗಳು</string>
   <string name="uploader_btn_upload_text">ಪೇರಿಸು</string>
-  <string name="uploader_btn_new_folder_text">ಹೊಸ ಕಡತಕೋಶ</string>
   <string name="filedetails_download">ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ</string>
   <string name="action_share">ಹಂಚಿಕೊಳ್ಳಿ</string>
   <string name="common_yes">ಹೌದು</string>
@@ -29,6 +28,7 @@
   <string name="common_error">ತಪ್ಪಾಗಿದೆ</string>
   <string name="common_error_unknown">ಗೊತ್ತಿಲ್ಲದ ದೋಷ</string>
   <string name="change_password">ಗುಪ್ತ ಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
+  <string name="uploads_view_upload_status_unknown_fail">ಗೊತ್ತಿಲ್ಲದ ದೋಷ</string>
   <string name="favorite">ಅಚ್ಚುಮೆಚ್ಚಿನ</string>
   <string name="common_rename">ಮರುಹೆಸರಿಸು</string>
   <string name="common_remove">ತೆಗೆದುಹಾಕಿ</string>
@@ -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>

+ 16 - 5
res/values-ko/strings.xml

@@ -24,6 +24,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">설정</string>
+  <string name="drawer_item_uploads_list">업로드</string>
   <string name="drawer_item_logs">로그</string>
   <string name="drawer_close">닫기</string>
   <string name="drawer_open">열기</string>
@@ -52,19 +53,18 @@
   <string name="sync_string_files">파일</string>
   <string name="setup_btn_connect">접속</string>
   <string name="uploader_btn_upload_text">업로드</string>
-  <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_setup_btn_text">설정</string>
   <string name="uploader_wrn_no_account_quit_btn_text">끝내기</string>
-  <string name="uploader_wrn_no_content_title">업로드할 콘텐츠 없음</string>
-  <string name="uploader_wrn_no_content_text">받은 콘텐츠가 없습니다. 업로드할 항목이 없습니다.</string>
-  <string name="uploader_error_forbidden_content">%1$s에서 공유된 콘텐츠에 접근할 수 없습니다</string>
-  <string name="uploader_info_uploading">업로드 중</string>
   <string name="file_list_seconds_ago">초 지남</string>
   <string name="file_list_empty">내용이 없습니다. 업로드할 수 있습니다!</string>
   <string name="file_list_loading">불러오는 중...</string>
   <string name="local_file_list_empty">이 폴더에 파일이 없습니다.</string>
+  <string name="file_list_folder">폴더</string>
+  <string name="file_list_folders">폴더</string>
+  <string name="file_list_file">파일</string>
+  <string name="file_list_files">파일</string>
   <string name="filedetails_select_file">파일을 누르면 추가 정보가 표시됩니다.</string>
   <string name="filedetails_size">크기:</string>
   <string name="filedetails_type">종류:</string>
@@ -91,6 +91,16 @@
   <string name="uploader_upload_succeeded_ticker">업로드 성공</string>
   <string name="uploader_upload_failed_ticker">업로드 실패</string>
   <string name="uploader_upload_failed_content_single">%1$s을(를) 업로드할 수 없습니다</string>
+  <string name="uploads_view_title">업로드</string>
+  <string name="uploads_view_group_current_uploads">현재</string>
+  <string name="uploads_view_group_finished_uploads">업로드됨</string>
+  <string name="uploads_view_upload_status_succeeded">완료됨</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">인증 오류</string>
+  <string name="uploads_view_upload_status_failed_folder_error">폴더 오류</string>
+  <string name="uploads_view_upload_status_failed_file_error">파일 오류</string>
+  <string name="uploads_view_upload_status_failed_permission_error">권한 오류</string>
+  <string name="uploads_view_upload_status_unknown_fail">알 수 없는 오류</string>
+  <string name="uploads_view_later_waiting_to_upload">업로드 대기 중</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>
@@ -307,6 +317,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>

+ 0 - 1
res/values-ku-rIQ/strings.xml

@@ -21,7 +21,6 @@
   <string name="uploader_wrn_no_account_title">هیچ هەژمارێک نه‌دۆزرایه‌وه‌</string>
   <string name="uploader_wrn_no_account_setup_btn_text">جێگیرکردن</string>
   <string name="uploader_wrn_no_account_quit_btn_text">دەرچوون</string>
-  <string name="uploader_info_uploading">بارکردن</string>
   <string name="filedetails_size">قەبارە:</string>
   <string name="filedetails_type">جۆر:</string>
   <string name="filedetails_created">درووستبووە:</string>

+ 5 - 3
res/values-lb/strings.xml

@@ -43,14 +43,15 @@
   <string name="sync_string_files">Fichieren</string>
   <string name="setup_btn_connect">Verbannen</string>
   <string name="uploader_btn_upload_text">Eroplueden</string>
-  <string name="uploader_btn_new_folder_text">Neien Dossier</string>
   <string name="uploader_wrn_no_account_title">Keen Account fonnt</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
-  <string name="uploader_wrn_no_content_text">Et gouf kee Contenu emfaangen. Näischt do fir eropzelueden.</string>
-  <string name="uploader_info_uploading">Eroplueden</string>
   <string name="file_list_seconds_ago">Sekonnen hier</string>
   <string name="file_list_empty">Hei ass näischt. Lued eppes erop!</string>
+  <string name="file_list_folder">Dossier</string>
+  <string name="file_list_folders">Dossieren</string>
+  <string name="file_list_file">Fichier</string>
+  <string name="file_list_files">Fichieren</string>
   <string name="filedetails_size">Gréisst:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Erstallt:</string>
@@ -71,6 +72,7 @@
   <string name="uploader_upload_succeeded_ticker">Eroplueden ofgeschloss</string>
   <string name="uploader_upload_failed_ticker">Eropluede feelgeschloen</string>
   <string name="uploader_upload_failed_content_single">Eropluede vun %1$s konnt net ofgeschloss ginn</string>
+  <string name="uploads_view_upload_status_unknown_fail">Onbekannte Feeler</string>
   <string name="downloader_download_in_progress_ticker">Lueden erof …</string>
   <string name="downloader_download_succeeded_ticker">Eroflueden ofgeschloss</string>
   <string name="downloader_download_failed_ticker">Erofluede feelgeschloen</string>

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

@@ -7,6 +7,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="common_error_unknown">ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ</string>
+  <string name="uploads_view_upload_status_unknown_fail">ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ</string>
   <string name="empty"></string>
   <string name="share_dialog_title">ການແບ່ງປັນ</string>
 </resources>

+ 9 - 5
res/values-lt-rLT/strings.xml

@@ -53,19 +53,18 @@
   <string name="sync_string_files">Failai</string>
   <string name="setup_btn_connect">Prisijungti</string>
   <string name="uploader_btn_upload_text">Įkelti</string>
-  <string name="uploader_btn_new_folder_text">Naujas aplankas</string>
   <string name="uploader_top_message">Nustatyti įkėlimų aplanką:</string>
   <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nustatymai</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Išeiti</string>
-  <string name="uploader_wrn_no_content_title">Nėra įkeltino turinio</string>
-  <string name="uploader_wrn_no_content_text">nebuvo gauta turinio. Nėra įkeltino turinio</string>
-  <string name="uploader_error_forbidden_content">%1$s neleidžiama prieiti prie turinio, kuriuo dalijamasi</string>
-  <string name="uploader_info_uploading">Išsiunčiama</string>
   <string name="file_list_seconds_ago">prieš sekundę</string>
   <string name="file_list_empty">Čia tuščia. Įkelkite ką nors!</string>
   <string name="file_list_loading">Įkeliama...</string>
   <string name="local_file_list_empty">Šiame aplanke nėra failų.</string>
+  <string name="file_list_folder">katalogas</string>
+  <string name="file_list_folders">katalogai</string>
+  <string name="file_list_file">failas</string>
+  <string name="file_list_files">failas</string>
   <string name="filedetails_select_file">Palieskite failą, kad parodyti papildomą informaciją.</string>
   <string name="filedetails_size">Dydis:</string>
   <string name="filedetails_type">Tipas:</string>
@@ -92,6 +91,10 @@
   <string name="uploader_upload_succeeded_ticker">Įkėlimas pavyko</string>
   <string name="uploader_upload_failed_ticker">Nusiuntimas nepavyko</string>
   <string name="uploader_upload_failed_content_single">Nepavyko baigti %1$s nusiuntimo</string>
+  <string name="uploads_view_group_current_uploads">Dabartinis</string>
+  <string name="uploads_view_group_finished_uploads">Įkelta</string>
+  <string name="uploads_view_upload_status_succeeded">Atliktas</string>
+  <string name="uploads_view_upload_status_unknown_fail">Neatpažinta klaida</string>
   <string name="downloader_download_in_progress_ticker">Atsiunčiama...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Atsiunčiama %2$s</string>
   <string name="downloader_download_succeeded_ticker">Atsiuntimas pavyko</string>
@@ -307,6 +310,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>

+ 7 - 5
res/values-lv/strings.xml

@@ -44,18 +44,17 @@
   <string name="sync_string_files">Datnes</string>
   <string name="setup_btn_connect">Savienoties</string>
   <string name="uploader_btn_upload_text">Augšupielādēt</string>
-  <string name="uploader_btn_new_folder_text">Jauna mape</string>
   <string name="uploader_wrn_no_account_title">Nav atrastu kontu</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Iestatīt</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Iziet</string>
-  <string name="uploader_wrn_no_content_title">Nav satura, ko augšupielādēt</string>
-  <string name="uploader_wrn_no_content_text">Nav saņemts nekāds saturs. Nav ko augšupielādēt.</string>
-  <string name="uploader_error_forbidden_content">%1$s nedrīkst piekļūt koplietotajam saturam</string>
-  <string name="uploader_info_uploading">Augšupielādē</string>
   <string name="file_list_seconds_ago">sekundes atpakaļ</string>
   <string name="file_list_empty">Te vēl nekas nav. Rīkojies, sāc augšupielādēt!</string>
   <string name="file_list_loading">Ielādē…</string>
   <string name="local_file_list_empty">Šajā mapē nav failu</string>
+  <string name="file_list_folder">mape</string>
+  <string name="file_list_folders">mapes</string>
+  <string name="file_list_file">fails</string>
+  <string name="file_list_files">fails</string>
   <string name="filedetails_select_file">Uzsitiet uz datnes, lai redzētu papildinformāciju.</string>
   <string name="filedetails_size">Izmērs:</string>
   <string name="filedetails_type">Tips:</string>
@@ -81,6 +80,9 @@
   <string name="uploader_upload_succeeded_ticker">Augšupielāde ir veiksmīga</string>
   <string name="uploader_upload_failed_ticker">Neizdevās augšupielādēt</string>
   <string name="uploader_upload_failed_content_single">Nevarēja pabeigt %1$s augšupielādēšanu</string>
+  <string name="uploads_view_group_current_uploads">Pašreizējais</string>
+  <string name="uploads_view_upload_status_succeeded">Pabeigts</string>
+  <string name="uploads_view_upload_status_unknown_fail">Nezināma kļūda</string>
   <string name="downloader_download_in_progress_ticker">Lejupielādē ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% lejupielādē %2$s</string>
   <string name="downloader_download_succeeded_ticker">Lejupielāde beidzās veiksmīgi</string>

+ 7 - 5
res/values-mk/strings.xml

@@ -51,18 +51,17 @@
   <string name="sync_string_files">Датотеки</string>
   <string name="setup_btn_connect">Поврзи се</string>
   <string name="uploader_btn_upload_text">Подигни</string>
-  <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_setup_btn_text">Нагодување</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Прекини</string>
-  <string name="uploader_wrn_no_content_title">Нема содржина за префрлање</string>
-  <string name="uploader_wrn_no_content_text">Не е примена содржина. Нема што да се префрла</string>
-  <string name="uploader_error_forbidden_content">на %1$s не му е дозволено да пристапи на споделената содржина</string>
-  <string name="uploader_info_uploading">Префрлам</string>
   <string name="file_list_seconds_ago">пред секунди</string>
   <string name="file_list_empty">Тука нема ништо. Префрлете нешто!</string>
   <string name="local_file_list_empty">Нема датотеки во оваа папка.</string>
+  <string name="file_list_folder">папка</string>
+  <string name="file_list_folders">папки</string>
+  <string name="file_list_file">датотека</string>
+  <string name="file_list_files">датотека</string>
   <string name="filedetails_select_file">Кликнете на датотеката за дополнителни информации.</string>
   <string name="filedetails_size">Големина:</string>
   <string name="filedetails_type">Тип:</string>
@@ -88,6 +87,8 @@
   <string name="uploader_upload_succeeded_ticker">Прикачувањето беше успешно</string>
   <string name="uploader_upload_failed_ticker">Прикачувањето не успеа</string>
   <string name="uploader_upload_failed_content_single">Прикачувањето на %1$s не може да се заврши</string>
+  <string name="uploads_view_upload_status_succeeded">Завршено</string>
+  <string name="uploads_view_upload_status_unknown_fail">Непозната грешка</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>
@@ -267,6 +268,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-mn/strings.xml

@@ -16,6 +16,7 @@
   <string name="uploader_btn_upload_text">Байршуулах</string>
   <string name="action_share">Түгээх</string>
   <string name="create_account">Аккаунт үүсгэх</string>
+  <string name="uploads_view_group_current_uploads">Одоогийн</string>
   <string name="common_remove">Устгах</string>
   <string name="empty"></string>
   <string name="share_dialog_title">Түгээлт</string>

+ 4 - 1
res/values-ms-rMY/strings.xml

@@ -30,8 +30,11 @@
   <string name="uploader_btn_upload_text">Muat naik</string>
   <string name="uploader_wrn_no_account_title">Tiada akaun dijumpai</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Berhenti</string>
-  <string name="uploader_info_uploading">Memuatnaik</string>
   <string name="file_list_empty">Tiada apa-apa di sini. Muat naik sesuatu!</string>
+  <string name="file_list_folder">direktori</string>
+  <string name="file_list_folders">direktori</string>
+  <string name="file_list_file">fail</string>
+  <string name="file_list_files">fail</string>
   <string name="filedetails_size">Saiz</string>
   <string name="filedetails_type">Jenis</string>
   <string name="filedetails_created">Telah dibina:</string>

+ 38 - 5
res/values-nb-rNO/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Innstillinger</string>
+  <string name="drawer_item_uploads_list">Opplastinger</string>
   <string name="drawer_item_logs">Logger</string>
   <string name="drawer_close">Lukk</string>
   <string name="drawer_open">Åpne</string>
@@ -58,21 +59,21 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Koble til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
-  <string name="uploader_btn_new_folder_text">Ny mappe</string>
   <string name="uploader_top_message">Velg opplastingsmappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto funnet</string>
   <string name="uploader_wrn_no_account_text">Det finnes ingen %1$s-kontoer på enheten din. Sett opp en konto først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Avslutt</string>
-  <string name="uploader_wrn_no_content_title">Intet innhold å laste opp</string>
-  <string name="uploader_wrn_no_content_text">Intet innhold ble mottatt. Intet å laste opp.</string>
-  <string name="uploader_error_forbidden_content">%1$s har ikke tilgang til det delte innholdet</string>
-  <string name="uploader_info_uploading">Laster opp</string>
   <string name="file_list_seconds_ago">for få sekunder siden</string>
   <string name="file_list_empty">Ingenting her. Last opp noe!</string>
   <string name="file_list_loading">Laster...</string>
   <string name="file_list_no_app_for_file_type">Ingen app funnet for filtypen!</string>
   <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
+  <string name="upload_list_empty">Ingen opplastinger tilgjengelig.</string>
+  <string name="file_list_folder">mappe</string>
+  <string name="file_list_folders">mapper</string>
+  <string name="file_list_file">fil</string>
+  <string name="file_list_files">fil</string>
   <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
   <string name="filedetails_size">Størrelse:</string>
   <string name="filedetails_type">Type:</string>
@@ -86,6 +87,8 @@
   <string name="common_yes">Ja</string>
   <string name="common_no">Nei</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Fjern opplasting</string>
+  <string name="common_retry_upload">Prøv å laste opp igjen.</string>
   <string name="common_cancel_sync">Avbryt synkronisering</string>
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Lagre &amp; avslutt</string>
@@ -105,6 +108,25 @@
   <string name="uploader_upload_failed_ticker">Opplasting feilet</string>
   <string name="uploader_upload_failed_content_single">Opplasting av %1$s kunne ikke fullføres</string>
   <string name="uploader_upload_failed_credentials_error">Opplasting feilet, du må logge inn på nytt</string>
+  <string name="uploads_view_title">Opplastinger</string>
+  <string name="uploads_view_group_current_uploads">Nåværende</string>
+  <string name="uploads_view_group_failed_uploads">Feilet (trykk for å prøve igjen)</string>
+  <string name="uploads_view_group_finished_uploads">Opplastet</string>
+  <string name="uploads_view_upload_status_succeeded">Ferdig</string>
+  <string name="uploads_view_upload_status_cancelled">Avbrutt</string>
+  <string name="uploads_view_upload_status_paused">Pauset</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Tilkoblingsfeil</string>
+  <string name="uploads_view_upload_status_failed_retry">Opplasting vil prøves igjen snart</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Legitimasjonsfeil</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Mappefeil</string>
+  <string name="uploads_view_upload_status_failed_file_error">Filfeil</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Finner ikke lokal fil</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Tillatelsesfeil</string>
+  <string name="uploads_view_upload_status_conflict">Konflikt</string>
+  <string name="uploads_view_upload_status_service_interrupted">Appen ble avsluttet</string>
+  <string name="uploads_view_upload_status_unknown_fail">Ukjent feil</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Venter på trådløstilkobling</string>
+  <string name="uploads_view_later_waiting_to_upload">Venter på å laste op</string>
   <string name="downloader_download_in_progress_ticker">Laster ned...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Laster ned %2$s</string>
   <string name="downloader_download_succeeded_ticker">Nedlasting fullført</string>
@@ -212,6 +234,7 @@
   <string name="filename_forbidden_charaters_from_server">Filnavnet inneholder minst ett ulovlig tegn</string>
   <string name="filename_empty">Filnavn kan ikke være tomt</string>
   <string name="wait_a_moment">Vent et øyeblikk</string>
+  <string name="wait_checking_credentials">Sjekker lagrede påloggingsdetaljer</string>
   <string name="filedisplay_unexpected_bad_get_content">Uforventet problem; vennligst velg filen fra en annen applikasjon</string>
   <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
   <string name="activity_chooser_title">Send lenke til ...</string>
@@ -341,6 +364,7 @@
   <string name="pref_behaviour_entries_keep_file">beholdt i opprinnelig mappe</string>
   <string name="pref_behaviour_entries_move">flyttet til app-mappe</string>
   <string name="share_dialog_title">Deling</string>
+  <string name="share_file">Del %1$s</string>
   <string name="share_with_user_section_title">Del med brukere og grupper</string>
   <string name="share_no_users">Ingen data delt med brukere ennå</string>
   <string name="share_add_user_or_group">Legg til bruker eller gruppe</string>
@@ -348,10 +372,15 @@
   <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_with_title">Del med ...</string>
+  <string name="share_with_edit_title">Del med %1$s</string>
   <string name="share_search">Søk</string>
   <string name="search_users_and_groups_hint">Søk etter brukere og grupper</string>
   <string name="share_group_clarification">%1$s (gruppe)</string>
+  <string name="share_remote_clarification">%1$s (ekstern)</string>
+  <string name="share_known_remote_clarification">%1$s ( hos %2$s )</string>
   <string name="share_sharee_unavailable">Beklager, server-versjonen din tillater ikke klienter å dele med brukere.
         \nKontakt systemadministratoren</string>
   <string name="share_privilege_can_share">kan dele</string>
@@ -361,6 +390,10 @@
   <string name="share_privilege_can_edit_delete">slett</string>
   <string name="edit_share_unshare">Avslutt deling</string>
   <string name="edit_share_done">ferdig</string>
+  <string name="action_retry_uploads">Forsøkte igjen, feilet.</string>
+  <string name="action_clear_failed_uploads">Sletting feilet</string>
+  <string name="action_clear_successful_uploads">Sletting vellykket</string>
+  <string name="action_clear_finished_uploads">Slett alle ferdige</string>
   <string name="action_switch_grid_view">Rutenett-visning</string>
   <string name="action_switch_list_view">Listevisning</string>
   <string name="manage_space_title">Håndter plass</string>

+ 38 - 5
res/values-nl/strings.xml

@@ -25,6 +25,7 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Instellingen</string>
+  <string name="drawer_item_uploads_list">Uploads</string>
   <string name="drawer_item_logs">Logs</string>
   <string name="drawer_close">Sluiten</string>
   <string name="drawer_open">Open</string>
@@ -59,21 +60,21 @@ Download hier: %2$s</string>
   <string name="sync_string_files">Bestanden</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
-  <string name="uploader_btn_new_folder_text">Nieuwe map</string>
   <string name="uploader_top_message">Kies upload map:</string>
   <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
   <string name="uploader_wrn_no_account_text">Er zijn geen %1$s accounts op dit apparaat. Stel eerst een account in.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configureren</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afsluiten</string>
-  <string name="uploader_wrn_no_content_title">Geen inhoud om te uploaden</string>
-  <string name="uploader_wrn_no_content_text">Er werd geen inhoud ontvangen. Niets om te uploaden.</string>
-  <string name="uploader_error_forbidden_content">%1$s is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
-  <string name="uploader_info_uploading">Uploaden</string>
   <string name="file_list_seconds_ago">seconden geleden</string>
   <string name="file_list_empty">Er bevindt zich hier niets. Upload een bestand!</string>
   <string name="file_list_loading">Laden...</string>
   <string name="file_list_no_app_for_file_type">Geen app gevonden voor dit bestandsformaat!</string>
   <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
+  <string name="upload_list_empty">Geen uploads beschikbaar.</string>
+  <string name="file_list_folder">map</string>
+  <string name="file_list_folders">mappen</string>
+  <string name="file_list_file">bestand</string>
+  <string name="file_list_files">bestanden</string>
   <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
   <string name="filedetails_size">Grootte:</string>
   <string name="filedetails_type">Type:</string>
@@ -87,6 +88,8 @@ Download hier: %2$s</string>
   <string name="common_yes">Ja</string>
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Verwijder upload</string>
+  <string name="common_retry_upload">Probeer upload opnieuw</string>
   <string name="common_cancel_sync">Sync annuleren</string>
   <string name="common_cancel">Annuleren</string>
   <string name="common_save_exit">Opslaan &amp; einde</string>
@@ -106,6 +109,25 @@ Download hier: %2$s</string>
   <string name="uploader_upload_failed_ticker">Upload mislukt</string>
   <string name="uploader_upload_failed_content_single">Upload van %1$s kon niet voltooid worden</string>
   <string name="uploader_upload_failed_credentials_error">Upload mislukt, u moet opnieuw inloggen</string>
+  <string name="uploads_view_title">Uploads</string>
+  <string name="uploads_view_group_current_uploads">Huidige</string>
+  <string name="uploads_view_group_failed_uploads">Mislukt (tik om opnieuw te proberen)</string>
+  <string name="uploads_view_group_finished_uploads">Geüpload</string>
+  <string name="uploads_view_upload_status_succeeded">Afgerond</string>
+  <string name="uploads_view_upload_status_cancelled">Geannuleerd</string>
+  <string name="uploads_view_upload_status_paused">Gepauzeerd</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Verbindingsfout</string>
+  <string name="uploads_view_upload_status_failed_retry">Upload wordt dadelijk opnieuw geprobeerd</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Inlogfout</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Map fout</string>
+  <string name="uploads_view_upload_status_failed_file_error">Bestandsfout</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">Lokaal bestand niet gevonden</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Permissie fout</string>
+  <string name="uploads_view_upload_status_conflict">Conflict</string>
+  <string name="uploads_view_upload_status_service_interrupted">App werd gesloten</string>
+  <string name="uploads_view_upload_status_unknown_fail">Onbekende fout</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Wachten op een wifi-verbinding</string>
+  <string name="uploads_view_later_waiting_to_upload">Wachten om te uploaden</string>
   <string name="downloader_download_in_progress_ticker">Downloaden ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Aan het downloaden %2$s</string>
   <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
@@ -215,6 +237,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="filename_forbidden_charaters_from_server">De bestandsnaam bevat ten minste één ongeldig teken</string>
   <string name="filename_empty">Bestandsnaam mag niet leeg zijn</string>
   <string name="wait_a_moment">Even geduld</string>
+  <string name="wait_checking_credentials">Opgeslagen inloggegevens nakijken</string>
   <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer een andere app om het bestand te selecteren</string>
   <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
   <string name="activity_chooser_title">Verstuur link naar ...</string>
@@ -344,6 +367,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,10 +375,15 @@ 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>
+  <string name="share_remote_clarification">%1$s (extern)</string>
+  <string name="share_known_remote_clarification">%1$s ( om %2$s )</string>
   <string name="share_sharee_unavailable">Sorry, uw serverversie staat niet toe om binnen de clients te delen met gebruikers.
 Neem contact op met uw beheerder</string>
   <string name="share_privilege_can_share">kan delen</string>
@@ -364,6 +393,10 @@ Neem contact op met uw beheerder</string>
   <string name="share_privilege_can_edit_delete">verwijderen</string>
   <string name="edit_share_unshare">Stop met delen</string>
   <string name="edit_share_done">gedaan</string>
+  <string name="action_retry_uploads">Opnieuw proberen mislukt</string>
+  <string name="action_clear_failed_uploads">Leegmaken mislukt</string>
+  <string name="action_clear_successful_uploads">Leegmaken gelukt</string>
+  <string name="action_clear_finished_uploads">Alles leegmaken beëindigd</string>
   <string name="action_switch_grid_view">Raster indeling</string>
   <string name="action_switch_list_view">Lijst indeling</string>
   <string name="manage_space_title">Beheer ruimte</string>

+ 1 - 4
res/values-nn-rNO/strings.xml

@@ -37,13 +37,9 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Kopla til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
-  <string name="uploader_btn_new_folder_text">Ny mappe</string>
   <string name="uploader_wrn_no_account_title">Fann ingen konto</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Avslutt</string>
-  <string name="uploader_wrn_no_content_title">Inga innhald å lasta opp</string>
-  <string name="uploader_wrn_no_content_text">Mottok ikkje noko innhald. Ingenting å lasta opp.</string>
-  <string name="uploader_info_uploading">Lastar opp</string>
   <string name="file_list_seconds_ago">sekund sidan</string>
   <string name="file_list_empty">Ingenting her. Last noko opp!</string>
   <string name="filedetails_select_file">Trykk på ei fil for å visa meir informasjon.</string>
@@ -69,6 +65,7 @@
   <string name="uploader_upload_succeeded_ticker">Opplasting fullført</string>
   <string name="uploader_upload_failed_ticker">Feil ved opplasting</string>
   <string name="uploader_upload_failed_content_single">Klarte ikkje å lasta %1$s ferdig opp</string>
+  <string name="uploads_view_upload_status_unknown_fail">Ukjend feil</string>
   <string name="downloader_download_in_progress_ticker">Lastar ned …</string>
   <string name="downloader_download_in_progress_content">%1$d%% lastar ned %2$s</string>
   <string name="downloader_download_succeeded_ticker">Nedlasting vellukka</string>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác