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

.gitignore

@@ -37,7 +37,4 @@ tests/proguard-project.txt
 .gradle
 .idea
 *.iml
-build
-
-# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
-actionbarsherlock
+build

.travis.yml

@@ -2,12 +2,10 @@ sudo: false
 language: android
 android:
   components:
-    - build-tools-23.0.2
+    - build-tools-23.0.3
     - android-23
     - android-22
     - android-19
-before_install:
-  - rm pom.xml
 script:
   - ./setup_env.sh ant
   - ant clean

AndroidManifest.xml

@@ -19,8 +19,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10900100"
-    android:versionName="1.9.1" >
+    android:versionCode="20000000"
+    android:versionName="2.0.0" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -72,7 +72,7 @@
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity" />
         <activity android:name=".ui.activity.Uploader"
-                  android:launchMode="singleInstance"
+                  android:taskAffinity=""
                   android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.0 (April 2016)
+- Uploads view: track the progress of your uploads and handle failures
+- Federated sharing: share files with users in other ownCloud servers
+- Improvements on the UI following material design lines
+- Set a shared-by-link folder as editable
+- Wifi-only for instant uploads stop on Wifi loss
+- Be warned of server certificate changed in any action
+- Improvements when other apps send files to ownCloud
+- Bug fixing
+
 ## 1.9.1 (February 2016)
 - Set and edit permissions on internal shared data
 - Instant uploads: avoid file duplications, set policy in app settings
@@ -79,6 +89,3 @@
 - Settings view updated
 - Improved subjects in e-mails
 - Bugs fixed
-
-
-

SETUP.md

@@ -131,29 +131,6 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 The resulting APKs will be saved in the 'bin/' subdirectory of the project.
 
 
-### 6. Building in command line with maven:
-
-** Currently these build instructions DO NOT WORK. There is no estimation time to fix it. Unless some volunteer contributor fixes this build option, and given that Maven is a minority option in Android environments, we will probably remove this option.
-
-NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed.
-
-Download/install Android plugin for Maven, then build ownCloud with mvn:
-
-* Resolve necessary dependencies running:
-  - Windows: "setup_env.bat maven"
-  - Mac OS/Linux: "./setup_env.sh maven"
-* cd ..
-* git clone https://github.com/mosabua/maven-android-sdk-deployer.git
-* cd maven-android-sdk-deployer
-* mvn -pl com.simpligility.android.sdk-deployer:android-22 -am install
-* mvn -pl com.simpligility.android.sdk-deployer:android-23 -am install
-* cd ../android/owncloud-android-library
-* mvn install
-* cd ..
-
-Now you can create ownCloud APK using "mvn package" and find it as ownCloud.apk under the target
-
-
 [0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
 [1]: https://git-scm.com/
 [2]: https://git-scm.com/downloads

build.gradle

@@ -3,12 +3,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
+ext {
+    supportLibraryVersion = '23.1.1'
+}
 
 repositories {
     mavenCentral()
@@ -21,16 +24,16 @@ repositories {
 dependencies {
     compile name: 'touch-image-view'
     compile project(':owncloud-android-library')
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile "com.android.support:support-v4:${supportLibraryVersion}"
+    compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile 'com.getbase:floatingactionbutton:1.10.1'
 }
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 18 17:01:43 CET 2015
+#Thu Apr 07 22:12:15 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

oc_jb_workaround/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100027"
-    android:versionName="1.0.27" >
+    android:versionCode="0100028"
+    android:versionName="1.0.28" >
 
     <uses-sdk
         android:minSdkVersion="16"

oc_jb_workaround/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -14,7 +14,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {

owncloud-android-library

@@ -1 +1 @@
-Subproject commit 39e3ddaa07b0943b034b34a84a33b4dc4c7475d0
+Subproject commit 785562038e5b2c9847e8eb5f550065d05fd8137c

pom.xml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.owncloud.android</groupId>
-    <artifactId>owncloud</artifactId>
-    <version>${owncloud.version}</version>
-    <packaging>apk</packaging>
-    <name>Owncloud Android</name>
-
-    <properties>
-        <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
-        <java-version>1.6</java-version>
-        <!-- Given by maven-android-sdk-deployer -->
-        <google.android-version>4.4.2_r4</google.android-version>
-        <!-- Usually the latest Android API -->
-        <google.android-api>19</google.android-api>
-        <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
-    </properties>
-
-    <url>https://github.com/owncloud/android</url>
-    <description>Owncloud for Android</description>
-    <scm>
-        <connection>scm:git:git@github.com:owncloud/android.git</connection>
-        <developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
-        <url>https://github.com/owncloud/android</url>
-    </scm>
-
-
-    <!--<repositories>-->
-        <!--<repository>-->
-            <!--<id>android-support</id>-->
-            <!--<url>file://${env.ANDROID_HOME}/extras/android/m2repository</url>-->
-        <!--</repository>-->
-    <!--</repositories>-->
-
-    <dependencies>
-
-        <!-- Dirty trick, but it works. TouchImageView library is not available as Maven project. -->
-        <dependency>
-            <groupId>touch-image-view.jar</groupId>
-            <artifactId>touch-image-view.jar</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/touch-image-view.jar</systemPath>
-        </dependency>
-          
-        <!-- This causes a (version?) conflict during packaging since sherlockactionbar also includes compatibility-v4 -->
-        <!--<dependency>
-            <groupId>android.support</groupId>
-            <artifactId>compatibility-v4</artifactId>
-            <version>19.1.0</version>
-        </dependency>-->
-        <!-- Instead we need to include the exact same version -->
-
-        <dependency>
-            <groupId>com.jakewharton</groupId>
-            <artifactId>disklrucache</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>android-support-v4.jar</groupId>
-            <artifactId>android-support-v4.jar</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/third_party/android-support-library/android-support-v4.jar</systemPath>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.actionbarsherlock</groupId>
-            <artifactId>library</artifactId>
-            <version>${actionbarsherlock-version}</version>
-            <type>apklib</type>
-        </dependency>
-
-        <dependency>
-            <groupId>android</groupId>
-            <artifactId>android</artifactId>
-            <version>${google.android-version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>android.support</groupId>-->
-            <!--<artifactId>compatibility-v4</artifactId>-->
-            <!--<version>19.1.0</version>-->
-        <!--</dependency>-->
-
-
-        <!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->
-        <dependency>
-            <groupId>com.owncloud.android</groupId>
-            <artifactId>owncloud-android-library</artifactId>
-            <version>${owncloud.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-
-        <sourceDirectory>src</sourceDirectory>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java-version}</source>
-                    <target>${java-version}</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <version>3.8.2</version>
-                <configuration>
-                    <sdk>
-                        <path>${env.ANDROID_HOME}</path>
-                        <platform>${google.android-api}</platform>
-                    </sdk>
-                </configuration>
-                <extensions>true</extensions>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-</project>
-

res/layout-land/account_setup.xml

@@ -26,7 +26,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_above="@+id/bottom_block"
         android:layout_alignParentTop="true"
         android:orientation="horizontal" >
@@ -79,7 +79,6 @@
 				    android:visibility="gone"
 				    android:layout_marginBottom="10dp"
 					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		android:id="@+id/hostUrlFrame"
@@ -96,6 +95,7 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
+						android:textColor="@color/login_text_color"
 						android:textColorHint="@color/login_text_hint_color"
 						android:contentDescription="@string/auth_host_address"
 						>
@@ -125,7 +125,6 @@
 					android:drawablePadding="5dp"
 					android:gravity="center_vertical"
 					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"
 					android:text="@string/auth_testing_connection"
 					android:minHeight="32dp"
                     android:contentDescription="@string/auth_testing_connection"/>
@@ -138,7 +137,6 @@
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
 					android:textColor="@color/primary"
-					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
@@ -152,6 +150,7 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 				</EditText>            
@@ -165,6 +164,7 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
@@ -177,6 +177,7 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
+					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_username"
 					/>
@@ -189,6 +190,7 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
+					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					/>
 		        
@@ -201,7 +203,6 @@
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
 					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
 
@@ -228,19 +229,27 @@
 		    android:enabled="false"
 		    android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"/>
-		
-		<Button
-		    android:id="@+id/welcome_link"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_gravity="center_horizontal"
-		    android:background="@android:color/transparent"
-		    android:onClick="onRegisterClick"
-		    android:paddingBottom="5dp"
-		    android:paddingTop="5dp"
-		    android:text="@string/auth_register"
-			android:textColor="@color/login_text_color"
-            android:contentDescription="@string/auth_register"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:gravity="center|bottom">
+
+			<Button
+				android:id="@+id/welcome_link"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:background="@android:color/transparent"
+				android:onClick="onRegisterClick"
+				android:paddingBottom="5dp"
+				android:paddingTop="5dp"
+				android:text="@string/auth_register"
+				android:textColor="@color/login_text_color"
+				android:contentDescription="@string/auth_register"/>
+
+		</LinearLayout>
+
 	</LinearLayout>
 		
 </RelativeLayout>

res/layout/account_setup.xml

@@ -28,7 +28,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@color/login_background_color"
         android:gravity="center"
         android:orientation="vertical"
@@ -65,7 +65,6 @@
             android:visibility="gone"
             android:layout_marginBottom="10dp"
             android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
 	    <FrameLayout 
@@ -83,6 +82,7 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
+                android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_host_address"
                 >
@@ -112,7 +112,6 @@
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
             android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
             android:text="@string/auth_testing_connection"
             android:minHeight="32dp"
             android:contentDescription="@string/auth_testing_connection"/>
@@ -126,7 +125,6 @@
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/primary"
-            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/oauth_check_onoff"
             />
 
@@ -136,6 +134,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
+            android:textColor="@color/login_text_color"
             android:textColorHint="@color/login_text_hint_color"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
@@ -152,6 +151,7 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
+            android:textColor="@color/login_text_color"
             android:textColorHint="@color/login_text_hint_color"
             android:visibility="gone"/>
 
@@ -162,6 +162,7 @@
             android:ems="10"
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
+            android:textColor="@color/login_text_color"
             android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_username"
             />
@@ -174,6 +175,7 @@
 		    android:ems="10"
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
+            android:textColor="@color/login_text_color"
             android:textColorHint="@color/login_text_hint_color"
 		    android:contentDescription="@string/auth_password"
             />
@@ -188,7 +190,6 @@
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized"
             android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_unauthorized"/>
 
         <android.support.v7.widget.AppCompatButton
@@ -202,18 +203,24 @@
             android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"/>
 
-        <Button
-            android:id="@+id/welcome_link"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:onClick="onRegisterClick"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            android:text="@string/auth_register"
-            android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
-            android:contentDescription="@string/auth_register"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center|bottom">
+
+            <Button
+                android:id="@+id/welcome_link"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                android:onClick="onRegisterClick"
+                android:paddingBottom="5dp"
+                android:paddingTop="5dp"
+                android:text="@string/auth_register"
+                android:textColor="@color/login_text_color"
+                android:contentDescription="@string/auth_register"/>
+            
+        </LinearLayout>
 
     </LinearLayout>
 

res/layout/edit_box_dialog.xml

@@ -27,10 +27,7 @@
         android:id="@+id/user_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ems="10" 
-		android:inputType="textNoSuggestions"
-		>
-
-    </EditText>
+        android:ems="10"
+        android:inputType="textNoSuggestions|textCapSentences"/>
 
 </LinearLayout>

res/layout/list_fragment.xml

@@ -113,21 +113,21 @@
             fab:fab_title=""/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_mkdir"
+            android:id="@+id/fab_upload_from_app"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_size="mini"
-            fab:fab_icon="@drawable/ic_action_create_dir"
+            fab:fab_icon="@drawable/ic_import"
             fab:fab_colorNormal="@color/primary_button_background_color"
             fab:fab_colorPressed="@color/owncloud_blue"
             fab:fab_title=""/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_upload_from_app"
+            android:id="@+id/fab_mkdir"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_size="mini"
-            fab:fab_icon="@drawable/ic_import"
+            fab:fab_icon="@drawable/ic_action_create_dir"
             fab:fab_colorNormal="@color/primary_button_background_color"
             fab:fab_colorPressed="@color/owncloud_blue"
             fab:fab_title=""/>

res/layout/search_users_groups_layout.xml

@@ -23,11 +23,11 @@
     android:id="@+id/search_layout"
     android:minWidth="200dp"
     android:layout_marginRight="@dimen/standard_margin"
-    android:layout_marginBottom="20dp">
+    android:layout_marginBottom="@dimen/standard_half_margin">
 
     <TextView
         android:id="@+id/searchUserGroupsTitle"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/share_with_title"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"

res/layout/share_file_layout.xml

@@ -81,10 +81,14 @@
             />
 
         <LinearLayout
+            android:id="@+id/shareWithUsersSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/standard_padding">
+            android:paddingLeft="@dimen/standard_padding"
+            android:paddingRight="@dimen/standard_padding"
+            android:paddingTop="@dimen/standard_padding"
+            >
 
             <TextView
                 android:id="@+id/shareWithUsersSectionTitle"
@@ -122,6 +126,18 @@
                 android:text="@string/share_add_user_or_group"
                 android:theme="@style/Button.Primary"/>
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/shareViaLinkSection"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/standard_padding"
+            android:paddingLeft="@dimen/standard_padding"
+            android:paddingRight="@dimen/standard_padding"
+            >
+
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/shareViaLinkSectionSwitch"
                 style="?android:attr/listSeparatorTextViewStyle"
@@ -134,153 +150,160 @@
                 android:text="@string/share_via_link_section_title"
                 android:textColor="@color/color_accent"/>
 
-            <RelativeLayout
-                android:id="@+id/shareViaLinkExpirationSection"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_half_margin"
-                >
-
-                <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"/>
-
-                <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/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"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                >
+                android:orientation="vertical"
+                android:layout_marginTop="@dimen/standard_half_margin">
 
-                <android.support.v7.widget.SwitchCompat
-                    android:id="@+id/shareViaLinkPasswordSwitch"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:id="@+id/shareViaLinkEditPermissionSection"
+                    android:layout_width="match_parent"
                     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:visibility="invisible"
-                >
-
-                <android.support.v7.widget.SwitchCompat
-                    android:id="@+id/shareViaLinkEditPermissionSwitch"
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    >
+
+                    <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"
+                        />
+
+                    <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:padding="@dimen/standard_half_padding"
+                        android:text="@string/share_via_link_edit_permission_label"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/shareViaLinkPasswordSection"
+                    android:layout_width="match_parent"
+                    android:layout_height="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/shareViaLinkExpirationSection"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerInParent="true"
-                    android:padding="@dimen/standard_half_padding"
-                    />
-
-                <TextView
-                    android:id="@+id/shareViaLinkEditPermissionLabel"
-                    android:layout_width="wrap_content"
+                    >
+
+                    <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"/>
+
+                    <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/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>
+
+                <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_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:layout_gravity="center_horizontal"
+                    android:contentDescription="shareGetLinkButton"
+                    android:text="@string/share_get_public_link_button"
+                    android:theme="@style/Button.Primary"/>
 
-            <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>
+
     </LinearLayout>
 
 </ScrollView>

res/values-ar/strings.xml

@@ -75,6 +75,7 @@
   <string name="common_no">لا</string>
   <string name="common_ok">تم</string>
   <string name="common_cancel">إلغاء</string>
+  <string name="common_back">رجوع</string>
   <string name="common_error">خطأ</string>
   <string name="common_loading">تحميل ...</string>
   <string name="common_error_unknown">خطأ غير معروف. </string>

res/values-bg-rBG/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">%1$s Android приложение</string>
   <string name="about_version">версия %1$s</string>
   <string name="actionbar_sync">Обновяви профила</string>
   <string name="actionbar_upload">Качване</string>
@@ -24,19 +25,24 @@
   <!--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>
   <string name="prefs_category_general">Общи</string>
   <string name="prefs_category_more">Още</string>
   <string name="prefs_accounts">Профили</string>
+  <string name="prefs_manage_accounts">Управление на профилите</string>
   <string name="prefs_passcode">Заключваща парола</string>
   <string name="prefs_instant_upload">Незабавно качване на снимки</string>
   <string name="prefs_instant_upload_summary">Незабвано качване на снимки направени с камерата</string>
   <string name="prefs_instant_video_upload">Незабавно качване на видео</string>
   <string name="prefs_instant_video_upload_summary">Незабавно качване на видеота записани от камерата.</string>
+  <string name="prefs_log_title">Разреши влизане</string>
   <string name="prefs_log_summary">Използва се за докладване на проблеми</string>
+  <string name="prefs_log_title_history">История на влизанията</string>
   <string name="prefs_log_summary_history">Показва запазените доклади</string>
+  <string name="prefs_log_delete_history_button">Изтрий истрията</string>
   <string name="prefs_help">Помощ</string>
   <string name="prefs_recommend">Препоръчай на приятел</string>
   <string name="prefs_feedback">Обратна Връзка</string>
@@ -45,6 +51,7 @@
   <string name="prefs_remember_last_upload_location_summary">Запомни мястото на последната споделена папка</string>
   <string name="recommend_subject">Опитай %1$s на смартфона си!</string>
   <string name="recommend_text">Бих желал да те поканя да ползваш %1$s на своя смартфон!\nИзтеглия я от тук:%2$s</string>
+  <string name="auth_check_server">Проверка на сървъра</string>
   <string name="auth_host_url">Адрес на сървъра https://…</string>
   <string name="auth_username">Потребител</string>
   <string name="auth_password">Парола</string>
@@ -54,12 +61,22 @@
   <string name="uploader_btn_upload_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_error_title_no_file_to_upload">Няма файл за качване</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s неможе да качите част от текст като фаил</string>
+  <string name="uploader_error_message_no_file_to_upload">Получените данни не включват валиден файл.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Файлът не може да бъде качен.</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s нямате право да четете получения фаил</string>
+  <string name="uploader_error_message_source_file_not_found">Файл за качване не е намерен. Моля, проверете дали файлът съществува.</string>
+  <string name="uploader_error_message_source_file_not_copied">Възникна грешка при копиране на файла във временна папка. Моля, опитайте да изпратите отново.</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="upload_list_empty">Няма налични актуализации.</string>
   <string name="file_list_folder">папка</string>
   <string name="file_list_folders">папки</string>
   <string name="file_list_file">файл</string>
@@ -70,36 +87,66 @@
   <string name="filedetails_created">Създаден на:</string>
   <string name="filedetails_modified">Променен на:</string>
   <string name="filedetails_download">Изтегляне</string>
+  <string name="filedetails_sync_file">Синхронизиране</string>
   <string name="filedetails_renamed_in_upload_msg">Файлът беше преименуван на %1$s по време на качването.</string>
+  <string name="list_layout">Оформяне на списък</string>
   <string name="action_share">Споделяне</string>
   <string name="common_yes">Да</string>
   <string name="common_no">Не</string>
   <string name="common_ok">ОК</string>
+  <string name="common_remove_upload">Премахване каченото</string>
+  <string name="common_retry_upload">Повторно качване</string>
+  <string name="common_cancel_sync">Отмени синхронизирането</string>
   <string name="common_cancel">Отказ</string>
+  <string name="common_back">Назад</string>
+  <string name="common_save_exit">Записши &amp; съшествуващ</string>
   <string name="common_error">Грешка</string>
   <string name="common_loading">Зареждане...</string>
+  <string name="common_unknown">несяна</string>
   <string name="common_error_unknown">Непозната грешка</string>
   <string name="about_title">Относно</string>
   <string name="change_password">Промяна на парола</string>
+  <string name="delete_account">Премахни потребителя</string>
   <string name="create_account">Създаване на профил</string>
   <string name="upload_chooser_title">Качване от...</string>
   <string name="uploader_info_dirname">Име на папката</string>
   <string name="uploader_upload_in_progress_ticker">Качване...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Качване %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Качването е успешно.</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s качено</string>
   <string name="uploader_upload_failed_ticker">Качването е неуспешно.</string>
   <string name="uploader_upload_failed_content_single">Качването на %1$s не може да бъде завършено.</string>
+  <string name="uploader_upload_failed_credentials_error">Неуспешно качване, нужно е да влезете отново</string>
+  <string name="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_cancelled">Отказано</string>
+  <string name="uploads_view_upload_status_paused">Паузирано</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Грешка при свързване</string>
+  <string name="uploads_view_upload_status_failed_retry">Качването ще се повтори скоро</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_localfile_error">Локалния фаил не е намерен</string>
+  <string name="uploads_view_upload_status_failed_permission_error">Грешка с правата</string>
+  <string name="uploads_view_upload_status_conflict">Конфликт</string>
+  <string name="uploads_view_upload_status_service_interrupted">Приложението спря работа</string>
   <string name="uploads_view_upload_status_unknown_fail">Непозната грешка.</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Изчакване на уайрлес връзка</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>
+  <string name="downloader_download_succeeded_content">%1$s свалено</string>
   <string name="downloader_download_failed_ticker">Изтеглянето е неуспешно.</string>
   <string name="downloader_download_failed_content">Изтеглянето на %1$s не може да бъде завършено.</string>
   <string name="downloader_not_downloaded_yet">Все още не е изтеглено</string>
+  <string name="downloader_download_failed_credentials_error">Свалянето провалено, трябва да влезете отново</string>
   <string name="common_choose_account">Изберете профил</string>
+  <string name="sync_fail_ticker">Синхронизацията пропадна</string>
+  <string name="sync_fail_ticker_unauthorized">Синхронизацията пропадна, нужно е да влезете отново</string>
+  <string name="sync_fail_content">Синхронизацията на %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 kept-in-sync файла не могат да бъдат сихронизирани</string>
@@ -114,8 +161,10 @@
   <string name="foreign_files_fail">Неуспешно преместване на някои файлове.</string>
   <string name="foreign_files_local_text">Локален: %1$s</string>
   <string name="foreign_files_remote_text">Отдалечен: %1$s</string>
+  <string name="pass_code_enter_pass_code">Моля, въведи парола за достъп</string>
   <string name="pass_code_configure_your_pass_code">Въведи парола за достъп</string>
   <string name="pass_code_configure_your_pass_code_explanation">Паролата ще се изисква при всяко стартиране на приложението</string>
+  <string name="pass_code_reenter_your_pass_code">Моля, въведи отново парола за достъп</string>
   <string name="pass_code_remove_your_pass_code">Премахни парола</string>
   <string name="pass_code_mismatch">Паролите не съвпадат</string>
   <string name="pass_code_wrong">Грешна парола</string>
@@ -140,6 +189,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>
@@ -151,6 +202,7 @@
   <string name="auth_unknown_host_title">Неуспешно намиране на сървъра.</string>
   <string name="auth_incorrect_path_title">Сървърът не е открит.</string>
   <string name="auth_timeout_title">Сървърът се забави прекалено много с отговора.</string>
+  <string name="auth_incorrect_address_title">Грешен формат адрес на сървъра</string>
   <string name="auth_ssl_general_error_title">Неуспешна инициализация на SSL.</string>
   <string name="auth_ssl_unverified_server_title">Неуспешна проверка на SSL самоличността на сървъра.</string>
   <string name="auth_bad_oc_version_title">Неизвестна версия на сървъра.</string>
@@ -159,12 +211,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">Неочакван състояние; Моля, въведете адреса на сървъра отново</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="common_rename">Преименуване</string>
@@ -184,6 +240,7 @@
   <string name="filename_forbidden_charaters_from_server">Името на файла съдържа поне един невалиден символ</string>
   <string name="filename_empty">Името на файла не може да бъде празно</string>
   <string name="wait_a_moment">Изчакайте малко</string>
+  <string name="wait_checking_credentials">Проверка съхранените пълномощия</string>
   <string name="filedisplay_unexpected_bad_get_content">Неочакван проблем; моля, изберете файла от друга програма.</string>
   <string name="filedisplay_no_file_selected">Не е избран файл</string>
   <string name="activity_chooser_title">Изпращане на връзката до...</string>
@@ -212,6 +269,9 @@
   <string name="ssl_validator_label_validity_to">До:</string>
   <string name="ssl_validator_label_signature">Електронен подпис:</string>
   <string name="ssl_validator_label_signature_algorithm">Алгоритъм:</string>
+  <string name="digest_algorithm_not_available">Този алгоритъм не се потдържа от вашия телефон</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Пръстов отпечатък</string>
+  <string name="certificate_load_problem">Има проблем при зареждане на сертификата</string>
   <string name="ssl_validator_null_cert">Сертификатът не може да бъде показан.</string>
   <string name="ssl_validator_no_info_about_error">- Няма информация за грешката.</string>
   <string name="placeholder_sentence">Това е за запазване на място</string>
@@ -220,22 +280,33 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
+  <string name="instant_upload_on_wifi">Качване на снимки само през WiFi</string>
+  <string name="instant_video_upload_on_wifi">Качване на видео само през WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Файлов конфликт</string>
   <string name="conflict_keep_both">Запазване и на двата</string>
+  <string name="conflict_use_local_version">Локална версия</string>
+  <string name="conflict_use_server_version">Сървърна версия</string>
   <string name="preview_image_description">Преглед на изображението</string>
   <string name="preview_image_error_unknown_format">Изображението не може да бъде показано</string>
   <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
+  <string name="prefs_instant_upload_path_title">Път за качване</string>
   <string name="share_link_no_support_share_api">За съжаление споделянето не е включено на сървъра ви. 
 Моля, свържете се с администратора.</string>
   <string name="share_link_file_no_exist">Неуспешен опит за споделяне. Моля, провери дали файла съществува.</string>
   <string name="share_link_file_error">Настъпи грешка при опита за споделяне на този файл или папка.</string>
   <string name="unshare_link_file_no_exist">Неуспешен опит за прекратяване на споделянето. Моля, провери дали файла съществува.</string>
   <string name="unshare_link_file_error">Настъпи грешка при опита за премахване на споделянето на този файл или папка.</string>
+  <string name="update_link_file_no_exist">Не може да се актуализира. Моля, проверете дали файлът съществува</string>
+  <string name="update_link_file_error">Възникна грешка докато се опитва да обнови споделянето</string>
   <string name="share_link_password_title">Въведи Парола</string>
   <string name="share_link_empty_password">Вие трябва да въведете парола</string>
   <string name="activity_chooser_send_file_title">Изпращане</string>
   <string name="copy_link">Копиране на връзката</string>
   <string name="clipboard_text_copied">Копирана</string>
+  <string name="clipboard_no_text_to_copy">Няма получен текст за копиране в клипборда</string>
+  <string name="clipboard_uxexpected_error">Неизвеста грешка при опит за копиране в клипборда</string>
+  <string name="clipboard_label">Текста е копиран от %1$s</string>
   <string name="error_cant_bind_to_operations_service">Критична грешка: не може да изпълни операциите</string>
   <string name="network_error_socket_exception">Настъпи грешка при свързването със сървъра.</string>
   <string name="network_error_socket_timeout_exception">Настъпи грешка при свързването със сървъра, операцията не е изпълнена.</string>
@@ -247,6 +318,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>
@@ -254,7 +326,10 @@
   <string name="prefs_add_account">Добавяне на профил</string>
   <string name="auth_redirect_non_secure_connection_title">Сигурна връзка е пренасочена по несигурен път.</string>
   <string name="actionbar_logger">Доклади</string>
+  <string name="log_send_history_button">Изпрати историята</string>
+  <string name="log_send_no_mail_app">Не е намерено приложение за изпращане на логове. Моля инсталирайте e-mail приложение</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>
@@ -265,6 +340,7 @@
   <string name="move_file_invalid_overwrite">Файлът вече съществува в отдалечената папка.</string>
   <string name="move_file_error">Настъпи грешка при опита за преместване на този файл или папка.</string>
   <string name="forbidden_permissions_move">за да преместиш този файл</string>
+  <string name="copy_file_not_found">Невъзможно копиране. Проверете дали файлът съществува</string>
   <string name="copy_file_invalid_overwrite">Файлът вече съществува в отдалечената папка.</string>
   <string name="prefs_category_details">Подробности</string>
   <string name="shared_subject_header">споделен</string>

res/values-bn-rBD/strings.xml

@@ -57,6 +57,7 @@
   <string name="common_no">না</string>
   <string name="common_ok">তথাস্তু</string>
   <string name="common_cancel">বাতিল</string>
+  <string name="common_back">পেছনে যাও</string>
   <string name="common_error">সমস্যা</string>
   <string name="common_loading">লোড চলছে....</string>
   <string name="common_error_unknown">অজানা জটিলতা</string>

res/values-ca/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">%1$s Aplicació d\'Android</string>
   <string name="about_version">versió %1$s</string>
   <string name="actionbar_sync">Actualitza compte</string>
   <string name="actionbar_upload">Puja un fitxer</string>
@@ -20,10 +21,13 @@
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Tots els fitxers</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
-  <string name="drawer_item_settings">configuració</string>
-  <string name="drawer_close">tanca</string>
+  <string name="drawer_item_settings">Configuració</string>
+  <string name="drawer_item_uploads_list">Fitxers carregats</string>
+  <string name="drawer_item_logs">Registre</string>
+  <string name="drawer_close">Tanca</string>
   <string name="drawer_open">Obre</string>
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Més</string>
@@ -34,13 +38,17 @@
   <string name="prefs_instant_upload_summary">Puja instantàniament les fotografies preses amb la càmera</string>
   <string name="prefs_instant_video_upload">Pujades de vídeos instantanies</string>
   <string name="prefs_instant_video_upload_summary">Pujar instantàniament vídeos gravats per la càmera</string>
+  <string name="prefs_log_title">Habilita els registres</string>
   <string name="prefs_log_summary">Això s\'usa per registrar problemes</string>
+  <string name="prefs_log_title_history">Historial dels registres</string>
   <string name="prefs_log_summary_history">Això mostra els registres desats</string>
+  <string name="prefs_log_delete_history_button">Esborra l\'historial</string>
   <string name="prefs_help">Ajuda</string>
   <string name="prefs_recommend">Recomana a un amic</string>
   <string name="prefs_feedback">Comentaris</string>
   <string name="prefs_imprint">Imprint</string>
   <string name="recommend_subject">Proveu %1$s a un telèfon avançat!</string>
+  <string name="auth_check_server">Comprova el funcionament del servidor</string>
   <string name="auth_host_url">Adreça del servidor https://…</string>
   <string name="auth_username">Nom d\'usuari</string>
   <string name="auth_password">Contrasenya</string>
@@ -50,43 +58,69 @@
   <string name="uploader_btn_upload_text">Puja</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_text">No hi ha comptes %1$s al dispositiu. Primer configureu un 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_error_title_no_file_to_upload">No hi ha fitxers per carregar</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s no pot carregar un fragment de text com si fos un fitxer.</string>
+  <string name="uploader_error_message_no_file_to_upload">Les dades rebudes no contenen cap fitxer vàlid.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">No es pot carregar el fitxer</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s no té permissos per llegir un dels fitxers rebuts</string>
   <string name="file_list_seconds_ago">segons enrere</string>
   <string name="file_list_empty">Res per aquí. Pugeu alguna cosa!</string>
+  <string name="file_list_loading">Carregant...</string>
+  <string name="file_list_no_app_for_file_type">No s\'ha trobat cap aplicació per a aquest tipus de fitxer!</string>
   <string name="local_file_list_empty">No hi ha arxius a aquesta carpeta</string>
+  <string name="upload_list_empty">No hi ha fitxers carregats disponibles.</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="file_list_files">fitxers</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>
   <string name="filedetails_created">Creat:</string>
   <string name="filedetails_modified">Modificat:</string>
   <string name="filedetails_download">Baixa</string>
+  <string name="filedetails_sync_file">Sincronitza</string>
   <string name="filedetails_renamed_in_upload_msg">L\'arxiu s\'ha canviat de nom a %1$s durant la càrrega</string>
   <string name="action_share">Comparteix</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
   <string name="common_ok">D\'acord</string>
+  <string name="common_remove_upload">Esborra els fitxers carregats</string>
+  <string name="common_retry_upload">Torna a intentar la càrrega</string>
+  <string name="common_cancel_sync">Cancel·la la sincronització</string>
   <string name="common_cancel">Cancel·la</string>
+  <string name="common_back">Enrera</string>
+  <string name="common_save_exit">Desa i surt</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Carregant...</string>
+  <string name="common_unknown">desconegut</string>
   <string name="common_error_unknown">Error desconegut</string>
   <string name="about_title">Quant a</string>
   <string name="change_password">Canvia la contrasenya</string>
+  <string name="delete_account">Elimina el compte</string>
   <string name="create_account">Crea un compte</string>
   <string name="upload_chooser_title">Puja fitxer des de ...</string>
   <string name="uploader_info_dirname">Nom de la carpeta</string>
   <string name="uploader_upload_in_progress_ticker">S\'està pujant ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Pujant %2$s</string>
   <string name="uploader_upload_succeeded_ticker">La pujada ha estat correcte</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s s\'ha carregat correctament</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="uploader_upload_failed_credentials_error">La pujada ha fallat, us heu de tornar a acreditar</string>
+  <string name="uploads_view_title">Fitxers carregats</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_cancelled">S\'ha cancel·lat</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Hi ha un error de connexió</string>
+  <string name="uploads_view_upload_status_failed_credentials_error">Hi ha un error de credencials</string>
+  <string name="uploads_view_upload_status_failed_folder_error">Hi ha un error de carpetes</string>
+  <string name="uploads_view_upload_status_failed_file_error">Hi ha un error en el fitxer</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">No s\'ha trobat el fitxer local</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>
@@ -231,6 +265,7 @@
   <string name="prefs_category_accounts">Comptes</string>
   <string name="prefs_add_account">Afegeix compte</string>
   <string name="auth_redirect_non_secure_connection_title">La connexió segura està essent redirigida a través d\'una ruta insegura</string>
+  <string name="actionbar_logger">Registre</string>
   <string name="saml_authentication_required_text">Es requereix autenticació</string>
   <string name="saml_authentication_wrong_pass">Contrasenya incorrecta</string>
   <string name="actionbar_move">Moure</string>

res/values-cs-rCZ/strings.xml

@@ -64,11 +64,19 @@
   <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_error_title_no_file_to_upload">Žádný soubor k nahrání</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s neumí nahrát text jako soubor.</string>
+  <string name="uploader_error_message_no_file_to_upload">Obdržená data neobsahují žádný platný soubor.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Soubor nelze nahrát</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s nemá oprávnění číst přijatý soubor</string>
+  <string name="uploader_error_message_source_file_not_found">Soubor k nahrání nebyl v tomto umístění nalezen. Zkontrolujte prosím zda soubor existuje.</string>
+  <string name="uploader_error_message_source_file_not_copied">Došlo k chybě při kopírování souboru do dočasného adresáře. Zkuste prosím zopakovat odeslá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="upload_list_empty">Uploady nejsou k dispozici.</string>
   <string name="file_list_folder">adresář</string>
   <string name="file_list_folders">adresářů</string>
   <string name="file_list_file">soubor</string>
@@ -86,12 +94,15 @@
   <string name="common_yes">Ano</string>
   <string name="common_no">Ne</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Odstranit upload</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_back">Zpět</string>
   <string name="common_save_exit">Uložit &amp; ukončit</string>
   <string name="common_error">Chyba</string>
   <string name="common_loading">Načítání ...</string>
+  <string name="common_unknown">neznámý</string>
   <string name="common_error_unknown">Neznámá chyba</string>
   <string name="about_title">O aplikaci</string>
   <string name="change_password">Změnit heslo</string>
@@ -108,9 +119,13 @@
   <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_failed_uploads">Selhalo (dotykem opakovat)</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_cancelled">Zrušeno</string>
+  <string name="uploads_view_upload_status_paused">Pozastaveno</string>
   <string name="uploads_view_upload_status_failed_connection_error">Chyba připojení</string>
+  <string name="uploads_view_upload_status_failed_retry">Upload bude brzy opakován</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>
@@ -227,6 +242,7 @@
   <string name="filename_forbidden_charaters_from_server">Jméno souboru obsahuje aelspoň jeden neplatný znak</string>
   <string name="filename_empty">Název nemůže být prázdný</string>
   <string name="wait_a_moment">Počkejte chvíli</string>
+  <string name="wait_checking_credentials">Ověřování uložených přihlašovacích údajů</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočekávaný problém - zkuste zvolit soubor jinou aplikací</string>
   <string name="filedisplay_no_file_selected">Žádný soubor nebyl vybrán</string>
   <string name="activity_chooser_title">Odeslat odkaz ...</string>
@@ -291,6 +307,9 @@ správce systému.</string>
   <string name="activity_chooser_send_file_title">Odeslat</string>
   <string name="copy_link">Zkopírovat odkaz</string>
   <string name="clipboard_text_copied">Zkopírováno do schránky</string>
+  <string name="clipboard_no_text_to_copy">Žádný výběr textu pro kopírování do schránky</string>
+  <string name="clipboard_uxexpected_error">Neočekávaná chyba při kopírování do schránky</string>
+  <string name="clipboard_label">Text zkopírován z %1$s</string>
   <string name="error_cant_bind_to_operations_service">Kritická chyba: operace nelze provést</string>
   <string name="network_error_socket_exception">Při pokusu o připojení k serveru došlo k chybě.</string>
   <string name="network_error_socket_timeout_exception">Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena</string>
@@ -389,8 +408,9 @@ správce systému.</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>
-  <string name="manage_space_description">Nastavení, databáze a certifikáty serveru z %1$s dat budou trvale odstraněny. \n\nStažené soubory budou ponechány beze změny.\n\nTento proces může chvíli trvat.</string>
+  <string name="manage_space_description">Nastavení, databáze a certifikáty serverů z %1$s data budou permanentně smazány. \n\nStažené soubory nebudou rozbaleny.\n\nTento proces může chvíli trvat.</string>
   <string name="manage_space_clear_data">Vyčistit data</string>
   <string name="manage_space_error">Některé soubory nebylo možno smazat.</string>
   <string name="permission_storage_access">Vyžadována dodatečná oprávnění pro nahrávání &amp; stahování souborů.</string>
+  <string name="local_file_not_found_toast">Soubor nebyl nalezen v místním souborovém systému</string>
 </resources>

res/values-da/strings.xml

@@ -81,8 +81,10 @@
   <string name="common_no">Nej</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Annuller</string>
+  <string name="common_back">Tilbage</string>
   <string name="common_error">Fejl</string>
   <string name="common_loading">Indlæser...</string>
+  <string name="common_unknown">ukendt</string>
   <string name="common_error_unknown">Ukendt fejl</string>
   <string name="about_title">Om</string>
   <string name="change_password">Skift kodeord</string>

res/values-de-rAT/strings.xml

@@ -57,6 +57,7 @@
   <string name="common_no">Nein</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Abbrechen</string>
+  <string name="common_back">Zurück</string>
   <string name="common_error">Fehler</string>
   <string name="common_loading">Lade ...</string>
   <string name="common_error_unknown">Unbekannter Fehler</string>

res/values-de-rDE/strings.xml

@@ -64,6 +64,13 @@
   <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_error_title_no_file_to_upload">Keine Datei zum Hochladen</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s kann einen Textteil als Datei hochladen</string>
+  <string name="uploader_error_message_no_file_to_upload">Empfangene Daten enthalten  keine gültige Datei.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Datei kann nicht hochgeladen werden</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s darf eine empfangene Datei nicht lesen</string>
+  <string name="uploader_error_message_source_file_not_found">Hochzuladende Datei wurde an seinem Ort nicht gefunden. Prüfen Sie, dass die Datei existiert.</string>
+  <string name="uploader_error_message_source_file_not_copied">Es ist ein Fehler beim Kopieren dieser Datei in einen temporären Ordner aufgetreten. Bitte nochmals versuchen, die Datei zu senden.</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>
@@ -91,9 +98,11 @@
   <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_back">Zurück</string>
   <string name="common_save_exit">Speichern &amp; Schließen</string>
   <string name="common_error">Fehler</string>
   <string name="common_loading">Lade …</string>
+  <string name="common_unknown">unbekannt</string>
   <string name="common_error_unknown">Unbekannter Fehler</string>
   <string name="about_title">Über</string>
   <string name="change_password">Passwort ändern</string>
@@ -278,7 +287,7 @@
   <string name="instant_video_upload_on_wifi">Videos nur über WiFi hochladen</string>
   <string name="instant_upload_path">/SofortUpload</string>
   <string name="conflict_title">Dateikonflikt</string>
-  <string name="conflict_message">Welche Datei möchtest du behalten? Wenn du beide Versionen auswählst, wird der lokalen Datei eine Zahl am Ende Ihres Dateiname angehangen.</string>
+  <string name="conflict_message">Welche Datei möchten Sie behalten? Wenn Sie beide Versionen auswählen, wird der lokalen Datei eine Zahl ans Ende ihres Dateinamens angehängt.</string>
   <string name="conflict_keep_both">Beide behalten</string>
   <string name="conflict_use_local_version">lokale Version</string>
   <string name="conflict_use_server_version">Server Version</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Senden</string>
   <string name="copy_link">Link kopieren</string>
   <string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
+  <string name="clipboard_no_text_to_copy">Kein Text zum Kopieren in die Zwischenablage empfangen</string>
+  <string name="clipboard_uxexpected_error">Unerwarteter Fehler beim Kopieren in die Zwischenablage</string>
+  <string name="clipboard_label">Text von %1$s kopiert</string>
   <string name="error_cant_bind_to_operations_service">Kritischer Fehler: Operationen können nicht ausgeführt werden</string>
   <string name="network_error_socket_exception">Es ist ein Fehler bei der Verbindung mit dem Server aufgetreten.</string>
   <string name="network_error_socket_timeout_exception">Es ist ein Fehler während des Wartens auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
@@ -390,15 +402,16 @@
   <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_retry_uploads">Wiederhole Fehlversuche</string>
+  <string name="action_clear_failed_uploads">Entferne Fehlversuche</string>
+  <string name="action_clear_successful_uploads">Entferne erfolgreiche Uploads</string>
+  <string name="action_clear_finished_uploads">Alles aufräumen</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>
-  <string name="manage_space_description">Die Einstellungen, die Datenbank und Server Zertifikate von %1$s werden endgültig gelöscht. \n\n Heruntergeladene Dateien bleiben unberührt.\n\nDieser Vorgang kann eine Weile dauern.</string>
+  <string name="manage_space_description">Einstellungen, Datenbank und Server-Zertifikate von %1$s\'s Daten werden dauerhaft gelöscht.\n\nHerunter geladene Dateien bleiben unangetastet.\n\nDieser Vorgang kann eine Zeit dauern.</string>
   <string name="manage_space_clear_data">Lösche Daten</string>
   <string name="manage_space_error">Einige Dateien konnten nicht gelöscht werden</string>
   <string name="permission_storage_access">Weitere Berechtigungen erforderlich für das Hoch- und Herunterladen von Dateien</string>
+  <string name="local_file_not_found_toast">Die Datei wurde im lokalen Dateisystem nicht gefunden</string>
 </resources>

res/values-de/strings.xml

@@ -64,6 +64,13 @@
   <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_error_title_no_file_to_upload">Keine Datei zum Hochladen</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s kann einen Textteil als Datei hochladen</string>
+  <string name="uploader_error_message_no_file_to_upload">Empfangene Daten enthalten  keine gültige Datei.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Datei kann nicht hochgeladen werden</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s darf eine empfangene Datei nicht lesen</string>
+  <string name="uploader_error_message_source_file_not_found">Hochzuladende Datei wurde an seinem Ort nicht gefunden. Prüfe, dass die Datei existiert.</string>
+  <string name="uploader_error_message_source_file_not_copied">Es ist ein Fehler beim Kopieren dieser Datei in einen temporären Ordner aufgetreten. Bitte nochmals versuchen, die Datei zu senden.</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>
@@ -91,9 +98,11 @@
   <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_back">Zurück</string>
   <string name="common_save_exit">Speichern &amp; verlassen</string>
   <string name="common_error">Fehler</string>
   <string name="common_loading">Lade…</string>
+  <string name="common_unknown">unbekannt</string>
   <string name="common_error_unknown">Unbekannter Fehler</string>
   <string name="about_title">Über</string>
   <string name="change_password">Passwort ändern</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Senden</string>
   <string name="copy_link">Link kopieren</string>
   <string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
+  <string name="clipboard_no_text_to_copy">Kein Text zum Kopieren in die Zwischenablage empfangen</string>
+  <string name="clipboard_uxexpected_error">Unerwarteter Fehler beim Kopieren in die Zwischenablage</string>
+  <string name="clipboard_label">Text von %1$s kopiert</string>
   <string name="error_cant_bind_to_operations_service">Kritischer Fehler: Operationen können nicht ausgeführt werden</string>
   <string name="network_error_socket_exception">Es ist ein Fehler beim Verbinden mit dem Server aufgetreten.</string>
   <string name="network_error_socket_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
@@ -390,15 +402,16 @@
   <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_retry_uploads">Wiederhole Fehlversuche</string>
+  <string name="action_clear_failed_uploads">Entferne Fehlversuche</string>
+  <string name="action_clear_successful_uploads">Entferne erfolgreiche Uploads</string>
+  <string name="action_clear_finished_uploads">Alles aufräumen</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>
-  <string name="manage_space_description">Einstellungen, Datenbank- und Serverzertifikate werden von %1$s\'s endgültig gelöscht. \n\nHeruntergeladene Dateien werden erhalten bleiben . \n\nDie Vorgang wird einige Zeit in Anspruch nehmen.</string>
+  <string name="manage_space_description">Einstellungen, Datenbank und Server-Zertifikate von %1$s\'s Daten werden dauerhaft gelöscht.\n\nHerunter geladene Dateien bleiben unangetastet.\n\nDieser Vorgang kann eine Zeit dauern.</string>
   <string name="manage_space_clear_data">Daten löschen</string>
   <string name="manage_space_error">Einige Dateien konnten nicht gelöscht werden.</string>
   <string name="permission_storage_access">Du hast nicht die erforderlichen Rechte, um Dateien hoch- und herunterzuladen.</string>
+  <string name="local_file_not_found_toast">Die Datei wurde im lokalen Dateisystem nicht gefunden</string>
 </resources>

res/values-el/strings.xml

@@ -88,9 +88,11 @@
   <string name="common_ok">ΟΚ</string>
   <string name="common_cancel_sync">Ακύρωση συγχρονισμού</string>
   <string name="common_cancel">Άκυρο</string>
+  <string name="common_back">Επιστροφή</string>
   <string name="common_save_exit">Αποθήκευση &amp; έξοδος</string>
   <string name="common_error">Σφάλμα</string>
   <string name="common_loading">Φόρτωση ...</string>
+  <string name="common_unknown">άγνωστο</string>
   <string name="common_error_unknown">Άγνωστο σφάλμα</string>
   <string name="about_title">Σχετικά</string>
   <string name="change_password">Αλλαγή κωδικού πρόσβασης</string>
@@ -380,7 +382,6 @@
   <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>

res/values-en-rGB/strings.xml

@@ -64,11 +64,19 @@
   <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_error_title_no_file_to_upload">No file to upload</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s cannot upload a piece of text as a file.</string>
+  <string name="uploader_error_message_no_file_to_upload">Received data does not include any valid file.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">File cannot be uploaded</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string>
+  <string name="uploader_error_message_source_file_not_found">File to upload was not found in its location. Please check whether the file exists.</string>
+  <string name="uploader_error_message_source_file_not_copied">An error occurred while copying the file to a temporary folder. Please try to send again.</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="upload_list_empty">No uploads available.</string>
   <string name="file_list_folder">folder</string>
   <string name="file_list_folders">folders</string>
   <string name="file_list_file">file</string>
@@ -86,11 +94,15 @@
   <string name="common_yes">Yes</string>
   <string name="common_no">No</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Remove upload</string>
+  <string name="common_retry_upload">Retry upload</string>
   <string name="common_cancel_sync">Cancel sync</string>
   <string name="common_cancel">Cancel</string>
+  <string name="common_back">Back</string>
   <string name="common_save_exit">Save &amp; exit</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Loading …</string>
+  <string name="common_unknown">unknown</string>
   <string name="common_error_unknown">Unknown error</string>
   <string name="about_title">About</string>
   <string name="change_password">Change password</string>
@@ -107,13 +119,22 @@
   <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_failed_uploads">Failed (tap to retry)</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_cancelled">Cancelled</string>
+  <string name="uploads_view_upload_status_paused">Paused</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Connection error</string>
+  <string name="uploads_view_upload_status_failed_retry">Upload will be retried shortly</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_localfile_error">Local file not found</string>
   <string name="uploads_view_upload_status_failed_permission_error">Permission error</string>
+  <string name="uploads_view_upload_status_conflict">Conflict</string>
+  <string name="uploads_view_upload_status_service_interrupted">App was terminated</string>
   <string name="uploads_view_upload_status_unknown_fail">Unknown error</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Waiting for WiFi connectivity</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>
@@ -222,6 +243,7 @@
   <string name="filename_forbidden_charaters_from_server">File name contains at least one invalid character</string>
   <string name="filename_empty">File name cannot be empty</string>
   <string name="wait_a_moment">Wait a moment</string>
+  <string name="wait_checking_credentials">Checking stored credentials</string>
   <string name="filedisplay_unexpected_bad_get_content">Unexpected problem; please select the file from a different app</string>
   <string name="filedisplay_no_file_selected">No file was selected</string>
   <string name="activity_chooser_title">Send link to …</string>
@@ -286,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Send</string>
   <string name="copy_link">Copy link</string>
   <string name="clipboard_text_copied">Copied to clipboard</string>
+  <string name="clipboard_no_text_to_copy">No text received to copy to clipboard</string>
+  <string name="clipboard_uxexpected_error">Unexpected error while copying to clipboard</string>
+  <string name="clipboard_label">Text copied from %1$s</string>
   <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
   <string name="network_error_socket_exception">An error occurred whilst connecting to the server.</string>
   <string name="network_error_socket_timeout_exception">An error occurred whilst waiting for the server, the operation couldn\'t be done</string>
@@ -351,6 +376,7 @@
   <string name="pref_behaviour_entries_keep_file">kept in original folder</string>
   <string name="pref_behaviour_entries_move">moved to app folder</string>
   <string name="share_dialog_title">Sharing</string>
+  <string name="share_file">Share %1$s</string>
   <string name="share_with_user_section_title">Share with users and groups</string>
   <string name="share_no_users">No data shared with users yet</string>
   <string name="share_add_user_or_group">Add user or group</string>
@@ -360,6 +386,8 @@
   <string name="share_via_link_password_title">Secured</string>
   <string name="share_via_link_edit_permission_label">Allow editing</string>
   <string name="share_get_public_link_button">Get link</string>
+  <string name="share_with_title">Share with …</string>
+  <string name="share_with_edit_title">Share with %1$s</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>
@@ -374,11 +402,16 @@
   <string name="share_privilege_can_edit_delete">delete</string>
   <string name="edit_share_unshare">Stop sharing</string>
   <string name="edit_share_done">done</string>
+  <string name="action_retry_uploads">Retry failed</string>
+  <string name="action_clear_failed_uploads">Clear failed</string>
+  <string name="action_clear_successful_uploads">Clear successful</string>
+  <string name="action_clear_finished_uploads">Clear all finished</string>
   <string name="action_switch_grid_view">Grid view</string>
   <string name="action_switch_list_view">List view</string>
   <string name="manage_space_title">Manage space</string>
-  <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanentlty. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
+  <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
   <string name="manage_space_clear_data">Clear data</string>
   <string name="manage_space_error">Some files could not be deleted.</string>
   <string name="permission_storage_access">Additional permissions required to upload &amp; download files.</string>
+  <string name="local_file_not_found_toast">The file was not found in the local file system</string>
 </resources>

res/values-eo/strings.xml

@@ -71,9 +71,11 @@
   <string name="common_ok">Akcepti</string>
   <string name="common_cancel_sync">Nuligi sinkronigon</string>
   <string name="common_cancel">Nuligi</string>
+  <string name="common_back">Antaŭen</string>
   <string name="common_save_exit">Konservi kaj eliri</string>
   <string name="common_error">Eraro</string>
   <string name="common_loading">Ŝargante...</string>
+  <string name="common_unknown">nekonata</string>
   <string name="common_error_unknown">Nekonata eraro</string>
   <string name="about_title">Pri</string>
   <string name="change_password">Ŝanĝi la pasvorton</string>

res/values-es-rAR/strings.xml

@@ -72,6 +72,7 @@
   <string name="common_no">No</string>
   <string name="common_ok">Aceptar</string>
   <string name="common_cancel">Cancelar</string>
+  <string name="common_back">Volver</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Cargando ...</string>
   <string name="common_error_unknown">Error desconocido</string>

res/values-es-rMX/strings.xml

@@ -52,6 +52,7 @@
   <string name="common_no">No</string>
   <string name="common_ok">Aceptar</string>
   <string name="common_cancel">Cancelar</string>
+  <string name="common_back">Atrás</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Cargando ...</string>
   <string name="common_error_unknown">Error desconocido</string>

res/values-es/strings.xml

@@ -25,7 +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_uploads_list">Subidas</string>
   <string name="drawer_item_logs">Registros</string>
   <string name="drawer_close">Cerrar</string>
   <string name="drawer_open">Abrir</string>
@@ -64,6 +64,13 @@
   <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_error_title_no_file_to_upload">Ningún archivo para subir</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s  No puedo subir un texto como si fuera un archivo.</string>
+  <string name="uploader_error_message_no_file_to_upload">No hay ningún archivo válido en los datos recibidos.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">No se puede subir el archivo</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s No está autorizado a leer el arcivo.</string>
+  <string name="uploader_error_message_source_file_not_found">El archivo a subir no se localiza. Compruebe que el archivo existe.</string>
+  <string name="uploader_error_message_source_file_not_copied">Ha ocurrido un error al copiar a la carpeta temporal. Por favor intentelo de nuevo.</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>
@@ -91,9 +98,11 @@
   <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_back">Volver</string>
   <string name="common_save_exit">Guardar &amp; salir</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Cargando...</string>
+  <string name="common_unknown">desconocido</string>
   <string name="common_error_unknown">Error desconocido</string>
   <string name="about_title">Acerca de</string>
   <string name="change_password">Cambiar contraseña</string>
@@ -108,7 +117,7 @@
   <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_title">Subidas</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>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar enlace</string>
   <string name="clipboard_text_copied">Copiado al portapapeles</string>
+  <string name="clipboard_no_text_to_copy">No se recibió ningún mensaje para copiar al portapapeles</string>
+  <string name="clipboard_uxexpected_error">Error inesperado al copiar al portapapeles</string>
+  <string name="clipboard_label">Texto copiado de %1$s</string>
   <string name="error_cant_bind_to_operations_service">Error crítico: no es posible realizar operaciones</string>
   <string name="network_error_socket_exception">Ocurrió un error al conectarse con el servidor.</string>
   <string name="network_error_socket_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
@@ -337,7 +349,7 @@
   <string name="copy_file_invalid_overwrite">El fichero ya existe en el directorio de destino</string>
   <string name="copy_file_error">Hubo un error al tratar de copiar este archivo o carpeta</string>
   <string name="forbidden_permissions_copy">para copiar este archivo</string>
-  <string name="prefs_category_instant_uploading">Cargas instantáneas</string>
+  <string name="prefs_category_instant_uploading">Subidas instantáneas</string>
   <string name="prefs_category_details">Detalles</string>
   <string name="prefs_instant_video_upload_path_title">Ruta de subida de vídeo </string>
   <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s no se pudo completar</string>
@@ -396,8 +408,8 @@
   <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>
-  <string name="manage_space_description">Los ajustes, bases de datos y certificados del servidor %1$s incluidos sus datos serán borrados permanentemente. \n\nLos archivos descargados permanecerán sin tocarse.\n\nEste proceso puede tomar algún tiempo.</string>
   <string name="manage_space_clear_data">Limpiar datos</string>
   <string name="manage_space_error">No se han podido eliminar algunos archivos</string>
   <string name="permission_storage_access">Se requieren permisos adicionales para subir &amp; y descargar archivos.</string>
+  <string name="local_file_not_found_toast">El archivo no se encuentra en el servidor local de archivos.</string>
 </resources>

res/values-et-rEE/strings.xml

@@ -85,9 +85,11 @@
   <string name="common_no">Ei</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Loobu</string>
+  <string name="common_back">Tagasi</string>
   <string name="common_save_exit">Salvesta &amp; välju</string>
   <string name="common_error">Viga</string>
   <string name="common_loading">Laadimine ...</string>
+  <string name="common_unknown">tundmatu</string>
   <string name="common_error_unknown">Tundmatu viga</string>
   <string name="about_title">Info</string>
   <string name="change_password">Muuda parooli</string>

res/values-eu/strings.xml

@@ -77,8 +77,10 @@
   <string name="common_no">Ez</string>
   <string name="common_ok">Ados</string>
   <string name="common_cancel">Ezeztatu</string>
+  <string name="common_back">Atzera</string>
   <string name="common_error">Errorea</string>
   <string name="common_loading">Kargatzen ...</string>
+  <string name="common_unknown">ezezaguna</string>
   <string name="common_error_unknown">Errore ezezaguna</string>
   <string name="about_title">Honi buruz</string>
   <string name="change_password">Aldatu pasahitza</string>

res/values-fa/strings.xml

@@ -69,6 +69,7 @@
   <string name="common_no">نه</string>
   <string name="common_ok">باشه</string>
   <string name="common_cancel">منصرف شدن</string>
+  <string name="common_back">بازگشت</string>
   <string name="common_error">خطا</string>
   <string name="common_loading">بارگذاری ...</string>
   <string name="common_error_unknown">خطای نامشخص</string>

res/values-fi-rFI/strings.xml

@@ -64,6 +64,7 @@
   <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_error_message_no_file_to_upload">Vastaanotettu data ei sisällä yhtäkään kelvollista tiedostoa.</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>
@@ -88,9 +89,11 @@
   <string name="common_ok">OK</string>
   <string name="common_cancel_sync">Peru synkronointi</string>
   <string name="common_cancel">Peru</string>
+  <string name="common_back">Takaisin</string>
   <string name="common_save_exit">Tallenna &amp; poistu</string>
   <string name="common_error">Virhe</string>
   <string name="common_loading">Ladataan…</string>
+  <string name="common_unknown">tuntematon</string>
   <string name="common_error_unknown">Tuntematon virhe</string>
   <string name="about_title">Tietoja</string>
   <string name="change_password">Vaihda salasana</string>
@@ -219,6 +222,7 @@
   <string name="filename_forbidden_charaters_from_server">Tiedoston nimi sisältää ainakin yhden virheellisen merkin</string>
   <string name="filename_empty">Tiedoston nimi ei voi olla tyhjä</string>
   <string name="wait_a_moment">Odota hetki</string>
+  <string name="wait_checking_credentials">Tarkistetaan tallennettuja tilitietoja</string>
   <string name="filedisplay_unexpected_bad_get_content">Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella</string>
   <string name="filedisplay_no_file_selected">Tiedostoa ei valittu</string>
   <string name="activity_chooser_title">Lähetä linkki…</string>
@@ -335,6 +339,7 @@
   <string name="pref_behaviour_entries_keep_file">pidetään alkuperäisessä kansiossa</string>
   <string name="pref_behaviour_entries_move">siirretään sovelluskansioon</string>
   <string name="share_dialog_title">Jakaminen</string>
+  <string name="share_file">Jaa %1$s</string>
   <string name="share_with_user_section_title">Jaa käyttäjien ja ryhmien kanssa</string>
   <string name="share_add_user_or_group">Lisää käyttäjä tai ryhmä</string>
   <string name="share_via_link_section_title">Jaa linkki</string>
@@ -356,10 +361,15 @@
   <string name="share_privilege_can_edit_delete">poista</string>
   <string name="edit_share_unshare">Lopeta jakaminen</string>
   <string name="edit_share_done">valmis</string>
+  <string name="action_retry_uploads">Uudelleenyritys epäonnistui</string>
+  <string name="action_clear_failed_uploads">Tyhjennä epäonnistuneet</string>
+  <string name="action_clear_successful_uploads">Tyhjennä onnistuneet</string>
+  <string name="action_clear_finished_uploads">Tyhjennä kaikki valmistuneet</string>
   <string name="action_switch_grid_view">Ruudukkonäkymä</string>
   <string name="action_switch_list_view">Luettelonäkymä</string>
   <string name="manage_space_title">Hallitse tilaa</string>
   <string name="manage_space_clear_data">Tyhjennä tiedot</string>
   <string name="manage_space_error">Joitain tiedostoja ei voitu poistaa.</string>
   <string name="permission_storage_access">Tiedostojen lataaminen ja lähetys vaatii lisäoikeuksia.</string>
+  <string name="local_file_not_found_toast">Tiedostoa ei löytynyt paikallisesta tiedostojärjestelmästä</string>
 </resources>

res/values-fr/strings.xml

@@ -65,11 +65,19 @@ Téléchargez-le ici : %2$s</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_error_title_no_file_to_upload">Aucun fichier à téléverser</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s ne peut téléverser un morceau de texte comme un fichier.</string>
+  <string name="uploader_error_message_no_file_to_upload">Les données reçues n\'incluent aucun fichier valide.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Le fichier ne peut pas être téléversé</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s n\'est pas autorisé à lire un fichier reçu</string>
+  <string name="uploader_error_message_source_file_not_found">Le fichier à téléverser n\'a pas été trouvé dans son emplacement. Merci de vérifier si ce fichier existe.</string>
+  <string name="uploader_error_message_source_file_not_copied">Une erreur est survenue lors de la copie du fichier vers un dossier temporaire. Merci de recommencer votre envoi.</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="upload_list_empty">Aucun téléversement disponible.</string>
   <string name="file_list_folder">dossier</string>
   <string name="file_list_folders">dossiers</string>
   <string name="file_list_file">fichier</string>
@@ -87,11 +95,15 @@ Téléchargez-le ici : %2$s</string>
   <string name="common_yes">Oui</string>
   <string name="common_no">Non</string>
   <string name="common_ok">OK</string>
+  <string name="common_remove_upload">Retirer le téléversement</string>
+  <string name="common_retry_upload">Réessayer le téléversement</string>
   <string name="common_cancel_sync">Annuler la synchronisation</string>
   <string name="common_cancel">Annuler</string>
+  <string name="common_back">Retour</string>
   <string name="common_save_exit">Enregistrer et quitter</string>
   <string name="common_error">Erreur</string>
   <string name="common_loading">Chargement…</string>
+  <string name="common_unknown">Inconnu</string>
   <string name="common_error_unknown">Erreur inconnue </string>
   <string name="about_title">À propos de</string>
   <string name="change_password">Changer de mot de passe</string>
@@ -114,12 +126,14 @@ Téléchargez-le ici : %2$s</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_retry">Le téléversement sera réessayé dans un court instant</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_service_interrupted">L\'application a été arrêté</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>
@@ -234,6 +248,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="filename_forbidden_charaters_from_server">Le nom de fichier contient au moins un caractère non valide</string>
   <string name="filename_empty">Le nom du fichier ne peut pas être vide</string>
   <string name="wait_a_moment">Veuillez patienter</string>
+  <string name="wait_checking_credentials">Vérification des identifiants enregistrés</string>
   <string name="filedisplay_unexpected_bad_get_content">Problème inattendu. Veuillez essayer une autre application pour la sélection du fichier</string>
   <string name="filedisplay_no_file_selected">Aucun fichier sélectionné</string>
   <string name="activity_chooser_title">Envoyer le lien vers…</string>
@@ -297,6 +312,9 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="activity_chooser_send_file_title">Envoyer</string>
   <string name="copy_link">Copier le lien</string>
   <string name="clipboard_text_copied">Copié dans le presse-papier</string>
+  <string name="clipboard_no_text_to_copy">Aucun texte n\'a été reçu pour copier dans le presse-papier</string>
+  <string name="clipboard_uxexpected_error">Erreur inattendue lors de la copie vers le presse-papiers</string>
+  <string name="clipboard_label">Texte copié depuis %1$s</string>
   <string name="error_cant_bind_to_operations_service">Erreur critique : impossible de réaliser les opérations</string>
   <string name="network_error_socket_exception">Une erreur est survenue pendant la connexion au serveur.</string>
   <string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
@@ -388,11 +406,16 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="share_privilege_can_edit_delete">suppression</string>
   <string name="edit_share_unshare">Terminer le partage</string>
   <string name="edit_share_done">Terminé</string>
+  <string name="action_retry_uploads">Nouvel essai échoué</string>
+  <string name="action_clear_failed_uploads">Vider les échoués</string>
+  <string name="action_clear_successful_uploads">Vider les réussis</string>
+  <string name="action_clear_finished_uploads">Vider tous les terminés</string>
   <string name="action_switch_grid_view">Mosaïque</string>
   <string name="action_switch_list_view">Liste</string>
   <string name="manage_space_title">Gestion de l\'espace</string>
-  <string name="manage_space_description">Les paramètres, la base de données et les certificats provenant de %1$s seront définitivement effacés. \n\nLes fichiers téléchargés ne seront pas impactés.\n\nCe processus peut prendre un certain temps.</string>
+  <string name="manage_space_description">Les paramètres, la base de données et les certificats du serveur provenant de %1$s seront définitivement effacés. \n\nLes fichiers téléchargés ne seront pas impactés.\n\nCe processus peut prendre du temps.</string>
   <string name="manage_space_clear_data">Effacer les données</string>
   <string name="manage_space_error">Certains fichiers n\'ont pu être supprimés.</string>
   <string name="permission_storage_access">Des permissions supplémentaires sont exigées pour téléverser &amp; télécharger des fichiers.</string>
+  <string name="local_file_not_found_toast">Le fichier n\'a pas été trouvé sur le système de fichier local</string>
 </resources>

res/values-gl/strings.xml

@@ -80,8 +80,10 @@ Descárgueo de aquí: %2$s</string>
   <string name="common_no">Non</string>
   <string name="common_ok">Aceptar</string>
   <string name="common_cancel">Cancelar</string>
+  <string name="common_back">Atrás</string>
   <string name="common_error">Erro</string>
   <string name="common_loading">Cargando ...</string>
+  <string name="common_unknown">descoñecido</string>
   <string name="common_error_unknown">Produciuse un erro descoñecido</string>
   <string name="about_title">Sobre</string>
   <string name="change_password">Cambiar o contrasinal</string>

res/values-he/strings.xml

@@ -88,6 +88,7 @@
   <string name="common_ok">אישור</string>
   <string name="common_cancel_sync">ביטול סנכרון</string>
   <string name="common_cancel">ביטול</string>
+  <string name="common_back">אחורה</string>
   <string name="common_save_exit">שמירה ויציאה</string>
   <string name="common_error">שגיאה</string>
   <string name="common_loading">בטעינה …</string>
@@ -380,7 +381,6 @@
   <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\'s ימחקו לצמיתות. \n\nקבצים שהורדו ישארו ללא פגע .\n\nתהליך זה יכול להמשך זמן מה.</string>
   <string name="manage_space_clear_data">ניקוי מידע</string>
   <string name="manage_space_error">לא ניתן היה למחוק מספר קבצים.</string>
   <string name="permission_storage_access">נדרשות הרשאות נוספות להעלאה והורדת קבצים.</string>

res/values-hr/strings.xml

@@ -49,6 +49,7 @@
   <string name="common_no">Ne</string>
   <string name="common_ok">U redu</string>
   <string name="common_cancel">Odustani</string>
+  <string name="common_back">Natrag</string>
   <string name="common_error">Greška</string>
   <string name="common_error_unknown">Nepoznata pogreška</string>
   <string name="change_password">Izmjena lozinke</string>

res/values-hu-rHU/strings.xml

@@ -76,6 +76,7 @@
   <string name="common_no">Nem</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Mégsem</string>
+  <string name="common_back">Vissza</string>
   <string name="common_error">Hiba</string>
   <string name="common_loading">Betöltés ...</string>
   <string name="common_error_unknown">Ismeretlen hiba</string>

res/values-ia/strings.xml

@@ -33,6 +33,7 @@
   <string name="common_no">No</string>
   <string name="common_ok">Ok</string>
   <string name="common_cancel">Cancellar</string>
+  <string name="common_back">Retro</string>
   <string name="common_error">Error</string>
   <string name="common_error_unknown">Error Incognite</string>
   <string name="about_title">A proposito</string>

res/values-id/strings.xml

@@ -83,6 +83,7 @@
   <string name="common_ok">Oke</string>
   <string name="common_cancel_sync">Batalkan sinkron</string>
   <string name="common_cancel">Batal</string>
+  <string name="common_back">Kembali</string>
   <string name="common_error">Kesalahan</string>
   <string name="common_loading">Memuat ...</string>
   <string name="common_error_unknown">Kesalahan tidak diketahui</string>

res/values-is/strings.xml

@@ -83,6 +83,7 @@
   <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_back">Til baka</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>
@@ -362,7 +363,6 @@
   <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>

res/values-it/strings.xml

@@ -64,6 +64,13 @@
   <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_error_title_no_file_to_upload">Nessun file da caricare</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s non può  caricare un pezzo di testo come un file.</string>
+  <string name="uploader_error_message_no_file_to_upload">I dati ricevuti non includono alcun file valido.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Il file non può essere caricato</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s non ha il permesso di leggere un file ricevuto</string>
+  <string name="uploader_error_message_source_file_not_found">Il file da caricare non è stato trovato nella sua posizione. Controlla che il file esista.</string>
+  <string name="uploader_error_message_source_file_not_copied">Si è verificato un errore durante il tentativo di copiare il file in una cartella temporanea. Prova a inviarlo ancora.</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>
@@ -91,9 +98,11 @@
   <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_back">Indietro</string>
   <string name="common_save_exit">Salva ed esci</string>
   <string name="common_error">Errore</string>
   <string name="common_loading">Caricamento in corso...</string>
+  <string name="common_unknown">sconosciuto</string>
   <string name="common_error_unknown">Errore sconosciuto</string>
   <string name="about_title">Informazioni</string>
   <string name="change_password">Modifica la password</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Invia</string>
   <string name="copy_link">Copia collegamento</string>
   <string name="clipboard_text_copied">Copiato negli appunti</string>
+  <string name="clipboard_no_text_to_copy">Nessun testo da copiare negli appunti</string>
+  <string name="clipboard_uxexpected_error">Errore inatteso durante la copia negli appunti</string>
+  <string name="clipboard_label">Testo copiato da %1$s</string>
   <string name="error_cant_bind_to_operations_service">Errore grave: impossibile eseguire le operazioni</string>
   <string name="network_error_socket_exception">Si è verificato un errore durante la connessione al server.</string>
   <string name="network_error_socket_timeout_exception">Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata</string>
@@ -397,8 +409,9 @@
   <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>
-  <string name="manage_space_description">Impostazioni, database e certificati server dai dati di %1$s saranno eliminati definitivamente.\n\n\I file scaricati non saranno interessati.\n\nQuesto processo può richiedere del tempo.</string>
+  <string name="manage_space_description">Impostazioni, database e certificati server dai dati di %1$s saranno eliminati definitivamente. \n\n\I file scaricati rimarranno intatti.\n\nQuesto processo può richiedere del tempo.</string>
   <string name="manage_space_clear_data">Cancella i dati</string>
   <string name="manage_space_error">Alcuni file non possono essere eliminati.</string>
   <string name="permission_storage_access">Permessi aggiuntivi sono richiesti per caricare e scaricare i file.</string>
+  <string name="local_file_not_found_toast">Il file non è stato trovato nel file system locale</string>
 </resources>

res/values-ja-rJP/strings.xml

@@ -65,11 +65,15 @@
   <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_error_title_no_file_to_upload">アップロードするファイルはありません</string>
+  <string name="uploader_error_message_no_file_to_upload">受信データに正しいファイルが含まれていません。</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">アップロードできません</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="upload_list_empty">ファイルがありません。</string>
   <string name="file_list_folder">フォルダー</string>
   <string name="file_list_folders">フォルダー</string>
   <string name="file_list_file">ファイル</string>
@@ -89,9 +93,11 @@
   <string name="common_ok">OK</string>
   <string name="common_cancel_sync">同期のキャンセル</string>
   <string name="common_cancel">キャンセル</string>
+  <string name="common_back">戻る</string>
   <string name="common_save_exit">保存 &amp; 終了</string>
   <string name="common_error">エラー</string>
   <string name="common_loading">読込中...</string>
+  <string name="common_unknown">不明</string>
   <string name="common_error_unknown">不明なエラー</string>
   <string name="about_title">について</string>
   <string name="change_password">パスワードを変更</string>
@@ -376,7 +382,6 @@
   <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>

res/values-km/strings.xml

@@ -52,6 +52,7 @@
   <string name="common_no">ទេ</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">លើកលែង</string>
+  <string name="common_back">ត្រឡប់ក្រោយ</string>
   <string name="common_error">កំហុស</string>
   <string name="common_loading">កំពុងដំណើរការ</string>
   <string name="common_error_unknown">មិន​ស្គាល់​កំហុស</string>

res/values-ko/strings.xml

@@ -78,6 +78,7 @@
   <string name="common_no">아니요</string>
   <string name="common_ok">확인</string>
   <string name="common_cancel">취소</string>
+  <string name="common_back">뒤로</string>
   <string name="common_error">오류</string>
   <string name="common_loading">불러오는 중...</string>
   <string name="common_error_unknown">알 수 없는 오류</string>

res/values-lb/strings.xml

@@ -62,6 +62,7 @@
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Ofbriechen</string>
+  <string name="common_back">Zeréck</string>
   <string name="common_error">Feeler</string>
   <string name="common_error_unknown">Onbekannte Feeler</string>
   <string name="about_title">Iwwer</string>

res/values-lt-rLT/strings.xml

@@ -78,6 +78,7 @@
   <string name="common_no">Ne</string>
   <string name="common_ok">Gerai</string>
   <string name="common_cancel">Atšaukti</string>
+  <string name="common_back">Atgal</string>
   <string name="common_error">Klaida</string>
   <string name="common_loading">Įkeliama...</string>
   <string name="common_error_unknown">Neatpažinta klaida</string>

res/values-mk/strings.xml

@@ -74,6 +74,7 @@
   <string name="common_no">Не</string>
   <string name="common_ok">Во ред</string>
   <string name="common_cancel">Откажи</string>
+  <string name="common_back">Назад</string>
   <string name="common_error">Грешка</string>
   <string name="common_loading">Вчитувам ...</string>
   <string name="common_error_unknown">Непозната грешка</string>

res/values-ms-rMY/strings.xml

@@ -45,6 +45,7 @@
   <string name="common_no">Tidak</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Batal</string>
+  <string name="common_back">Kembali</string>
   <string name="common_error">Ralat</string>
   <string name="about_title">Mengenai</string>
   <string name="change_password">Ubah kata laluan</string>

res/values-nb-rNO/strings.xml

@@ -91,9 +91,11 @@
   <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_back">Tilbake</string>
   <string name="common_save_exit">Lagre &amp; avslutt</string>
   <string name="common_error">Feil</string>
   <string name="common_loading">Laster...</string>
+  <string name="common_unknown">ukjent</string>
   <string name="common_error_unknown">Ukjent feil</string>
   <string name="about_title">Om</string>
   <string name="change_password">Endre passord</string>
@@ -397,7 +399,6 @@
   <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>
-  <string name="manage_space_description">Innstillinger, database og server-sertifikater fra %1$s sine data vil bli slettet permanent. \n\nNedlastede filer forblir urørt.\n\nDenne prosessen kan ta litt tid.</string>
   <string name="manage_space_clear_data">Nullstill data</string>
   <string name="manage_space_error">Noen filer kunne ikke fjernes.</string>
   <string name="permission_storage_access">Flere tillatelser trengs for å laste opp &amp; ned filer.</string>

res/values-nl/strings.xml

@@ -65,6 +65,13 @@ Download hier: %2$s</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_error_title_no_file_to_upload">Niets te uploaden</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s kan niet een stuk tekst als bestand uploaden.</string>
+  <string name="uploader_error_message_no_file_to_upload">Ontvangen data bevat geen geldig bestand.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Bestand kan niet worden geüpload</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s is niet toegestaan om een ontvangen bestand te lezen</string>
+  <string name="uploader_error_message_source_file_not_found">Het te uploaden bestand is hier niet. Controleer of het bestand wel bestaat.</string>
+  <string name="uploader_error_message_source_file_not_copied">Er trad een fout op bij het kopiëren van het bestand naar een tijdelijke map. Probeer het opnieuw te versturen.</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>
@@ -92,9 +99,11 @@ Download hier: %2$s</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_back">Terug</string>
   <string name="common_save_exit">Opslaan &amp; einde</string>
   <string name="common_error">Fout</string>
   <string name="common_loading">Laden...</string>
+  <string name="common_unknown">onbekend</string>
   <string name="common_error_unknown">Onbekende fout</string>
   <string name="about_title">Over</string>
   <string name="change_password">Wijzig wachtwoord</string>
@@ -302,6 +311,9 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="activity_chooser_send_file_title">Versturen</string>
   <string name="copy_link">Link kopiëren</string>
   <string name="clipboard_text_copied">Gekopieerd naar het klembord</string>
+  <string name="clipboard_no_text_to_copy">Geen tekst ontvangen om te kopiëren naar het klembord</string>
+  <string name="clipboard_uxexpected_error">Onverwachte fout bij het kopiëren naar het klembord</string>
+  <string name="clipboard_label">Tekst gekopieerd vanaf %1$s</string>
   <string name="error_cant_bind_to_operations_service">Kritieke fout: kan de acties niet uitvoeren</string>
   <string name="network_error_socket_exception">Er trad een fout op bij het verbinden met de server.</string>
   <string name="network_error_socket_timeout_exception">Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden</string>
@@ -400,8 +412,9 @@ Neem contact op met uw beheerder</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>
-  <string name="manage_space_description">Instellingen, database en server certificaten van %1$s\'s zullen permanent worden verwijderd.\n\nGedownloade bestanden zullen niet worden verwijderd.\n\nDit kan enige tijd in beslag nemen.</string>
+  <string name="manage_space_description">Instellingen, database en servercertificaten van %1$s\'s data zullen permanent worden verwijderd. \n\nGedownloade bestanden blijven onaangeroerd.\n\nDit proces kan even duren.</string>
   <string name="manage_space_clear_data">Verwijder data</string>
   <string name="manage_space_error">Sommige bestanden konden niet worden verwijderd</string>
   <string name="permission_storage_access">Aanvullende permssies vereist voor het uploaden en downloaden van bestanden.</string>
+  <string name="local_file_not_found_toast">Het bestand is niet te vinden binnen het lokale bestandssysteem.</string>
 </resources>

res/values-nn-rNO/strings.xml

@@ -10,36 +10,56 @@
   <string name="actionbar_settings">Innstillingar</string>
   <string name="actionbar_see_details">Detaljar</string>
   <string name="actionbar_send_file">Send</string>
+  <string name="actionbar_sort">Sorter</string>
+  <string name="actionbar_sort_title">Sorter etter</string>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Alle filer</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_item_settings">Innstillingar</string>
+  <string name="drawer_item_uploads_list">Opplastingar</string>
+  <string name="drawer_item_logs">Loggar</string>
+  <string name="drawer_close">Lukk</string>
   <string name="drawer_open">Opna</string>
   <string name="prefs_category_general">Generelt</string>
   <string name="prefs_category_more">Meir</string>
   <string name="prefs_accounts">Kontoar</string>
+  <string name="prefs_manage_accounts">Handter kontoar</string>
+  <string name="prefs_passcode">Passkodelås</string>
   <string name="prefs_instant_upload">Last opp bilete omgåande</string>
   <string name="prefs_instant_upload_summary">Last opp bilete når du tek dei med kameraet</string>
   <string name="prefs_instant_video_upload">Last opp film</string>
   <string name="prefs_instant_video_upload_summary">Last opp film med ein gong du tar dei med kameraet</string>
+  <string name="prefs_log_title">Skru på logging</string>
   <string name="prefs_log_summary">Brukt til å logga problem</string>
+  <string name="prefs_log_title_history">Logghistorikk</string>
   <string name="prefs_log_summary_history">Dette viser loggane som er ført</string>
+  <string name="prefs_log_delete_history_button">Slett historik</string>
   <string name="prefs_help">Hjelp</string>
   <string name="prefs_recommend">Anbefal til ein ven</string>
   <string name="prefs_feedback">Tilbakemelding</string>
   <string name="prefs_imprint">Impressum</string>
+  <string name="prefs_remember_last_share_location">Hugs deleplassering</string>
+  <string name="prefs_remember_last_upload_location_summary">Hugs siste opplastingsstad for deling</string>
   <string name="recommend_subject">Prøv %1$s på smarttelefonen din!</string>
+  <string name="recommend_text">Eg vil gjerne invitera deg til å bruka %1$s på smarttelefonen din!\nLast ned her: %2$s</string>
+  <string name="auth_check_server">Sjekk tenaren</string>
   <string name="auth_host_url">Tenaradresse https://</string>
   <string name="auth_username">Brukarnamn</string>
   <string name="auth_password">Passord</string>
+  <string name="auth_register">Fersk brukar av %1$s?</string>
   <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_top_message">Vel opplastingsmappe:</string>
   <string name="uploader_wrn_no_account_title">Fann ingen konto</string>
+  <string name="uploader_wrn_no_account_text">Det finst ingen %1$s-kontoar på eininga di. Ver venleg og set opp ein 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_error_title_no_file_to_upload">Inga fil å lasta 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>
@@ -53,6 +73,7 @@
   <string name="common_no">Nei</string>
   <string name="common_ok">Greitt</string>
   <string name="common_cancel">Avbryt</string>
+  <string name="common_back">Tilbake</string>
   <string name="common_error">Feil</string>
   <string name="common_error_unknown">Ukjend feil</string>
   <string name="about_title">Om</string>
@@ -65,13 +86,20 @@
   <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="uploader_upload_failed_credentials_error">Feil ved opplasting, logg inn på nytt</string>
+  <string name="uploads_view_title">Opplastingar</string>
+  <string name="uploads_view_group_failed_uploads">Feil (klikk for å prøva på nytt)</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>
   <string name="downloader_download_failed_ticker">Feil ved nedlasting</string>
   <string name="downloader_download_failed_content">Klarte ikkje å lasta %1$s ferdig ned</string>
+  <string name="downloader_download_failed_credentials_error">Feil ved nedlasting, logg inn på nytt</string>
   <string name="common_choose_account">Vel konto</string>
+  <string name="sync_fail_ticker">Feil ved synkronisering</string>
+  <string name="sync_fail_ticker_unauthorized">Feil ved synkronisering, logg inn på nytt</string>
+  <string name="sync_fail_in_favourites_ticker">Synkroniserte feila</string>
   <string name="auth_no_net_conn_title">Inga nettilkopling</string>
   <string name="auth_nossl_plain_ok_title">Trygg tilkopling ikkje tilgjengeleg.</string>
   <string name="auth_connection_established">Tilkopling oppretta</string>
@@ -103,6 +131,7 @@
   <string name="activity_chooser_send_file_title">Send</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Kontoar</string>
+  <string name="actionbar_logger">Loggar</string>
   <string name="saml_authentication_wrong_pass">Feil passord</string>
   <string name="folder_picker_choose_button_text">Vel</string>
   <string name="prefs_category_details">Detaljar</string>
@@ -116,4 +145,6 @@
   <string name="share_privilege_can_edit">kan endra</string>
   <string name="share_privilege_can_edit_create">lag</string>
   <string name="share_privilege_can_edit_delete">slett</string>
+  <string name="action_retry_uploads">Prøv feila på nytt</string>
+  <string name="action_clear_failed_uploads">Fjern feila</string>
 </resources>

res/values-oc/strings.xml

@@ -80,6 +80,7 @@ Telecargatz-lo aicí : %2$s</string>
   <string name="common_no">Non</string>
   <string name="common_ok">D\'acòrdi</string>
   <string name="common_cancel">Anullar</string>
+  <string name="common_back">Retorn</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Cargament…</string>
   <string name="common_error_unknown">Error desconeguda </string>

res/values-pl/strings.xml

@@ -88,9 +88,11 @@
   <string name="common_ok">OK</string>
   <string name="common_cancel_sync">Anuluj synchronizację</string>
   <string name="common_cancel">Anuluj</string>
+  <string name="common_back">Wróć</string>
   <string name="common_save_exit">Zapisz i wyjdź</string>
   <string name="common_error">Błąd</string>
   <string name="common_loading">Wczytuję ...</string>
+  <string name="common_unknown">nieznane</string>
   <string name="common_error_unknown">Nieznany błąd</string>
   <string name="about_title">O aplikacji</string>
   <string name="change_password">Zmień hasło</string>
@@ -375,7 +377,6 @@
   <string name="action_switch_grid_view">Widok siatki</string>
   <string name="action_switch_list_view">Widok listy</string>
   <string name="manage_space_title">Zarządzaj przestrzenią</string>
-  <string name="manage_space_description">Ustawienia, baza danych i certyfikaty serwera z danych %1$s zostaną trwale usunięte. \n\nŚciągnięte pliki zostaną zachowane.\n\nTen proces może zająć trochę czasu.</string>
   <string name="manage_space_clear_data">Wyczyść dane</string>
   <string name="manage_space_error">Nie udało się usunąć niektórych plików.</string>
   <string name="permission_storage_access">Dodatkowe uprawnienia do wysyłania i ściągania plików.</string>

res/values-pt-rBR/strings.xml

@@ -35,9 +35,9 @@
   <string name="prefs_manage_accounts">Gerenciar contas</string>
   <string name="prefs_passcode">Bloqueio de senha</string>
   <string name="prefs_instant_upload">Envio instantâneo de imagem</string>
-  <string name="prefs_instant_upload_summary">Enviar instantaneamente fotos tiradas com a camera</string>
+  <string name="prefs_instant_upload_summary">Enviar instantaneamente fotos tiradas com a câmera</string>
   <string name="prefs_instant_video_upload">Envio instantâneo de vídeos</string>
-  <string name="prefs_instant_video_upload_summary">Enviar instantaneamente vídeos feitos com a camera</string>
+  <string name="prefs_instant_video_upload_summary">Enviar instantaneamente vídeos feitos com a câmera</string>
   <string name="prefs_log_title">Habilitar login</string>
   <string name="prefs_log_summary">Isto é usado para registrar(log) os problemas</string>
   <string name="prefs_log_title_history">História de logins</string>
@@ -64,6 +64,13 @@
   <string name="uploader_wrn_no_account_text">Não existe nenhuma conta %1$s em seu aparelho. Por favor configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
+  <string name="uploader_error_title_no_file_to_upload">Nenhum arquivo para envio</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s não pode ser enviado um pedaço de texto como um arquivo.</string>
+  <string name="uploader_error_message_no_file_to_upload">Os dados recebidos não incluem qualquer arquivo válido.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">O arquivo não pode sejam enviado</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s não tem permissão para ler um arquivo recebido</string>
+  <string name="uploader_error_message_source_file_not_found">Arquivo para envio não foi encontrado em sua localização. Por favor verifique se o arquivo existe.</string>
+  <string name="uploader_error_message_source_file_not_copied">Ocorreu um erro ao copiar o arquivo para uma pasta temporária. Por favor, tente enviar novamente.</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">Nada aqui. Envie alguma coisa!</string>
   <string name="file_list_loading">Carregando...</string>
@@ -91,9 +98,11 @@
   <string name="common_retry_upload">Tentar enviar de novo</string>
   <string name="common_cancel_sync">Cancelar sincronização</string>
   <string name="common_cancel">Cancelar</string>
+  <string name="common_back">Voltar</string>
   <string name="common_save_exit">Salvar &amp; e sair</string>
   <string name="common_error">Erro</string>
   <string name="common_loading">Carregando ...</string>
+  <string name="common_unknown">desconhecido</string>
   <string name="common_error_unknown">Erro desconhecido</string>
   <string name="about_title">Sobre</string>
   <string name="change_password">Alterar senha</string>
@@ -156,7 +165,7 @@
   <string name="upload_query_move_foreign_files">Não há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Você gostaria de movê-los em vez disso?</string>
   <string name="pass_code_enter_pass_code">Por favor insira sua senha</string>
   <string name="pass_code_configure_your_pass_code">Digite o código de acesso</string>
-  <string name="pass_code_configure_your_pass_code_explanation">O código de acesso será solicitado toda vez que o aplicativo é iniciado</string>
+  <string name="pass_code_configure_your_pass_code_explanation">O código de acesso será solicitado toda vez que o aplicativo for iniciado</string>
   <string name="pass_code_reenter_your_pass_code">Por favor reentre sua senha</string>
   <string name="pass_code_remove_your_pass_code">Remover o seu código de acesso</string>
   <string name="pass_code_mismatch">Os códigos de acesso não são os mesmos</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar link</string>
   <string name="clipboard_text_copied">Copiado para área de transferência</string>
+  <string name="clipboard_no_text_to_copy">Nenhum texto recebido para copiar para área de transferência</string>
+  <string name="clipboard_uxexpected_error">Erro inesperado ao copiar para a área de transferência</string>
+  <string name="clipboard_label">Texto copiado de %1$s</string>
   <string name="error_cant_bind_to_operations_service">Erro crítico: não pode executar operações</string>
   <string name="network_error_socket_exception">Ocorreu um erro durante a conexão com o servidor.</string>
   <string name="network_error_socket_timeout_exception">Ocorreu um erro enquanto se espera pelo servidor, a operação não poderia ter sido executada</string>
@@ -361,7 +373,7 @@
   <string name="prefs_instant_behaviour_title">O arquivo original será...</string>
   <string name="upload_copy_files">Copiar o arquivo</string>
   <string name="upload_move_files">Mover o arquivo</string>
-  <string name="pref_behaviour_entries_keep_file">manter na pasta original</string>
+  <string name="pref_behaviour_entries_keep_file">mantido na pasta original</string>
   <string name="pref_behaviour_entries_move">movido para a pasta app</string>
   <string name="share_dialog_title">Compartilhamento</string>
   <string name="share_file">Compartilhar %1$s</string>
@@ -397,8 +409,9 @@
   <string name="action_switch_grid_view">Grade de exibição</string>
   <string name="action_switch_list_view">Lista de visualização</string>
   <string name="manage_space_title">Gerenciar o espaço</string>
-  <string name="manage_space_description">Definições, banco de dados e certificados de servidor de %1$s será excluído permanentemente. Arquivos baixados serão mantidos inalterados. \n\nEste processo pode demorar algum tempo.</string>
+  <string name="manage_space_description">Definições, certificados de banco de dados e servidor de dados %1$s serão excluído permanentemente. \n\nArquivos baixados serão mantidos inalterados. \n\nEste processo pode demorar algum tempo.</string>
   <string name="manage_space_clear_data">Limpar dados</string>
   <string name="manage_space_error">Alguns arquivos não puderam ser excluído.</string>
   <string name="permission_storage_access">Permissões adicionais são necessárias para se enviar e baixar arquivos &amp; .</string>
+  <string name="local_file_not_found_toast">O arquivo não foi encontrado no sistema de arquivos local</string>
 </resources>

res/values-pt-rPT/strings.xml

@@ -46,7 +46,7 @@
   <string name="prefs_help">Ajuda</string>
   <string name="prefs_recommend">Recomendar a um amigo</string>
   <string name="prefs_feedback">Feedback</string>
-  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_imprint">Marca</string>
   <string name="prefs_remember_last_share_location">Lembrar localização de partilha</string>
   <string name="prefs_remember_last_upload_location_summary">Lembrar a última localização de partilha dos carregamentos</string>
   <string name="recommend_subject">Tente %1$s no seu smartphone!</string>
@@ -64,6 +64,13 @@
   <string name="uploader_wrn_no_account_text">Não existem as contas %1$s no seu equipamento. Por favor, configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
+  <string name="uploader_error_title_no_file_to_upload">Nenhum ficheiro para submeter</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s não pode submeter um pedaço de texto como um ficheiro.</string>
+  <string name="uploader_error_message_no_file_to_upload">A informação recebida não inclui nenhum ficheiro válido.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">O ficheiro não pode ser submetido</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s não está autorizado a ler um ficheiro recebido</string>
+  <string name="uploader_error_message_source_file_not_found">O ficheiro a submeter não foi encontrado nesta localização. Por favor verifique se o ficheiro existe.</string>
+  <string name="uploader_error_message_source_file_not_copied">Ocorreu um erro a tentar copiar o ficheiro para uma pasta temporária. Por favor tente submeter novamente.</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">Aqui não existe nada. Carregue alguma coisa!</string>
   <string name="file_list_loading">A carregar...</string>
@@ -91,9 +98,11 @@
   <string name="common_retry_upload">Tentar novamente o envio</string>
   <string name="common_cancel_sync">Cancelar sincronização</string>
   <string name="common_cancel">Cancelar</string>
+  <string name="common_back">Voltar</string>
   <string name="common_save_exit">Salvar &amp; sair</string>
   <string name="common_error">Erro</string>
   <string name="common_loading">A carregar ...</string>
+  <string name="common_unknown">desconhecido</string>
   <string name="common_error_unknown">Erro Desconhecido</string>
   <string name="about_title">Sobre</string>
   <string name="change_password">Alterar senha</string>
@@ -107,9 +116,10 @@
   <string name="uploader_upload_succeeded_content_single">%1$s carregado</string>
   <string name="uploader_upload_failed_ticker">Não foi possível enviar</string>
   <string name="uploader_upload_failed_content_single">Não foi possível concluir o envio de %1$s.</string>
-  <string name="uploader_upload_failed_credentials_error">Falha no upload, precisa fazer o login novamente</string>
+  <string name="uploader_upload_failed_credentials_error">Falha no envio, precisa fazer o login novamente</string>
   <string name="uploads_view_title">Carregamentos</string>
   <string name="uploads_view_group_current_uploads">Atual</string>
+  <string name="uploads_view_group_failed_uploads">Falhou (prima para tentar novamente)</string>
   <string name="uploads_view_group_finished_uploads">Carregado</string>
   <string name="uploads_view_upload_status_succeeded">Concluída</string>
   <string name="uploads_view_upload_status_cancelled">Cancelado</string>
@@ -142,7 +152,7 @@
   <string name="sync_conflicts_in_favourites_ticker">Foram encontrados conflitos</string>
   <string name="sync_conflicts_in_favourites_content">Não foi possível sincronizar o ficheiro %1$d</string>
   <string name="sync_fail_in_favourites_ticker">Falhou a operação de manter os ficheiros sincronizados</string>
-  <string name="sync_fail_in_favourites_content">Não foi possível sincronizar  o conteúdo de %1$d ficheiros  (%2$d conflitos)</string>
+  <string name="sync_fail_in_favourites_content">Não foi possível sincronizar o conteúdo de %1$d ficheiros  (%2$d conflitos)</string>
   <string name="sync_foreign_files_forgotten_ticker">Alguns ficheiros locais ficaram esquecidos</string>
   <string name="sync_foreign_files_forgotten_content">Nao foi possivel copiar os ficheiros %1$d da pasta %2$s para</string>
   <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os ficheiros que forem enviados deste dispositivo são copiados para a pasta local %1$s para prevenir perda de dados quando um ficheiro é sincronizado com várias contas.\n\nDevido a esta alteração, todos os ficheiros subidos em as versões anteriores desta app foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão deste processo durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover o link para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar o link para %4$s.\n\nEm baixo estão listados os ficheiro(s) locais e remotos em %5$s que foram ligados.</string>
@@ -176,7 +186,7 @@
   <string name="media_err_invalid_progressive_playback">O ficheiro de multimédia não pôde ser transmitido</string>
   <string name="media_err_unknown">O ficheiro não pode ser reproduzido com o leitor de média de origem</string>
   <string name="media_err_security_ex">Erro de segurança a tentar reproduzir o ficheiro %1$s</string>
-  <string name="media_err_io_ex">Erro de input a tentar reproduzir %1$s</string>
+  <string name="media_err_io_ex">Erro de entrada a tentar reproduzir %1$s</string>
   <string name="media_err_unexpected">Erro inesperado a tentar reproduzir %1$s</string>
   <string name="media_rewind_description">Botão de Retroceder</string>
   <string name="media_play_pause_description">Botão de Reproduzir/Pausar</string>
@@ -227,7 +237,7 @@
   <string name="rename_server_fail_msg">Não foi possível renomear</string>
   <string name="sync_file_fail_msg">Não foi possível verificar o ficheiro remoto</string>
   <string name="sync_file_nothing_to_do_msg">O conteúdo do ficheiro já foi sincronizado</string>
-  <string name="create_dir_fail_msg">Não foi possivel criar a pasta</string>
+  <string name="create_dir_fail_msg">Não foi possível criar a pasta</string>
   <string name="filename_forbidden_characters">Caracteres não permitidos: / \\ &lt; &gt; : \" | ? *</string>
   <string name="filename_forbidden_charaters_from_server">O nome de ficheiro contém pelo menos um caráter inválido</string>
   <string name="filename_empty">O nome do ficheiro não pode ser vazio.</string>
@@ -236,7 +246,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Por favor tente outra aplicação para seleccionar o ficheiro.</string>
   <string name="filedisplay_no_file_selected">Não selecionou nenhum ficheiro</string>
   <string name="activity_chooser_title">Enviar a ligação para ...</string>
-  <string name="wait_for_tmp_copy_from_private_storage">A copiar o ficheiro do aramazenamento privado</string>
+  <string name="wait_for_tmp_copy_from_private_storage">A copiar o ficheiro do armazenamento privado</string>
   <string name="oauth_check_onoff">Autenticar-se com oAuth2</string>
   <string name="oauth_login_connection">A ligar ao servidor oAuth2</string>
   <string name="ssl_validator_header">Não foi possível verificar a identidade do site.</string>
@@ -272,8 +282,8 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Só enviar as fotos por wi-fi</string>
-  <string name="instant_video_upload_on_wifi">Só enviar os vídeos via wi-fi</string>
+  <string name="instant_upload_on_wifi">Enviar as fotos apenas via wi-fi</string>
+  <string name="instant_video_upload_on_wifi">Enviar vídeos apenas via wi-fi</string>
   <string name="instant_upload_path">/Envio Instantâneo </string>
   <string name="conflict_title">Conflito de ficheiro</string>
   <string name="conflict_message">Quais os ficheiros que pretende manter? Se selecionar ambas as versões, o ficheiro local irá ter um número adicionado ao seu nome.</string>
@@ -285,7 +295,7 @@
   <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
   <string name="prefs_instant_upload_path_title">Caminho de envio</string>
   <string name="share_link_no_support_share_api">Lamentamos mas não é possível partilhar através do seu servidor. Por favor contacte o seu administrador.</string>
-  <string name="share_link_file_no_exist">Não é possivel partilhar. Por favor verifique se o ficheiro existe</string>
+  <string name="share_link_file_no_exist">Não é possível partilhar. Por favor verifique se o ficheiro existe</string>
   <string name="share_link_file_error">Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta</string>
   <string name="unshare_link_file_no_exist">Não é possível retirar a partilha. Verifique se o ficheiro existe</string>
   <string name="unshare_link_file_error">Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta</string>
@@ -296,8 +306,11 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar hiperligação</string>
   <string name="clipboard_text_copied">Copiado para a área de transferência</string>
+  <string name="clipboard_no_text_to_copy">Não foi recebido nenhum texto para copiar para a área de transferência</string>
+  <string name="clipboard_uxexpected_error">Erro inesperado ao copiar para a área de transferência</string>
+  <string name="clipboard_label">Texto copiado a partir de %1$s</string>
   <string name="error_cant_bind_to_operations_service">Erro crítico: não é possível executar as operações</string>
-  <string name="network_error_socket_exception">Ocorreu um erro durante a ligação ao servidos.</string>
+  <string name="network_error_socket_exception">Ocorreu um erro durante a ligação ao servidor.</string>
   <string name="network_error_socket_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
   <string name="network_error_connect_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
   <string name="network_host_not_available">A operação não foi concluída, o servidor está inacessível.</string>
@@ -317,7 +330,7 @@
   <string name="actionbar_logger">Registos de Alterações</string>
   <string name="log_send_history_button">Histórico de envio</string>
   <string name="log_send_no_mail_app">Não foi encontrada nenhuma app para enviar logs. Por favor, instale uma aplicação de envio.</string>
-  <string name="log_send_mail_subject">%1$s Android Aplicação de Registyos</string>
+  <string name="log_send_mail_subject">%1$s registos de aplicação Android</string>
   <string name="log_progress_dialog_text">A carregar dados ...</string>
   <string name="saml_authentication_required_text">Autenticação necessária</string>
   <string name="saml_authentication_wrong_pass">Palavra-passe errada</string>
@@ -378,8 +391,8 @@
   <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 ( em %2$s )</string>
-  <string name="share_sharee_unavailable">Desculpe, a versão do seu servidor não autoriza a partilha com utilizadores no mesmo cliente.
-        \nPor favor contacte o seu administrador</string>
+  <string name="share_sharee_unavailable">Desculpe, a versão do seu servidor não permite a partilha com utilizadores através de clientes.
+\nPor favor contacte o seu administrador</string>
   <string name="share_privilege_can_share">pode partilhar</string>
   <string name="share_privilege_can_edit">pode editar</string>
   <string name="share_privilege_can_edit_create">criar</string>
@@ -388,12 +401,15 @@
   <string name="edit_share_unshare">Parar partilha</string>
   <string name="edit_share_done">feito</string>
   <string name="action_retry_uploads">A tentativa falhou</string>
+  <string name="action_clear_failed_uploads">Limpar os que falharam</string>
   <string name="action_clear_successful_uploads">Limpar Carregamentos com Sucesso</string>
+  <string name="action_clear_finished_uploads">Limpar todos os concluídos</string>
   <string name="action_switch_grid_view">Vista em grelha</string>
   <string name="action_switch_list_view">Vista em lista</string>
   <string name="manage_space_title">Gerir espaço</string>
-  <string name="manage_space_description">Definições, base de dados e certificados de servidor dos dados de %1$s serão apagados permanentemente. \n\nFicheiros descarregados permanecerão intocados.\n\nEste processo pode demorar algum tempo.</string>
+  <string name="manage_space_description">As configurações, base de dados e certificados de servidor referentes aos dados de %1$s serão eliminados para sempre. \n\nOs ficheiros descarregados mantêm-se.\n\nEsta acção pode ser demorada.</string>
   <string name="manage_space_clear_data">Limpar dados</string>
   <string name="manage_space_error">Alguns ficheiros não podem ser apagados.</string>
   <string name="permission_storage_access">São necessárias permissões adicionais para carregar &amp; descarregar ficheiros.</string>
+  <string name="local_file_not_found_toast">O ficheiro não foi encontrado no sistema de ficheiros local</string>
 </resources>

res/values-ro/strings.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">%1$s aplicație Android</string>
   <string name="about_version">versiunea %1$s</string>
   <string name="actionbar_sync">Refresh cont</string>
   <string name="actionbar_upload">Încarcă</string>
@@ -24,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">Setări</string>
+  <string name="drawer_item_uploads_list">Încărcări</string>
   <string name="drawer_item_logs">Înregistrări</string>
   <string name="drawer_close">Închide</string>
   <string name="drawer_open">Deschide</string>
@@ -36,8 +38,11 @@
   <string name="prefs_instant_upload_summary">Încarcă instantant imagini luate cu camera</string>
   <string name="prefs_instant_video_upload">Încărcare instantă de videoclipuri.</string>
   <string name="prefs_instant_video_upload_summary">Încarcă instant videoclipuri înregistrate cu camera</string>
+  <string name="prefs_log_title">Activează înregistrarea / jurnalizarea activităților</string>
   <string name="prefs_log_summary">Acesta este folosit pentru a înregistra problemele</string>
+  <string name="prefs_log_title_history">Istoric activități jurnalizate</string>
   <string name="prefs_log_summary_history">Asta arată înregistrările salvate</string>
+  <string name="prefs_log_delete_history_button">Șterge istoricul</string>
   <string name="prefs_help">Ajutor</string>
   <string name="prefs_recommend">Recomandați unui prieten</string>
   <string name="prefs_feedback">Feedback</string>
@@ -46,6 +51,7 @@
   <string name="prefs_remember_last_upload_location_summary">Reține locația fișierului încărcat precedent</string>
   <string name="recommend_subject">Încearcă %1$s pe smartphone-ul tău!</string>
   <string name="recommend_text">Te invit să folosești %1$s pe smartphone-ul tău!\nDescarcă aici: %2$s</string>
+  <string name="auth_check_server">Verifică serverul</string>
   <string name="auth_host_url">Adresa serverului https://...</string>
   <string name="auth_username">Nume utilizator</string>
   <string name="auth_password">Parolă</string>
@@ -55,8 +61,15 @@
   <string name="uploader_btn_upload_text">Încărcare</string>
   <string name="uploader_top_message">Alegeţi dosarul pentru încărcare</string>
   <string name="uploader_wrn_no_account_title">Nici un cont găsit</string>
+  <string name="uploader_wrn_no_account_text">Nu există conturi %1$s pe dispozitivul tău. Te rugăm să configurezi unul mai întâi.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurare</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Renunță</string>
+  <string name="uploader_error_title_no_file_to_upload">Niciun fișier disponibil pentru încărcare</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s nu poate încărca o bucată de text ca un fișier.</string>
+  <string name="uploader_error_message_no_file_to_upload">Datele primite nu includ vreun fișier valid.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Fișierul nu poate fi încărcat</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s nu are permisiunea de a citi un fișier primit</string>
+  <string name="uploader_error_message_source_file_not_found">Fișierul de încărcat nu a fost găsit în locația sa. Vă rugăm verificați dacă fișierul există.</string>
   <string name="file_list_seconds_ago">secunde în urmă</string>
   <string name="file_list_empty">Nimic aici. Încarcă ceva!</string>
   <string name="file_list_loading">Se încarcă...</string>
@@ -77,6 +90,7 @@
   <string name="common_no">Nu</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Anulează</string>
+  <string name="common_back">Înapoi</string>
   <string name="common_error">Eroare</string>
   <string name="common_loading">Se încarcă...</string>
   <string name="common_error_unknown">Eroare necunoscută</string>
@@ -90,6 +104,7 @@
   <string name="uploader_upload_succeeded_ticker">Încărcat cu succes</string>
   <string name="uploader_upload_failed_ticker">Încărcarea a eșuat</string>
   <string name="uploader_upload_failed_content_single">Încărcarea fișierului %1$s nu a putut fi încheiată</string>
+  <string name="uploads_view_title">Încărcări</string>
   <string name="uploads_view_group_current_uploads">Curent</string>
   <string name="uploads_view_upload_status_succeeded">Terminat</string>
   <string name="uploads_view_upload_status_unknown_fail">Eroare necunoscută</string>

res/values-ru/strings.xml

@@ -89,9 +89,11 @@
   <string name="common_ok">ОК</string>
   <string name="common_cancel_sync">Отменить синхронизацию</string>
   <string name="common_cancel">Отмена</string>
+  <string name="common_back">Назад</string>
   <string name="common_save_exit">Сохранить и выйти</string>
   <string name="common_error">Ошибка</string>
   <string name="common_loading">Загрузка ...</string>
+  <string name="common_unknown">неизвестно</string>
   <string name="common_error_unknown">Неизвестная ошибка</string>
   <string name="about_title">О программе</string>
   <string name="change_password">Сменить пароль</string>
@@ -380,7 +382,6 @@
   <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">Для загрузки и скачивания файлов требуются дополнительные права.</string>

res/values-sk-rSK/strings.xml

@@ -79,8 +79,10 @@
   <string name="common_no">Nie</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel">Zrušiť</string>
+  <string name="common_back">Späť</string>
   <string name="common_error">Chyba</string>
   <string name="common_loading">Načítavam...</string>
+  <string name="common_unknown">neznámy</string>
   <string name="common_error_unknown">Neznáma chyba</string>
   <string name="about_title">O</string>
   <string name="change_password">Zmeniť heslo</string>

res/values-sl/strings.xml

@@ -64,6 +64,13 @@
   <string name="uploader_wrn_no_account_text">Za %1$s ni določenega računa. Pred nadaljevanjem ga je treba ustvariti.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavi</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Končaj</string>
+  <string name="uploader_error_title_no_file_to_upload">Ni izbrane datoteke za pošiljanje</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s nima ustreznih dovoljenj za pošiljanje dela besedila kot datoteko.</string>
+  <string name="uploader_error_message_no_file_to_upload">Prejeti podatki ne vključujejo nobene veljavne datoteke.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Datoteke ni mogoče poslati</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s nima ustreznih dovoljen za prejemanje datoteke</string>
+  <string name="uploader_error_message_source_file_not_found">Datoteke za pošiljanje ni mogoče najti na določenem mestu. Preverite, ali datoteka obstaja.</string>
+  <string name="uploader_error_message_source_file_not_copied">Prišlo je do napake med kopiranjem datoteke v začasno mapo. Poskusite znova poslati kasneje.</string>
   <string name="file_list_seconds_ago">pred nekaj sekundami</string>
   <string name="file_list_empty">Tukaj še ni ničesar. Najprej je treba datoteke poslati v oblak!</string>
   <string name="file_list_loading">Poteka nalaganje ...</string>
@@ -91,9 +98,11 @@
   <string name="common_retry_upload">Ponovno pošlji</string>
   <string name="common_cancel_sync">Prekliči usklajevanje</string>
   <string name="common_cancel">Prekliči</string>
+  <string name="common_back">Nazaj</string>
   <string name="common_save_exit">Shrani in končaj</string>
   <string name="common_error">Napaka</string>
   <string name="common_loading">Nalaganje ...</string>
+  <string name="common_unknown">neznano</string>
   <string name="common_error_unknown">Neznana napaka</string>
   <string name="about_title">O oblaku %1$s</string>
   <string name="change_password">Spremeni geslo</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Pošlji</string>
   <string name="copy_link">Kopiraj povezavo</string>
   <string name="clipboard_text_copied">Kopirano v odložišče</string>
+  <string name="clipboard_no_text_to_copy">Ni prejetega besedila za kopiranje v odložišče</string>
+  <string name="clipboard_uxexpected_error">Prišlo je do napake med kopiranjem v odložišče</string>
+  <string name="clipboard_label">Besedilo je kopirano iz %1$s</string>
   <string name="error_cant_bind_to_operations_service">Kritična napaka: opravil ni možno izvesti</string>
   <string name="network_error_socket_exception">Med povezovanjem s strežnikom je prišlo do napake.</string>
   <string name="network_error_socket_timeout_exception">Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni mogoče izvesti.</string>
@@ -397,8 +409,9 @@
   <string name="action_switch_grid_view">Mrežni pogled</string>
   <string name="action_switch_list_view">Seznamski pogled</string>
   <string name="manage_space_title">Upravljanje s prostorom</string>
-  <string name="manage_space_description">Nastavitve, podatkovna zbirka in potrdila strežnika %1$s bodo trajno izgubljena. \n\nPrejete datoteke bodo ostale nespremenjene.\n\nOpravilo je lahko dolgotrajno.</string>
+  <string name="manage_space_description">Naastavitve, podatkovna zbirka in potrdila strežnika podatkov %1$s bodo trajno izbrisani. \n\nŽe prejete datoteke bodo ostane nedotaknjene.\n\nTo opravilo je lahko dolgotrajno.</string>
   <string name="manage_space_clear_data">Počisti podatke</string>
   <string name="manage_space_error">Nekaterih datotek ni mogoče izbrisati.</string>
   <string name="permission_storage_access">Za prejemanje oziroma pošiljanje datotek v oblak so zahtevana dodatna dovoljenja.</string>
+  <string name="local_file_not_found_toast">Datoteke ni mogoče najti na krajevnem sistemu</string>
 </resources>

res/values-sq/strings.xml

@@ -64,6 +64,13 @@
   <string name="uploader_wrn_no_account_text">S’ka llogari %1$s te pajisja juaj. Ju lutemi, së pari krijoni një llogari.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Rregullim</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Dilni</string>
+  <string name="uploader_error_title_no_file_to_upload">Pa kartelë për ngarkim</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s s’mund të ngarkojë një copë teksti si të ish një kartelë.</string>
+  <string name="uploader_error_message_no_file_to_upload">Të dhënat e marra nuk përfshijnë ndonjë kartelë të vlefshme.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Kartela s’mund të ngarkohet</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s s’është lejuar të lexojë një kartelë të marrë</string>
+  <string name="uploader_error_message_source_file_not_found">Kartela për ngarkim s’u gjet te vendi i saj. Ju lutemi, shihni nëse ekziston apo jo kartela.</string>
+  <string name="uploader_error_message_source_file_not_copied">Ndodhi një gabim teksa kopjohej kartela te një dosje e përkohshme. Ju lutemi, provoni ta ridërgoni.</string>
   <string name="file_list_seconds_ago">sekonda më parë</string>
   <string name="file_list_empty">Këtu nuk ka gjë. Ngarkoni diçka!</string>
   <string name="file_list_loading">Po ngarkohet…</string>
@@ -91,6 +98,7 @@
   <string name="common_retry_upload">Riprovo ngarkimin</string>
   <string name="common_cancel_sync">Anuloje njëkohësimin</string>
   <string name="common_cancel">Anuloje</string>
+  <string name="common_back">Mbrapsht</string>
   <string name="common_save_exit">Ruaje &amp; dil</string>
   <string name="common_error">Gabim</string>
   <string name="common_loading">Po ngarkohet …</string>
@@ -296,6 +304,9 @@
   <string name="activity_chooser_send_file_title">Dërgoje</string>
   <string name="copy_link">Kopjoje lidhjen</string>
   <string name="clipboard_text_copied">U kopjua te e papastra</string>
+  <string name="clipboard_no_text_to_copy">S’u mor tekst për t’u kopjuar në të papastër</string>
+  <string name="clipboard_uxexpected_error">Gabim i panjohur teksa kopjohej në të papastër</string>
+  <string name="clipboard_label">Tekst i kopjuar prej %1$s</string>
   <string name="error_cant_bind_to_operations_service">Gabim kritik: nuk mund të kryhen veprime</string>
   <string name="network_error_socket_exception">Ndodhi një gabim teksa po lidhej me shërbyesin.</string>
   <string name="network_error_socket_timeout_exception">Ndodhi një gabim teksa po pritej për shërbyesin, veprimi s\’u krye dot</string>
@@ -394,8 +405,9 @@
   <string name="action_switch_grid_view">Pamje galeri</string>
   <string name="action_switch_list_view">Pamje listë</string>
   <string name="manage_space_title">Administroni hapësirë</string>
-  <string name="manage_space_description">Të dhënat e rregullimeve, bazës së të dhënave dhe dëshmive nga %1$s do të fshihen përgjithmonë. \n\nKartelat e shkarkuara do të ruhen të paprekura.\n\nKy proces mund të zgjasë ca.</string>
+  <string name="manage_space_description">Rregullimet, baza e të dhënave dhe dëshmitë e shërbyesit prej të dhënave nga %1$s do të fshihen përgjithmonë. \n\nKartelat e shkarkuara do të ruhen të paprekura.\n\nKy proces mund të hajë ca kohë.</string>
   <string name="manage_space_clear_data">Pastroji të dhënat</string>
   <string name="manage_space_error">Ca kartela s’u fshinë dot.</string>
   <string name="permission_storage_access">Që të ngarkoni &amp; shkarkoni kartela lypsen leje shtesë.</string>
+  <string name="local_file_not_found_toast">Kartela s’u gjet te sistemi vendor i kartelave</string>
 </resources>

res/values-sr/strings.xml

@@ -88,6 +88,7 @@
   <string name="common_ok">У реду</string>
   <string name="common_cancel_sync">Откажи синхронизацију</string>
   <string name="common_cancel">Откажи</string>
+  <string name="common_back">Назад</string>
   <string name="common_save_exit">Сачувај и изађи</string>
   <string name="common_error">Грешка</string>
   <string name="common_loading">Учитавам...</string>

res/values-sv/strings.xml

@@ -64,6 +64,13 @@
   <string name="uploader_wrn_no_account_text">Det finns inga %1$s-konton på din enhet. Lägg till ett konto först</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Skapa</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Avsluta</string>
+  <string name="uploader_error_title_no_file_to_upload">Ingen fil att ladda upp</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s kan inte ladda upp text som en fil.</string>
+  <string name="uploader_error_message_no_file_to_upload">Mottagen data innehåller ingen giltig fil.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Fil kan inte laddas upp</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s har inte tillåtelse att läsa en mottagen fil</string>
+  <string name="uploader_error_message_source_file_not_found">Filen som skulle laddas upp hittades inte på sin plats. Vänligen kontrollera att filen existerar.</string>
+  <string name="uploader_error_message_source_file_not_copied">Ett fel uppstod när filen kopierades till en temporär mapp. Vänligen försök skicka den igen.</string>
   <string name="file_list_seconds_ago">sekunder sedan</string>
   <string name="file_list_empty">Ingenting här. Ladda upp något!</string>
   <string name="file_list_loading">Laddar...</string>
@@ -91,9 +98,11 @@
   <string name="common_retry_upload">Försök ladda upp igen</string>
   <string name="common_cancel_sync">Avbryt synkronisering</string>
   <string name="common_cancel">Avbryt</string>
+  <string name="common_back">Tillbaka</string>
   <string name="common_save_exit">Spara &amp; avsluta</string>
   <string name="common_error">Fel</string>
   <string name="common_loading">Laddar...</string>
+  <string name="common_unknown">okänt</string>
   <string name="common_error_unknown">Okänt fel</string>
   <string name="about_title">Om</string>
   <string name="change_password">Ändra lösenord</string>
@@ -299,6 +308,9 @@
   <string name="activity_chooser_send_file_title">Skicka</string>
   <string name="copy_link">Kopiera länk</string>
   <string name="clipboard_text_copied">Kopierat till urklipp</string>
+  <string name="clipboard_no_text_to_copy">Ingen text mottagen för att kopieras till utklipp</string>
+  <string name="clipboard_uxexpected_error">Oväntat fel vid kopiering till utklipp</string>
+  <string name="clipboard_label">Text kopierad från %1$s</string>
   <string name="error_cant_bind_to_operations_service">Kritiskt fel: kan inte utföra åtgärden</string>
   <string name="network_error_socket_exception">Ett fel uppstod vid anslutning till servern.</string>
   <string name="network_error_socket_timeout_exception">Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts</string>
@@ -396,8 +408,9 @@
   <string name="action_switch_grid_view">Rutnätsvy</string>
   <string name="action_switch_list_view">Listvy</string>
   <string name="manage_space_title">Hantera utrymme</string>
-  <string name="manage_space_description">Inställningar, databas och servercertifikat från %1$s data kommer att raderas permanent. \n\nNedladdade förblir orörda.\n\nProcessen kommer ta tid.</string>
+  <string name="manage_space_description">Inställningar, databas och servercertifikat från %1$s\'s data kommer att raderas permanent. \n\nNedladdade filer kommer inte påverkas.\n\nDetta kan ta ett tag.</string>
   <string name="manage_space_clear_data">Rensa data</string>
   <string name="manage_space_error">Vissa filer kunde inte raderas.</string>
   <string name="permission_storage_access">Ytterligare rättigheter krävs för att ladda upp &amp; ner filer.</string>
+  <string name="local_file_not_found_toast">Filen hittades inte i det lokala filsystemet</string>
 </resources>

res/values-ta-rLK/strings.xml

@@ -39,6 +39,7 @@
   <string name="common_no">இல்லை</string>
   <string name="common_ok">சரி </string>
   <string name="common_cancel">இரத்து செய்க</string>
+  <string name="common_back">பின்னுக்கு</string>
   <string name="common_error">வழு</string>
   <string name="about_title">பற்றி</string>
   <string name="change_password">கடவுச்சொல்லை மாற்றுக</string>

res/values-th-rTH/strings.xml

@@ -33,7 +33,7 @@
   <string name="prefs_category_more">เพิ่มเติม</string>
   <string name="prefs_accounts">บัญชี</string>
   <string name="prefs_manage_accounts">บริหารจัดการบัญชี</string>
-  <string name="prefs_passcode">ล็อค Passcodes</string>
+  <string name="prefs_passcode">ล็อครหัสยืนยัน</string>
   <string name="prefs_instant_upload">อัพโหลดรูปภาพทันที</string>
   <string name="prefs_instant_upload_summary">อัพโหลดรูปภาพที่ถ่ายโดยกล้องทันที</string>
   <string name="prefs_instant_video_upload">อัพโหลดวิดีโอทันที</string>
@@ -64,11 +64,19 @@
   <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_error_title_no_file_to_upload">ไม่พบไฟล์ที่อัพโหลด</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s ไม่สามารถอัพโหลดชิ้นส่วนของข้อความเป็นไฟล์</string>
+  <string name="uploader_error_message_no_file_to_upload">ได้รับข้อมูลที่ไม่ได้รวมถึงไฟล์ที่ถูกต้องใดๆ</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">ไม่สามารถอัพโหลดไฟล์</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s ไม่ได้รับอนุญาตให้อ่านไฟล์ที่ได้รับ</string>
+  <string name="uploader_error_message_source_file_not_found">ไม่พบเส้นทางของไฟล์ที่ต้องการอัพโหลด กรุณาตรวจสอบว่ายังมีไฟล์นั่นอยู่</string>
+  <string name="uploader_error_message_source_file_not_copied">เกิดข้อผิดพลาดขณะที่คัดลอกไฟล์ไปยังโฟลเดอร์ชั่วคราว โปรดลองส่งอีกครั้ง</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="upload_list_empty">ไม่พบการอัพโหลดใดๆ</string>
   <string name="file_list_folder">โฟลเดอร์</string>
   <string name="file_list_folders">โฟลเดอร์</string>
   <string name="file_list_file">ไฟล์</string>
@@ -86,14 +94,19 @@
   <string name="common_yes">ตกลง</string>
   <string name="common_no">ไม่ตกลง</string>
   <string name="common_ok">ตกลง</string>
+  <string name="common_remove_upload">ลบอัพโหลด</string>
+  <string name="common_retry_upload">ลองอัพโหลดใหม่อีกครั้ง</string>
   <string name="common_cancel_sync">ยกเลิกการผสานข้อมูล</string>
   <string name="common_cancel">ยกเลิก</string>
+  <string name="common_back">ย้อนกลับ</string>
   <string name="common_save_exit">บันทึก &amp; ออก</string>
   <string name="common_error">ข้อผิดพลาด</string>
   <string name="common_loading">กำลังโหลด ...</string>
+  <string name="common_unknown">ไม่รู้จัก</string>
   <string name="common_error_unknown">ข้อผิดพลาดที่ไม่ทราบสาเหตุ</string>
   <string name="about_title">เกี่ยวกับเรา</string>
   <string name="change_password">เปลี่ยนรหัสผ่าน</string>
+  <string name="delete_account">ลบบัญชี</string>
   <string name="create_account">สร้างบัญชีใหม่</string>
   <string name="upload_chooser_title">อัพโหลดไฟล์จาก ...</string>
   <string name="uploader_info_dirname">ชื่อโฟลเดอร์</string>
@@ -106,12 +119,18 @@
   <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_failed_uploads">ล้มเหลว (แตะเพื่อลองอีกครั้ง)</string>
   <string name="uploads_view_group_finished_uploads">ถูกอัพโหลด</string>
   <string name="uploads_view_upload_status_succeeded">เสร็จสมบูรณ์</string>
+  <string name="uploads_view_upload_status_cancelled">ยกเลิกแล้ว</string>
+  <string name="uploads_view_upload_status_paused">หยุดชั่วคราวแล้ว</string>
+  <string name="uploads_view_upload_status_failed_connection_error">การเชื่อมต่อล้มเหลว</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_conflict">ความขัดแย้ง</string>
+  <string name="uploads_view_upload_status_service_interrupted">แอพฯได้ถูกยกเลิกแล้ว</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>
@@ -133,23 +152,23 @@
   <string name="sync_fail_in_favourites_content">เนื้อหาของไฟล์ %1$d ไม่สามารถประสานเชื่อมข้อมูลได้ (ความขัดแย้ง %2$d รายการ)</string>
   <string name="sync_foreign_files_forgotten_ticker">มีแฟ้มข้อมูลต้นทางบางแฟ้มถูกลืม</string>
   <string name="sync_foreign_files_forgotten_content">ไม่สามารถคัดลอกไฟล์ %1$d ไปยังโฟลเดอร์ %2$s</string>
-  <string name="sync_foreign_files_forgotten_explanation">ขณะที่รุ่น 1.3.16 ไฟล์ที่อัปโหลดจากเครื่องของคุณจะถูกคัดลอกไปสำรองไว้ที่ต้นทาง %1$s เพื่อป้องกันการสูญเสียข้อมูลเมื่อไฟล์เดียวถูกซิงค์กับบัญชีหลายบัญชี \n\n การเปลี่ยนแปลงนี้ไฟล์ทั้งหมดที่อัปโหลดในรุ่นก่อนหน้า ของ app นี้ถูกคัดลอกลงในโฟลเดอร์ %2$s แต่ก็อาจมีข้อผิดพลาดในการดำเนินการนี้ช่วงระหว่างการประสานบัญชี คุณอาจจะสูญเสียข้อมูล  เช่นเดียวกับการลบ หรือย้ายไฟล์และเชื่อมโยงไปยัง %3$s ส่วนโฟลเดอร์ %1$s จะถูกเชื่อมโยงไปยัง %4$s \n\n รายชื่อด้านล่าง เป็นแฟ้มต้นทาง และแฟ้มปลายทาง ใน %5$s มันจะถูกนำมาเชื่อมโยงกัน</string>
+  <string name="sync_foreign_files_forgotten_explanation">สำหรับรุ่น 1.3.16 ไฟล์ที่อัพโหลดจากเครื่องของคุณจะถูกคัดลอกไปสำรองไว้ที่ต้นทาง %1$s เพื่อป้องกันการสูญเสียข้อมูลเมื่อไฟล์เดียวถูกซิงค์กับบัญชีหลายบัญชี \n\n การเปลี่ยนแปลงนี้ไฟล์ทั้งหมดที่อัปโหลดในรุ่นก่อนหน้า ของ app นี้ถูกคัดลอกลงในโฟลเดอร์ %2$s แต่ก็อาจมีข้อผิดพลาดในการดำเนินการนี้ช่วงระหว่างการประสานบัญชี คุณอาจจะสูญเสียข้อมูล  เช่นเดียวกับการลบ หรือย้ายไฟล์และเชื่อมโยงไปยัง %3$s ส่วนโฟลเดอร์ %1$s จะถูกเชื่อมโยงไปยัง %4$s \n\n รายชื่อด้านล่าง เป็นแฟ้มต้นทาง และแฟ้มปลายทาง ใน %5$s มันจะถูกนำมาเชื่อมโยงกัน</string>
   <string name="sync_current_folder_was_removed">โฟลเดอร์ %1$s หายไปแล้ว</string>
   <string name="foreign_files_move">ย้ายทั้งหมด</string>
   <string name="foreign_files_success">ทุกแฟ้มข้อมูลถูกย้ายเรียบร้อยแล้ว</string>
   <string name="foreign_files_fail">มีบางแฟ้มข้อมูลไม่สามารถย้ายได้</string>
   <string name="foreign_files_local_text">ต้นทาง: %1$s</string>
-  <string name="foreign_files_remote_text">ปลายทาง: %1$s</string>
+  <string name="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">ใส่ Passcodes ของคุณ</string>
-  <string name="pass_code_configure_your_pass_code_explanation">จะมีการร้องขอ Passcodes ทุกครั้งเมื่อเริ่มต้นใช้แอพฯ</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">ลบ Passcodes ของคุณ</string>
-  <string name="pass_code_mismatch">Passcodes ของคุณไม่ตรงกัน</string>
-  <string name="pass_code_wrong">Passcode ไม่ถูกต้อง</string>
-  <string name="pass_code_removed">ลบ Passcode</string>
-  <string name="pass_code_stored">Passcode ที่เก็บไว้</string>
+  <string name="pass_code_remove_your_pass_code">ลบรหัสยืนยันของคุณ</string>
+  <string name="pass_code_mismatch">รหัสยืนยันของคุณไม่ตรงกัน</string>
+  <string name="pass_code_wrong">รหัสยืนยันไม่ถูกต้อง</string>
+  <string name="pass_code_removed">ลบรหัสยืนยัน</string>
+  <string name="pass_code_stored">รหัสยืนยันที่เก็บไว้</string>
   <string name="media_notif_ticker">เล่นเพลง %1$s</string>
   <string name="media_state_playing">%1$s (กำลังเล่น)</string>
   <string name="media_state_loading">%1$s (กำลังโหลด)</string>
@@ -213,7 +232,7 @@
   <string name="rename_dialog_title">กรอกชื่อใหม่</string>
   <string name="rename_local_fail_msg">ไฟล์ต้นทางที่คัดลอกไม่สามารถเปลี่ยนชื่อได้, กรุณาเปลี่ยนเป็นชื่อใหม่</string>
   <string name="rename_server_fail_msg">ไม่สามารถเปลี่ยนชื่อได้</string>
-  <string name="sync_file_fail_msg">ไม่สามารถตรวจสอบไฟล์ระยะไกลได้</string>
+  <string name="sync_file_fail_msg">ไม่สามารถตรวจสอบไฟล์รีโมทได้</string>
   <string name="sync_file_nothing_to_do_msg">เนื้อหาของไฟล์ถูกประสานข้อมูลอยู่แล้ว</string>
   <string name="create_dir_fail_msg">ไม่สามารถสร้างโฟลเดอร์</string>
   <string name="filename_forbidden_characters">ห้ามใช้ตัวอักษรดังนี้: / \\ &lt; &gt; : \" | ? *</string>
@@ -263,7 +282,7 @@
   <string name="instant_video_upload_on_wifi">อัพโหลดวิดีโอผ่านทาง wifi เท่านั้น</string>
   <string name="instant_upload_path">/อัพโหลดทันที</string>
   <string name="conflict_title">ไฟล์ที่ขัดแย้ง</string>
-  <string name="conflict_message">ไฟล์ใดที่คุณต้องการที่จะเก็บ? หากคุณเลือกทั้งสองรุ่น ไฟล์ต้นทางจะมีจำนวนชื่อเพิ่ม</string>
+  <string name="conflict_message">ไฟล์ใดที่คุณต้องการที่จะเก็บ? เลือกวางทับไฟล์เดิมหรือ เขียนไฟล์ใหม่จะเพิ่มตัวเลขไปยังชื่อของมัน</string>
   <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
   <string name="conflict_use_local_version">เวอร์ชันต้นทาง</string>
   <string name="conflict_use_server_version">เวอร์ชันเซิร์ฟเวอร์</string>
@@ -272,11 +291,11 @@
   <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_no_exist">ไม่สามารถแชร์ กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่</string>
   <string name="share_link_file_error">เกิดข้อผิดพลาดในขณะที่พยายามจะแชร์ไฟล์หรือโฟลเดอร์นี้</string>
-  <string name="unshare_link_file_no_exist">ไม่สามารถยกเลิกการแชร์ กรุณาตรวจสอบไฟล์ที่มีอยู่</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_no_exist">ไม่สามารถอัพเดท กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่</string>
   <string name="update_link_file_error">เกิดข้อผิดพลาดในขณะที่พยายามอัพเดทการแชร์</string>
   <string name="share_link_password_title">ป้อนรหัสผ่าน</string>
   <string name="share_link_empty_password">คุณจะต้องใส่รหัสผ่าน</string>
@@ -311,12 +330,12 @@
   <string name="actionbar_move">ย้าย</string>
   <string name="file_list_empty_moving">ไม่มีสิ่งใดในที่นี่ คุณสามารถสร้างโฟลเดอร์!</string>
   <string name="folder_picker_choose_button_text">เลือก</string>
-  <string name="move_file_not_found">ไม่สามารถย้ายไฟล์ กรุณาตรวจสอบว่าไฟล์ยังคงอยู่</string>
+  <string name="move_file_not_found">ไม่สามารถย้ายไฟล์ กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่</string>
   <string name="move_file_invalid_into_descendent">มันเป็นไปไม่ได้ที่จะย้ายโฟลเดอร์ที่มีราก</string>
   <string name="move_file_invalid_overwrite">มีไฟล์อยู่แล้วในโฟลเดอร์ปลายทาง</string>
   <string name="move_file_error">เกิดข้อผิดพลาดขณะพยายามที่จะย้ายไฟล์หรือโฟลเดอร์นี้</string>
   <string name="forbidden_permissions_move">เพื่อย้ายไฟล์นี้</string>
-  <string name="copy_file_not_found">ไม่สามารถคัดลอก กรุณาตรวจสอบว่ามีไฟล์นั้นอยู่</string>
+  <string name="copy_file_not_found">ไม่สามารถคัดลอก กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่</string>
   <string name="copy_file_invalid_into_descendent">มันเป็นไปไม่ได้ที่จะคัดลอกลงในโฟลเดอร์โฟลเดอร์ย่อย</string>
   <string name="copy_file_invalid_overwrite">มีไฟล์อยู่แล้วในโฟลเดอร์ปลายทาง</string>
   <string name="copy_file_error">เกิดข้อผิดพลาดขณะพยายามคัดลอกไฟล์หรือโฟลเดอร์นี้</string>
@@ -347,19 +366,20 @@
   <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_dialog_title">แชร์ข้อมูล</string>
   <string name="share_with_user_section_title">แชร์กับผู้ใช้และกลุ่ม</string>
   <string name="share_no_users">ยังไม่มีข้อมูลที่แชร์กับผู้ใช้ในตอนนี้</string>
   <string name="share_add_user_or_group">เพิ่มชื่อผู้ใช้งาน หรือชื่อกลุ่ม</string>
   <string name="share_via_link_section_title">แชร์ลิงค์</string>
   <string name="share_via_link_expiration_date_label">กำหนดวันที่หมดอายุ</string>
-  <string name="share_via_link_password_label">รหัสผ่านป้องกัน</string>
+  <string name="share_via_link_password_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>
   <string name="share_group_clarification">%1$s (กลุ่ม)</string>
+  <string name="share_remote_clarification">%1$s (รีโมท)</string>
   <string name="share_sharee_unavailable">ขออภัย รุ่นเซิร์ฟเวอร์ของคุณไม่อนุญาตให้แชร์กับผู้ใช้ภายในไคลเอนต์
 \nกรุณาติดต่อผู้ดูแลระบบ</string>
   <string name="share_privilege_can_share">สามารถแชร์ได้</string>

res/values-tr/strings.xml

@@ -91,9 +91,11 @@
   <string name="common_retry_upload">Yüklemeyi tekrar dene</string>
   <string name="common_cancel_sync">Eşitlemeyi iptal et</string>
   <string name="common_cancel">İptal</string>
+  <string name="common_back">Geri</string>
   <string name="common_save_exit">Kaydet ve çık</string>
   <string name="common_error">Hata</string>
   <string name="common_loading">Yükleniyor...</string>
+  <string name="common_unknown">bilinmiyor</string>
   <string name="common_error_unknown">Bilinmeyen hata</string>
   <string name="about_title">Hakkında</string>
   <string name="change_password">Parola değiştir</string>
@@ -397,7 +399,6 @@
   <string name="action_switch_grid_view">Izgara görünümü</string>
   <string name="action_switch_list_view">Liste görünümü</string>
   <string name="manage_space_title">Alanı ayarla</string>
-  <string name="manage_space_description">Ayarlar, veritabanı ve sunucu sertifikaları %1$s verilerinden tamamen silinecektir.\n\nİndirilen dosyalara dokunulmayacak.\n\nBu işlem biraz zaman alabilir.</string>
   <string name="manage_space_clear_data">Verileri temizle</string>
   <string name="manage_space_error">Bazı dosyalar silinemedi</string>
   <string name="permission_storage_access">Dosya yüklemek ve indirmek için ek izin gerekiyor.</string>

res/values-uk/strings.xml

@@ -82,6 +82,7 @@
   <string name="common_ok">OK</string>
   <string name="common_cancel_sync">Відмінити синхронізацію</string>
   <string name="common_cancel">Відмінити</string>
+  <string name="common_back">Назад</string>
   <string name="common_save_exit">Зберегти та вийти</string>
   <string name="common_error">Помилка</string>
   <string name="common_loading">Завантаження...</string>

res/values-vi/strings.xml

@@ -57,6 +57,7 @@
   <string name="common_no">Không</string>
   <string name="common_ok">Chấp nhận</string>
   <string name="common_cancel">Hủy</string>
+  <string name="common_back">Trở lại</string>
   <string name="common_error">Lỗi</string>
   <string name="common_loading">Đang tải...</string>
   <string name="common_error_unknown">Lỗi chưa biết</string>

res/values-zh-rCN/strings.xml

@@ -91,9 +91,11 @@
   <string name="common_retry_upload">重试上传任务</string>
   <string name="common_cancel_sync">取消同步</string>
   <string name="common_cancel">取消</string>
+  <string name="common_back">返回</string>
   <string name="common_save_exit">保存并退出</string>
   <string name="common_error">错误</string>
   <string name="common_loading">加载中...</string>
+  <string name="common_unknown">未知</string>
   <string name="common_error_unknown">未知错误</string>
   <string name="about_title">关于</string>
   <string name="change_password">修改密码</string>
@@ -389,8 +391,6 @@
   <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">没有权限上传和下载文件。</string>

res/values-zh-rHK/strings.xml

@@ -39,6 +39,7 @@
   <string name="common_no">否</string>
   <string name="common_ok">確定</string>
   <string name="common_cancel">取消</string>
+  <string name="common_back">返回</string>
   <string name="common_error">錯誤</string>
   <string name="common_loading">戴入中 …</string>
   <string name="common_error_unknown">不明錯誤</string>

res/values-zh-rTW/strings.xml

@@ -59,16 +59,24 @@
   <string name="sync_string_files">檔案</string>
   <string name="setup_btn_connect">連線</string>
   <string name="uploader_btn_upload_text">上傳</string>
-  <string name="uploader_top_message">選取上傳目錄:</string>
+  <string name="uploader_top_message">選取上傳資料夾:</string>
   <string name="uploader_wrn_no_account_title">找不到帳號</string>
   <string name="uploader_wrn_no_account_text">無%1$s帳號，請先建立帳號。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
   <string name="uploader_wrn_no_account_quit_btn_text">離開</string>
+  <string name="uploader_error_title_no_file_to_upload">沒有要上傳的檔案</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s 無法如檔案一樣上傳一段文字.</string>
+  <string name="uploader_error_message_no_file_to_upload">接收的資料未包含任何有效的檔案.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">無法上傳檔案</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s 不允許讀取接收的檔案</string>
+  <string name="uploader_error_message_source_file_not_found">在該位置無法找到要上傳的檔案. 請檢查該檔案是否存在.</string>
+  <string name="uploader_error_message_source_file_not_copied">在複製檔案到暫存資料夾時發生錯誤. 請再試一次.</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">檔案格式無對應app可開啟</string>
-  <string name="local_file_list_empty">這個目錄中沒有任何檔案.</string>
+  <string name="file_list_no_app_for_file_type">檔案格式無對應的應用程式可開啟</string>
+  <string name="local_file_list_empty">這個資料夾中沒有任何檔案.</string>
+  <string name="upload_list_empty">無上傳</string>
   <string name="file_list_folder">資料夾</string>
   <string name="file_list_folders">資料夾</string>
   <string name="file_list_file">檔案</string>
@@ -86,11 +94,15 @@
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">好</string>
+  <string name="common_remove_upload">移除上傳</string>
+  <string name="common_retry_upload">重試上傳</string>
   <string name="common_cancel_sync">取消同步</string>
   <string name="common_cancel">取消</string>
+  <string name="common_back">返回</string>
   <string name="common_save_exit">儲存；離開。</string>
   <string name="common_error">錯誤</string>
   <string name="common_loading">載入 …</string>
+  <string name="common_unknown">未知</string>
   <string name="common_error_unknown">未知的錯誤</string>
   <string name="about_title">關於</string>
   <string name="change_password">變更密碼</string>
@@ -107,13 +119,22 @@
   <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_failed_uploads">失敗 (輕觸可重試)</string>
   <string name="uploads_view_group_finished_uploads">已上傳</string>
   <string name="uploads_view_upload_status_succeeded">完成</string>
+  <string name="uploads_view_upload_status_cancelled">已取消</string>
+  <string name="uploads_view_upload_status_paused">已暫停</string>
+  <string name="uploads_view_upload_status_failed_connection_error">連線錯誤</string>
+  <string name="uploads_view_upload_status_failed_retry">上傳任務將在稍後重試</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_folder_error">資料夾錯誤</string>
   <string name="uploads_view_upload_status_failed_file_error">檔案錯誤</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">找不到本地的檔案</string>
   <string name="uploads_view_upload_status_failed_permission_error">權限錯誤</string>
+  <string name="uploads_view_upload_status_conflict">衝突</string>
+  <string name="uploads_view_upload_status_service_interrupted">程式已被中止</string>
   <string name="uploads_view_upload_status_unknown_fail">未知的錯誤</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">等待無線網路連線</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>
@@ -126,6 +147,7 @@
   <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>
@@ -133,13 +155,14 @@
   <string name="sync_fail_in_favourites_content">%1$d 未被同步 (%2$d 衝突)</string>
   <string name="sync_foreign_files_forgotten_ticker">有些本地端的檔案已遺失</string>
   <string name="sync_foreign_files_forgotten_content">%1$d 檔案超過 %2$s 資料夾可能不能複製進去</string>
-  <string name="sync_foreign_files_forgotten_explanation">在 1.3.16 版之前, 檔案上傳時會先複製到本地的 %1$s 目錄以避免在多帳戶內同步造成遺失.\n\n由於這個改變, 所以在之前版本上傳的檔案被複製到 %2$s 目錄中. 為了避免同步發生問題. 你可以保留那些檔案並刪除連結 %3$s, 或搬移檔案到 %1$s 目錄並取得連結到 %4$s.\n\n下面列表是本地檔案, 與被連結遠端檔案 %5$s.</string>
+  <string name="sync_foreign_files_forgotten_explanation">在 1.3.16 版之前, 檔案上傳時會先複製到本地的 %1$s 資料夾以避免在多帳戶內同步造成遺失.\n\n由於這個改變, 所以在之前版本上傳的檔案被複製到 %2$s 資料夾中. 為了避免同步發生問題. 你可以保留那些檔案並刪除連結 %3$s, 或搬移檔案到 %1$s 資料夾並取得連結到 %4$s.\n\n下面列表是本地檔案, 與被連結遠端檔案 %5$s.</string>
   <string name="sync_current_folder_was_removed">資料夾 %1$s 不存在</string>
   <string name="foreign_files_move">移動全部</string>
-  <string name="foreign_files_success">所有文件已被移動</string>
-  <string name="foreign_files_fail">部份文件無法被移動</string>
+  <string name="foreign_files_success">所有檔案已被移動</string>
+  <string name="foreign_files_fail">部份檔案無法被移動</string>
   <string name="foreign_files_local_text">本地: %1$s</string>
   <string name="foreign_files_remote_text">遠端: %1$s</string>
+  <string name="upload_query_move_foreign_files">沒有足夠的空間來複製檔案到資料夾 %1$s. 是否改用搬移的方式來處理?</string>
   <string name="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>
@@ -153,7 +176,7 @@
   <string name="media_state_playing">%1$s (播放中)</string>
   <string name="media_state_loading">%1$s (載入中)</string>
   <string name="media_event_done">%1$s 已播放</string>
-  <string name="media_err_nothing_to_play">沒有發現音樂媒體</string>
+  <string name="media_err_nothing_to_play">沒有發現媒體檔案</string>
   <string name="media_err_no_account">沒有提供的帳戶</string>
   <string name="media_err_not_in_owncloud">檔案不存在於有效的帳戶中</string>
   <string name="media_err_unsupported">未支援的媒體編碼</string>
@@ -190,6 +213,7 @@
   <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">未知狀態; 請重新輸入伺服器的位址</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>
@@ -219,6 +243,7 @@
   <string name="filename_forbidden_charaters_from_server">檔案名稱含有不合法的字元</string>
   <string name="filename_empty">檔名不能為空的</string>
   <string name="wait_a_moment">請稍後</string>
+  <string name="wait_checking_credentials">檢查儲存的密碼</string>
   <string name="filedisplay_unexpected_bad_get_content">未知的問題; 請選擇其他程式開啟檔案</string>
   <string name="filedisplay_no_file_selected">沒有挑選檔案</string>
   <string name="activity_chooser_title">傳送連結至 ...</string>
@@ -247,7 +272,9 @@
   <string name="ssl_validator_label_validity_to">至：</string>
   <string name="ssl_validator_label_signature">簽名：</string>
   <string name="ssl_validator_label_signature_algorithm">演算法:</string>
+  <string name="digest_algorithm_not_available">這種加密演算法在你的手機中無法使用</string>
   <string name="ssl_validator_label_certificate_fingerprint">指紋:</string>
+  <string name="certificate_load_problem">憑證載入時發生問題.</string>
   <string name="ssl_validator_null_cert">這個憑證無法被顯示</string>
   <string name="ssl_validator_no_info_about_error">- 沒有關於這個錯誤的說明</string>
   <string name="placeholder_sentence">這是佔位的資訊</string>
@@ -266,13 +293,14 @@
   <string name="conflict_use_server_version">伺服器版本</string>
   <string name="preview_image_description">圖片預覽</string>
   <string name="preview_image_error_unknown_format">無法顯示圖片</string>
-  <string name="error__upload__local_file_not_copied">%1$s 無法被複製到本地目錄 %2$s</string>
+  <string name="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="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>
@@ -280,6 +308,9 @@
   <string name="activity_chooser_send_file_title">寄出</string>
   <string name="copy_link">複製連結</string>
   <string name="clipboard_text_copied">複製至剪貼簿中</string>
+  <string name="clipboard_no_text_to_copy">無任何文字被複製到剪貼簿</string>
+  <string name="clipboard_uxexpected_error">在複製的剪貼簿時發生了未知的錯誤</string>
+  <string name="clipboard_label">文字已由 %1$s 複製</string>
   <string name="error_cant_bind_to_operations_service">嚴重錯誤: 無法執行運算</string>
   <string name="network_error_socket_exception">在與伺服器連線時發生了錯誤.</string>
   <string name="network_error_socket_timeout_exception">在等待伺服器回應時發生了錯誤, 這個操作將無法被完成</string>
@@ -293,10 +324,11 @@
   <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="uploader_upload_forbidden_permissions">上傳這個資料夾</string>
   <string name="downloader_download_file_not_found">這個檔案已經不存在於伺服器中</string>
   <string name="prefs_category_accounts">帳號</string>
   <string name="prefs_add_account">新增帳號</string>
+  <string name="auth_redirect_non_secure_connection_title">加密的連線是由一個未加密的連線轉向過來的.</string>
   <string name="actionbar_logger">紀錄</string>
   <string name="log_send_history_button">傳送歷史</string>
   <string name="log_send_no_mail_app">沒有傳送紀錄的軟體. 請安裝郵件軟體</string>
@@ -305,17 +337,22 @@
   <string name="saml_authentication_required_text">必須驗證</string>
   <string name="saml_authentication_wrong_pass">密碼錯誤</string>
   <string name="actionbar_move">移動</string>
-  <string name="file_list_empty_moving">找不到任何檔案. 你可以新增一個目錄!</string>
+  <string name="file_list_empty_moving">找不到任何檔案. 你可以新增一個資料夾!</string>
   <string name="folder_picker_choose_button_text">選擇</string>
   <string name="move_file_not_found">無法搬移. 請檢查該檔案是否存在</string>
-  <string name="move_file_invalid_into_descendent">把一個目錄搬移到其底下的子目錄是不可能的</string>
-  <string name="move_file_invalid_overwrite">這個檔案已經存在於目的目錄中</string>
-  <string name="move_file_error">在移動檔案或目錄時發生了錯誤</string>
+  <string name="move_file_invalid_into_descendent">把一個資料夾搬移到其底下的子資料夾是不可能的</string>
+  <string name="move_file_invalid_overwrite">這個檔案已經存在於目的資料夾中</string>
+  <string name="move_file_error">在移動檔案或資料夾時發生了錯誤</string>
   <string name="forbidden_permissions_move">移動這個檔案</string>
   <string name="copy_file_not_found">無法複製, 請檢查檔案是否存在</string>
-  <string name="copy_file_invalid_into_descendent">無法複製檔案夾到子目錄</string>
-  <string name="copy_file_invalid_overwrite">這個檔案已經存在於目的目錄中</string>
+  <string name="copy_file_invalid_into_descendent">無法複製資料夾到子資料夾</string>
+  <string name="copy_file_invalid_overwrite">這個檔案已經存在於目的資料夾中</string>
+  <string name="copy_file_error">嘗試複製檔案或資料夾時發生錯誤</string>
+  <string name="forbidden_permissions_copy">複製這個檔案</string>
+  <string name="prefs_category_instant_uploading">即時上傳</string>
   <string name="prefs_category_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>
   <string name="subject_user_shared_with_you">%1$s 分享了 \"%2$s\" 給您</string>
@@ -332,16 +369,49 @@
   <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>
   <string name="share_privilege_can_edit">可編輯</string>
   <string name="share_privilege_can_edit_create">建立</string>
   <string name="share_privilege_can_edit_change">更動</string>
   <string name="share_privilege_can_edit_delete">刪除</string>
+  <string name="edit_share_unshare">停止分享</string>
+  <string name="edit_share_done">完成</string>
+  <string name="action_retry_uploads">重試失敗</string>
+  <string name="action_clear_failed_uploads">清除失敗</string>
+  <string name="action_clear_successful_uploads">清除成功</string>
+  <string name="action_clear_finished_uploads">清除所有已完成的項目</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">需要額外的權限來上傳或下傳檔案.</string>
+  <string name="local_file_not_found_toast">在本地的檔案系統中找不到這個檔案</string>
 </resources>

res/values/colors.xml

@@ -35,8 +35,6 @@
     <color name="list_divider_background">#eee</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
-    <color name="login_text_color">#757575</color>
-    <color name="login_text_hint_color">#757575</color>
     <color name="secondary_button_color">#D6D7D7</color>
     <color name="transparent">#00000000</color>
     <color name="secondaryTextColor">#a0a0a0</color>

res/values/oauth2_configuration.xml

@@ -6,7 +6,7 @@
     
     <!-- values that should be provided by ownCloud server -->
     <string name="oauth2_url_endpoint_auth">http://oauth2.authorization.server.org/paht/to/endpoint/for/authorization</string>
-    <string name="oauth2_url_endpoint_access">http://oauth2.authorization.server.org/paht/to/endporint/for/access/token</string>
+    <string name="oauth2_url_endpoint_access">http://oauth2.authorization.server.org/paht/to/endpoint/for/access/token</string>
     <string name="oauth2_scope">owncloud</string>
     <string name="oauth2_grant_type">authorization_code</string>	<!-- the only one supported right now -->
     <string name="oauth2_response_type">code</string>				<!-- depends on oauth2_grant_type -->

res/values/setup.xml

@@ -24,10 +24,13 @@
     
     <!-- Flags to enable/disable some features -->
     <string name = "send_files_to_other_apps">on</string>
-    <string name = "share_feature">on</string>
+    <bool name = "share_via_link_feature">true</bool>
+    <bool name = "share_with_users_feature">true</bool>
     
     
     <!-- Colors -->
+    <color name="login_text_color">#000000</color>
+    <color name="login_text_hint_color">#757575</color>
     <color name="login_background_color">#FFFFFF</color>
     <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>

res/values/strings.xml

@@ -324,6 +324,9 @@
 
     <string name="copy_link">Copy link</string>
     <string name="clipboard_text_copied">Copied to clipboard</string>
+    <string name="clipboard_no_text_to_copy">No text received to copy to clipboard</string>
+    <string name="clipboard_uxexpected_error">Unexpected error while copying to clipboard</string>
+    <string name="clipboard_label">Text copied from %1$s</string>
 
     <string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
 
@@ -446,7 +449,7 @@
     <string name="action_switch_list_view">List view</string>
 
     <string name="manage_space_title">Manage space</string>
-    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanentlty. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
+    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
     <string name="manage_space_clear_data">Clear data</string>
     <string name="manage_space_error">Some files could not be deleted.</string>
 

setup_env.bat

@@ -2,7 +2,6 @@
 
 :: Use argument to decide which build system should be used
 if "%1" == "gradle" goto initForGradle
-if "%1" == "maven" goto initForMaven
 if "%1" == "ant" goto initForAnt
 goto invalidInput
 
@@ -10,10 +9,6 @@ goto invalidInput
 echo "Executing Gradle setup..."
 goto initDefault
 
-:initForMaven
-echo "Executing Maven setup..."
-goto initDefault
-
 :initForAnt
 echo "Executing Ant setup..."
 ::If the directory exists the script has already been executed
@@ -43,7 +38,7 @@ goto complete
 
 :invalidInput
 echo "Input argument invalid."
-echo "Usage: %0 [ant | maven | gradle]."
+echo "Usage: %0 [ant | gradle]."
 goto exit
 
 :complete

setup_env.sh

@@ -31,7 +31,7 @@ function initForAnt {
 #No args
 if [ $# -lt 1 ]; then
         echo "No args found"
-        echo "Usage : $0 [gradle | maven | ant]"
+        echo "Usage : $0 [gradle | ant]"
         exit
 fi
 
@@ -47,12 +47,8 @@ case "$1" in
         initDefault
         ;;
 
-    "maven")  echo  "Creating maven environment"
-        initDefault
-        ;;
-
     *)  echo "Argument not recognized"
-        echo "Usage : $0 [gradle | maven | ant]"
+        echo "Usage : $0 [gradle | ant]"
        ;;
 esac
 

src/com/owncloud/android/MainApp.java

@@ -25,7 +25,6 @@ import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 
 import com.owncloud.android.authentication.PassCodeManager;
@@ -87,48 +86,46 @@ public class MainApp extends Application {
         }
 
         // register global protection with pass code
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            this.registerActivityLifecycleCallbacks( new ActivityLifecycleCallbacks() {
-
-                @Override
-                public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-                    Log_OC.d(activity.getClass().getSimpleName(),  "onCreate(Bundle) starting" );
-                    PassCodeManager.getPassCodeManager().onActivityCreated(activity);
-                }
-
-                @Override
-                public void onActivityStarted(Activity activity) {
-                    Log_OC.d(activity.getClass().getSimpleName(),  "onStart() starting" );
-                    PassCodeManager.getPassCodeManager().onActivityStarted(activity);
-                }
-
-                @Override
-                public void onActivityResumed(Activity activity) {
-                    Log_OC.d(activity.getClass().getSimpleName(), "onResume() starting" );
-                }
-
-                @Override
-                public void onActivityPaused(Activity activity) {
-                    Log_OC.d(activity.getClass().getSimpleName(), "onPause() ending");
-                }
-
-                @Override
-                public void onActivityStopped(Activity activity) {
-                    Log_OC.d(activity.getClass().getSimpleName(), "onStop() ending" );
-                    PassCodeManager.getPassCodeManager().onActivityStopped(activity);
-                }
-
-                @Override
-                public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-                    Log_OC.d(activity.getClass().getSimpleName(), "onSaveInstanceState(Bundle) starting" );
-                }
-
-                @Override
-                public void onActivityDestroyed(Activity activity) {
-                    Log_OC.d(activity.getClass().getSimpleName(), "onDestroy() ending" );
-                }
-            });
-        }
+        registerActivityLifecycleCallbacks( new ActivityLifecycleCallbacks() {
+
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+                Log_OC.d(activity.getClass().getSimpleName(),  "onCreate(Bundle) starting" );
+                PassCodeManager.getPassCodeManager().onActivityCreated(activity);
+            }
+
+            @Override
+            public void onActivityStarted(Activity activity) {
+                Log_OC.d(activity.getClass().getSimpleName(),  "onStart() starting" );
+                PassCodeManager.getPassCodeManager().onActivityStarted(activity);
+            }
+
+            @Override
+            public void onActivityResumed(Activity activity) {
+                Log_OC.d(activity.getClass().getSimpleName(), "onResume() starting" );
+            }
+
+            @Override
+            public void onActivityPaused(Activity activity) {
+                Log_OC.d(activity.getClass().getSimpleName(), "onPause() ending");
+            }
+
+            @Override
+            public void onActivityStopped(Activity activity) {
+                Log_OC.d(activity.getClass().getSimpleName(), "onStop() ending" );
+                PassCodeManager.getPassCodeManager().onActivityStopped(activity);
+            }
+
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+                Log_OC.d(activity.getClass().getSimpleName(), "onSaveInstanceState(Bundle) starting" );
+            }
+
+            @Override
+            public void onActivityDestroyed(Activity activity) {
+                Log_OC.d(activity.getClass().getSimpleName(), "onDestroy() ending" );
+            }
+        });
     }
 
     public static Context getAppContext() {

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

@@ -194,7 +194,8 @@ public class AccountUtils {
                 for (Account account : ocAccounts) {
                     // build new account name
                     serverUrl = accountMgr.getUserData(account, Constants.KEY_OC_BASE_URL);
-                    username = account.name.substring(0, account.name.lastIndexOf('@'));
+                    username = com.owncloud.android.lib.common.accounts.AccountUtils.
+                            getUsernameForAccount(account);
                     newAccountName = com.owncloud.android.lib.common.accounts.AccountUtils.
                             buildAccountName(Uri.parse(serverUrl), username);
 

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

@@ -366,9 +366,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param savedInstanceState        Saved activity state, as in {{@link #onCreate(Bundle)}
      */
     private void initServerPreFragment(Bundle savedInstanceState) {
+        boolean checkHostUrl = true;
 
         /// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)
-        boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input); 
+        boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input);
         if (savedInstanceState == null) {
             if (mAccount != null) {
                 mServerInfo.mBaseUrl = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL);
@@ -408,6 +409,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mHostUrlInput.setFocusable(false);
         }
         if (isUrlInputAllowed) {
+            if (mServerInfo.mBaseUrl.isEmpty()) {
+                checkHostUrl = false;
+            }
             mRefreshButton = findViewById(R.id.embeddedRefreshButton);
         } else {
             findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
@@ -471,7 +475,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
         /// step 4 - mark automatic check to be started when OperationsService is ready
         mPendingAutoCheck = (savedInstanceState == null && 
-                (mAction != ACTION_CREATE || !isUrlInputAllowed));
+                (mAction != ACTION_CREATE || checkHostUrl));
     }
     
     
@@ -494,7 +498,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         boolean isPasswordExposed = false;
         if (savedInstanceState == null) {
             if (mAccount != null) {
-                presetUserName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
+                presetUserName =
+                    com.owncloud.android.lib.common.accounts.AccountUtils.
+                        getUsernameForAccount(mAccount);
             }
             
         } else {

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

@@ -484,6 +484,8 @@ public class FileDataStorageManager {
                     }
                 }
             }
+        } else {
+            success = false;
         }
         return success;
     }

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

@@ -443,7 +443,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      * @return remote path
      */
     public String getParentRemotePath() {
-        return new File(getRemotePath()).getParent();
+        String parentPath = new File(getRemotePath()).getParent();
+        return (parentPath.endsWith("/")) ? parentPath : (parentPath + "/");
     }
 
     /**

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

@@ -181,14 +181,17 @@ public class FileMenuFilter {
         }
 
         // SHARE FILE
-        boolean shareAllowed = (mContext != null  &&
-                mContext.getString(R.string.share_feature).equalsIgnoreCase("on"));
+        boolean shareViaLinkAllowed = (mContext != null  &&
+                mContext.getResources().getBoolean(R.bool.share_via_link_feature));
+        boolean shareWithUsersAllowed = (mContext != null  &&
+                mContext.getResources().getBoolean(R.bool.share_with_users_feature));
+
         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
         boolean shareApiEnabled  = capability != null &&
                 (capability.getFilesSharingApiEnabled().isTrue() ||
                         capability.getFilesSharingApiEnabled().isUnknown()
                 );
-        if (!shareAllowed ||  mFile == null || !shareApiEnabled) {
+        if ((!shareViaLinkAllowed && !shareWithUsersAllowed) ||  mFile == null || !shareApiEnabled) {
             toHide.add(R.id.action_share_file);
         } else {
             toShow.add(R.id.action_share_file);

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

@@ -205,25 +205,6 @@ public class FileOperationsHelper {
         }
     }
 
-    public void shareFileWithLinkToApp(OCFile file, String password, Intent sendIntent) {
-        
-        if (file != null) {
-            mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                    getString(R.string.wait_a_moment));
-
-            Intent service = new Intent(mFileActivity, OperationsService.class);
-            service.setAction(OperationsService.ACTION_CREATE_SHARE_VIA_LINK);
-            service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
-            service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            service.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, password);
-            service.putExtra(OperationsService.EXTRA_SEND_INTENT, sendIntent);
-            mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
-            
-        } else {
-            Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
-        }
-    }
-
     /**
      * Helper method to share a file with a known sharee. Starts a request to do it in {@link OperationsService}
      *
@@ -331,23 +312,6 @@ public class FileOperationsHelper {
     }
 
 
-    /**
-     * Starts a dialog that requests a password to the user to protect a share link.
-     *
-     * @param   file            File which public share will be protected by the requested password
-     * @param   createShare     When 'true', the request for password will be followed by the creation of a new
-     *                          public link; when 'false', a public share is assumed to exist, and the password
-     *                          is bound to it.
-     */
-    public void requestPasswordForShareViaLink(OCFile file, boolean createShare) {
-        SharePasswordDialogFragment dialog =
-                SharePasswordDialogFragment.newInstance(file, createShare);
-        dialog.show(
-            mFileActivity.getSupportFragmentManager(),
-            SharePasswordDialogFragment.PASSWORD_FRAGMENT
-        );
-    }
-
     /**
      * Updates a public share on a file to set its password.
      * Starts a request to do it in {@link OperationsService}

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

@@ -26,10 +26,6 @@ package com.owncloud.android.operations;
  */
 
 
-import android.content.Context;
-import android.content.Intent;
-
-import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -41,31 +37,26 @@ import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.operations.common.SyncOperation;
 
+import java.util.ArrayList;
+
 public class CreateShareViaLinkOperation extends SyncOperation {
 
     private String mPath;
     private String mPassword;
-    private Intent mSendIntent;
-    private String mFileName;
 
     /**
      * Constructor
      * @param path          Full path of the file/folder being shared. Mandatory argument
      * @param password      Password to protect a public link share.
      *                      Only available for public link shares
-     *  @param sendIntent   Optional Intent with the information of an app where the link to the new share (if public)
-     *                      should be posted later.
      */
     public CreateShareViaLinkOperation(
             String path,
-            String password,
-            Intent sendIntent
+            String password
     ) {
 
         mPath = path;
         mPassword = password;
-        mSendIntent = sendIntent;
-        mFileName = null;
     }
 
     @Override
@@ -101,9 +92,19 @@ public class CreateShareViaLinkOperation extends SyncOperation {
         
         if (result.isSuccess()) {
             if (result.getData().size() > 0) {
-                OCShare share = (OCShare) result.getData().get(0);
-                updateData(share);
-            } 
+                Object item = result.getData().get(0);
+                if (item instanceof  OCShare) {
+                    updateData((OCShare) item);
+                } else {
+                    ArrayList<Object> data = result.getData();
+                    result = new RemoteOperationResult(
+                        RemoteOperationResult.ResultCode.SHARE_NOT_FOUND
+                    );
+                    result.setData(data);
+                }
+            } else {
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+            }
         }
         
         return result;
@@ -117,32 +118,6 @@ public class CreateShareViaLinkOperation extends SyncOperation {
         return mPassword;
     }
 
-    public Intent getSendIntent() {
-        return mSendIntent;
-    }
-
-    public Intent getSendIntentWithSubject(Context context) {
-        if (context != null && mSendIntent != null && mSendIntent.getStringExtra(Intent.EXTRA_SUBJECT) != null) {
-            if (getClient() == null || getClient().getCredentials() == null ||
-                    getClient().getCredentials().getUsername() == null) {
-                mSendIntent.putExtra(
-                        Intent.EXTRA_SUBJECT,
-                        context.getString(R.string.subject_shared_with_you, mFileName)
-                );
-            } else {
-                mSendIntent.putExtra(
-                        Intent.EXTRA_SUBJECT,
-                        context.getString(
-                                R.string.subject_user_shared_with_you,
-                                getClient().getCredentials().getUsername(),
-                                mFileName
-                        )
-                );
-            }
-        }
-        return mSendIntent;
-    }
-
     private void updateData(OCShare share) {
         // Update DB with the response
         share.setPath(mPath);
@@ -160,9 +135,6 @@ public class CreateShareViaLinkOperation extends SyncOperation {
             file.setPublicLink(share.getShareLink());
             file.setShareViaLink(true);
             getStorageManager().saveFile(file);
-            if (mSendIntent != null) {
-                mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
-            }
         }
     }
 

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

@@ -379,16 +379,15 @@ public class UploadFileOperation extends SyncOperation {
                     mFile.setStoragePath("");
                 } else {
                     mFile.setStoragePath(expectedPath);
-                    File fileToMove;
+
                     if (temporalFile != null) {         // FileUploader.LOCAL_BEHAVIOUR_COPY
-                        fileToMove = temporalFile;
+                        move(temporalFile, expectedFile);
                     } else {                            // FileUploader.LOCAL_BEHAVIOUR_MOVE
-                        fileToMove = originalFile;
+                        move(originalFile, expectedFile);
+                        getStorageManager().deleteFileInMediaScan(originalFile.getAbsolutePath());
                     }
-                    move(fileToMove, expectedFile);
+                    FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath());
                 }
-                FileDataStorageManager.triggerMediaScan(originalFile.getAbsolutePath());
-                FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath());
 
             } else if (result.getHttpCode() == HttpStatus.SC_PRECONDITION_FAILED ) {
                 result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
@@ -766,8 +765,8 @@ public class UploadFileOperation extends SyncOperation {
         }
 
         if (mWasRenamed) {
-            OCFile oldFile = mOldFile;
-            if (oldFile.fileExists()) {
+            OCFile oldFile = getStorageManager().getFileByPath(mOldFile.getRemotePath());
+            if (oldFile != null) {
                 oldFile.setStoragePath(null);
                 getStorageManager().saveFile(oldFile);
                 getStorageManager().saveConflict(oldFile, null);

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

@@ -897,7 +897,7 @@ public class FileContentProvider extends ContentProvider {
 			for (Account account : accounts) {
                 // build both old and new account name
                 serverUrl = ama.getUserData(account, AccountUtils.Constants.KEY_OC_BASE_URL);
-                username = account.name.substring(0, account.name.lastIndexOf('@'));
+                username = AccountUtils.getUsernameForAccount(account);
                 oldAccountName = AccountUtils.buildAccountNameOld(Uri.parse(serverUrl), username);
                 newAccountName = AccountUtils.buildAccountName(Uri.parse(serverUrl), username);
 

src/com/owncloud/android/services/OperationsService.java

@@ -83,7 +83,6 @@ public class OperationsService extends Service {
     public static final String EXTRA_SERVER_URL = "SERVER_URL";
     public static final String EXTRA_OAUTH2_QUERY_PARAMETERS = "OAUTH2_QUERY_PARAMETERS";
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
-    public static final String EXTRA_SEND_INTENT = "SEND_INTENT";
     public static final String EXTRA_NEWNAME = "NEWNAME";
     public static final String EXTRA_REMOVE_ONLY_LOCAL = "REMOVE_LOCAL_COPY";
     public static final String EXTRA_CREATE_FULL_PATH = "CREATE_FULL_PATH";
@@ -563,12 +562,10 @@ public class OperationsService extends Service {
                 if (action.equals(ACTION_CREATE_SHARE_VIA_LINK)) {  // Create public share via link
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     String password = operationIntent.getStringExtra(EXTRA_SHARE_PASSWORD);
-                    Intent sendIntent = operationIntent.getParcelableExtra(EXTRA_SEND_INTENT);
                     if (remotePath.length() > 0) {
                         operation = new CreateShareViaLinkOperation(
                                 remotePath,
-                                password,
-                                sendIntent
+                                password
                         );
                     }
 

src/com/owncloud/android/ui/activity/CopyToClipboardActivity.java

@@ -21,12 +21,13 @@
 package com.owncloud.android.ui.activity;
 
 import com.owncloud.android.R;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.ClipboardManager;
+import android.content.ClipboardManager;
 import android.widget.Toast;
 
 /**
@@ -34,33 +35,45 @@ import android.widget.Toast;
  */
 @SuppressWarnings("deprecation")
 public class CopyToClipboardActivity extends Activity {
-    
+
+    private static final String TAG = CopyToClipboardActivity.class.getName();
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
-        // get the clipboard system service
-        ClipboardManager clipboardManager = (ClipboardManager) this.getSystemService(CLIPBOARD_SERVICE);
-        
-        // get the text to copy into the clipboard 
-        Intent intent = getIntent();
-        CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);
-        
-        // and put the text the clipboard
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
-            // API level >= 11 -> modern Clipboard
-            ClipData clip = ClipData.newPlainText("ownCloud was here", text);
-            ((android.content.ClipboardManager)clipboardManager).setPrimaryClip(clip);
-            
-        } else {
-            // API level >= 11 -> legacy Clipboard
-            clipboardManager.setText(text);    
+
+        try {
+
+            // get the clipboard system service
+            ClipboardManager clipboardManager = (ClipboardManager) this.getSystemService(CLIPBOARD_SERVICE);
+
+            // get the text to copy into the clipboard
+            Intent intent = getIntent();
+            CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);
+
+            if (text != null && text.length() > 0) {
+                // minimum API level >= 11 -> only modern Clipboard
+                ClipData clip = ClipData.newPlainText(
+                    getString(R.string.clipboard_label, getString(R.string.app_name)),
+                    text
+                );
+                clipboardManager.setPrimaryClip(clip);
+
+                // API level < 11 -> legacy Clipboard - NOT SUPPORTED ANYMORE
+                // clipboardManager.setText(text);
+
+                // alert the user that the text is in the clipboard and we're done
+                Toast.makeText(this, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(this, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show();
+            }
+
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.clipboard_uxexpected_error, Toast.LENGTH_SHORT).show();
+            Log_OC.e(TAG, "Exception caught while copying to clipboard", e);
         }
-        
-        // alert the user that the text is in the clipboard and we're done
-        Toast.makeText(this, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show();
-        
+
         finish();
-    }    
+    }
 
 }

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -73,7 +73,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OCCapability;
-import com.owncloud.android.operations.CreateShareViaLinkOperation;
 import com.owncloud.android.operations.CreateShareWithShareeOperation;
 import com.owncloud.android.operations.GetSharesForFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
@@ -87,7 +86,6 @@ import com.owncloud.android.ui.NavigationDrawerItem;
 import com.owncloud.android.ui.adapter.NavigationDrawerListAdapter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.LoadingDialog;
-import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 
@@ -111,7 +109,6 @@ public class FileActivity extends AppCompatActivity
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
 
     private static final String KEY_WAITING_FOR_OP_ID = "WAITING_FOR_OP_ID";
-    private static final String DIALOG_SHARE_PASSWORD = "DIALOG_SHARE_PASSWORD";
     private static final String KEY_ACTION_BAR_TITLE = "ACTION_BAR_TITLE";
 
     public static final int REQUEST_CODE__UPDATE_CREDENTIALS = 0;
@@ -789,9 +786,6 @@ public class FileActivity extends AppCompatActivity
                 t.show();
             }
 
-        } else if (operation instanceof CreateShareViaLinkOperation) {
-            onCreateShareViaLinkOperationFinish((CreateShareViaLinkOperation) operation, result);
-
         } else if (operation instanceof SynchronizeFileOperation) {
             onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
 
@@ -887,44 +881,6 @@ public class FileActivity extends AppCompatActivity
         }
     }
 
-    private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation operation,
-                                                     RemoteOperationResult result) {
-        if (result.isSuccess()) {
-            updateFileFromDB();
-
-            Intent sendIntent = operation.getSendIntentWithSubject(this);
-            if (sendIntent != null) {
-                startActivity(sendIntent);
-            }
-
-        } else {
-            // Detect Failure (403) --> needs Password
-            if (result.getCode() == ResultCode.SHARE_FORBIDDEN) {
-                String password = operation.getPassword();
-                if ((password == null || password.length() == 0) &&
-                    getCapabilities().getFilesSharingPublicEnabled().isUnknown())
-                    {
-                    // Was tried without password, but not sure that it's optional. Try with password.
-                    // Try with password before giving up.
-                    // See also ShareFileFragment#OnShareViaLinkListener
-                    SharePasswordDialogFragment dialog =
-                            SharePasswordDialogFragment.newInstance(new OCFile(operation.getPath()), true);
-                    dialog.show(getSupportFragmentManager(), DIALOG_SHARE_PASSWORD);
-                } else {
-                    Toast t = Toast.makeText(this,
-                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                        Toast.LENGTH_LONG);
-                    t.show();
-                }
-            } else {
-                Toast t = Toast.makeText(this,
-                        ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                        Toast.LENGTH_LONG);
-                t.show();
-            }
-        }
-    }
-
     private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation,
                                                   RemoteOperationResult result) {
         OCFile syncedFile = operation.getLocalFile();
@@ -1044,6 +1000,7 @@ public class FileActivity extends AppCompatActivity
     public void restart(){
         Intent i = new Intent(this, FileDisplayActivity.class);
         i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(i);
     }
 

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -765,23 +765,26 @@ public class FileDisplayActivity extends HookActivity
         OCFile currentDir = getCurrentDir();
         String remotePath = (currentDir != null) ? currentDir.getRemotePath() : OCFile.ROOT_PATH;
 
-        if (filePath.startsWith(UriUtils.URI_CONTENT_SCHEME)) {
-            Cursor cursor = getContentResolver().query(Uri.parse(filePath), null, null, null, null);
-            try {
-                if (cursor != null && cursor.moveToFirst()) {
-                    String displayName = cursor.getString(cursor.getColumnIndex(
-                            OpenableColumns.DISPLAY_NAME));
-                    Log_OC.v(TAG, "Display Name: " + displayName);
-
-                    displayName.replace(File.separatorChar, '_');
-                    displayName.replace(File.pathSeparatorChar, '_');
-                    remotePath += displayName + DisplayUtils.getComposedFileExtension(filePath);
-
-                }
-                // and what happens in case of error?; wrong target name for the upload
-            } finally {
-                cursor.close();
-            }
+        if (selectedImageUri.toString().startsWith(UriUtils.URI_CONTENT_SCHEME)) {
+//            Cursor cursor = getContentResolver().query(Uri.parse(filePath), null, null, null, null);
+//            try {
+//                if (cursor != null && cursor.moveToFirst()) {
+//                    String displayName = cursor.getString(cursor.getColumnIndex(
+//                            OpenableColumns.DISPLAY_NAME));
+//                    Log_OC.v(TAG, "Display Name: " + displayName);
+//
+//                    displayName.replace(File.separatorChar, '_');
+//                    displayName.replace(File.pathSeparatorChar, '_');
+//                    remotePath += displayName + DisplayUtils.getComposedFileExtension(filePath);
+//
+//                }
+//                // and what happens in case of error?; wrong target name for the upload
+//            } finally {
+//                cursor.close();
+//            }
+            // Pending to be fixed
+            Toast.makeText(this, R.string.common_error_unknown, Toast.LENGTH_SHORT).show();
+            return;
 
         } else {
             remotePath += new File(filePath).getName();

src/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -35,6 +35,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -298,6 +299,7 @@ public class PassCodeActivity extends AppCompatActivity {
         if (ACTION_CHECK.equals(getIntent().getAction())) {
             if (checkPassCode()) {
                 /// pass code accepted in request, user is allowed to access the app
+                hideSoftKeyboard();
                 finish();
 
             }  else {
@@ -310,7 +312,7 @@ public class PassCodeActivity extends AppCompatActivity {
                 Intent resultIntent = new Intent();
                 resultIntent.putExtra(KEY_CHECK_RESULT, true);
                 setResult(RESULT_OK, resultIntent);
-
+                hideSoftKeyboard();
                 finish();
             } else {
                 showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code,
@@ -334,6 +336,17 @@ public class PassCodeActivity extends AppCompatActivity {
         }
     }
 
+    private void hideSoftKeyboard() {
+        View focusedView = getCurrentFocus();
+        if (focusedView != null) {
+            InputMethodManager inputMethodManager =
+                (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+            inputMethodManager.hideSoftInputFromWindow(
+                focusedView.getWindowToken(),
+                0
+            );
+        }
+    }
 
     private void showErrorAndRestart(int errorMessage, int headerMessage,
                                      int explanationVisibility) {

src/com/owncloud/android/ui/activity/Preferences.java

@@ -300,11 +300,7 @@ public class Preferences extends PreferenceActivity
                         
                         String appName = getString(R.string.app_name);
                         String downloadUrl = getString(R.string.url_app_download);
-                        Account currentAccount = AccountUtils.
-                                getCurrentOwnCloudAccount(Preferences.this);
-                        String username = currentAccount.name.substring(0,
-                                currentAccount.name.lastIndexOf('@'));
-                        
+
                         String recommendSubject =
                                 String.format(getString(R.string.recommend_subject),
                                 appName);

src/com/owncloud/android/ui/activity/ShareActivity.java

@@ -28,9 +28,11 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.widget.Toast;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -42,10 +44,12 @@ import com.owncloud.android.operations.UnshareOperation;
 import com.owncloud.android.operations.UpdateSharePermissionsOperation;
 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
+import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 import com.owncloud.android.ui.fragment.EditShareFragment;
 import com.owncloud.android.ui.fragment.SearchShareesFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 import com.owncloud.android.ui.fragment.ShareFragmentListener;
+import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 
 
@@ -62,10 +66,10 @@ public class ShareActivity extends FileActivity
     private static final String TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT";
     private static final String TAG_EDIT_SHARE_FRAGMENT = "EDIT_SHARE_FRAGMENT";
 
-    /**
-     * Tag for dialog
-     */
+    /// Tags for dialog fragments
     private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
+    private static final String FTAG_SHARE_PASSWORD_DIALOG = "SHARE_PASSWORD_DIALOG";
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -207,17 +211,8 @@ public class ShareActivity extends FileActivity
             refreshSharesFromStorageManager();
         }
 
-        if (operation instanceof CreateShareViaLinkOperation && result.isSuccess()) {
-            // Send link to the app
-            String link = ((OCShare) (result.getData().get(0))).getShareLink();
-            Log_OC.d(TAG, "Share link = " + link);
-
-            Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
-            intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
-            intentToShareLink.setType("text/plain");
-            String[] packagesToExclude = new String[]{getPackageName()};
-            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-            chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+        if (operation instanceof CreateShareViaLinkOperation) {
+            onCreateShareViaLinkOperationFinish((CreateShareViaLinkOperation) operation, result);
         }
 
         if (operation instanceof UnshareOperation && result.isSuccess() && getEditShareFragment() != null) {
@@ -286,4 +281,66 @@ public class ShareActivity extends FileActivity
         return (EditShareFragment) getSupportFragmentManager().findFragmentByTag(TAG_EDIT_SHARE_FRAGMENT);
     }
 
+
+    private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation operation,
+                                                     RemoteOperationResult result) {
+        if (result.isSuccess()) {
+            updateFileFromDB();
+
+            // Create dialog to allow the user choose an app to send the link
+            Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+            String link = ((OCShare) (result.getData().get(0))).getShareLink();
+            intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+            intentToShareLink.setType("text/plain");
+            String username = AccountUtils.getUsernameForAccount(getAccount());
+            if (username != null) {
+                intentToShareLink.putExtra(
+                    Intent.EXTRA_SUBJECT,
+                    getString(
+                        R.string.subject_user_shared_with_you,
+                        username,
+                        getFile().getFileName()
+                    )
+                );
+            } else {
+                intentToShareLink.putExtra(
+                    Intent.EXTRA_SUBJECT,
+                    getString(
+                        R.string.subject_shared_with_you,
+                        getFile().getFileName()
+                    )
+                );
+            }
+
+            String[] packagesToExclude = new String[]{getPackageName()};
+            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+            chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+
+        } else {
+            // Detect Failure (403) --> maybe needs password
+            String password = operation.getPassword();
+            if (result.getCode() == RemoteOperationResult.ResultCode.SHARE_FORBIDDEN    &&
+                    (password == null || password.length() == 0)                        &&
+                    getCapabilities().getFilesSharingPublicEnabled().isUnknown()) {
+                    // Was tried without password, but not sure that it's optional.
+
+                // Try with password before giving up; see also ShareFileFragment#OnShareViaLinkListener
+                ShareFileFragment shareFileFragment = getShareFileFragment();
+                if (shareFileFragment != null
+                    && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!
+
+                    shareFileFragment.requestPasswordForShareViaLink(true);
+                }
+
+            } else {
+                Toast t = Toast.makeText(this,
+                    ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                    Toast.LENGTH_LONG);
+                t.show();
+            }
+        }
+
+    }
+
+
 }

src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java

@@ -148,12 +148,18 @@ public class SamlWebViewDialog extends DialogFragment {
             
             WebSettings webSettings = mSsoWebView.getSettings();
             webSettings.setJavaScriptEnabled(true);
-            webSettings.setBuiltInZoomControls(false);
-            webSettings.setLoadWithOverviewMode(false);
             webSettings.setSavePassword(false);
             webSettings.setUserAgentString(MainApp.getUserAgent());
             webSettings.setSaveFormData(false);
-            
+            // next two settings grant that non-responsive webs are zoomed out when loaded
+            webSettings.setUseWideViewPort(true);
+            webSettings.setLoadWithOverviewMode(true);
+            // next three settings allow the user use pinch gesture to zoom in / out
+            webSettings.setSupportZoom(true);
+            webSettings.setBuiltInZoomControls(true);
+            webSettings.setDisplayZoomControls(false);
+            webSettings.setAllowFileAccess(false);
+
             CookieManager cookieManager = CookieManager.getInstance();
             cookieManager.setAcceptCookie(true);
             cookieManager.removeAllCookie();
@@ -268,4 +274,4 @@ public class SamlWebViewDialog extends DialogFragment {
         super.show(manager, tag);
     }
     
-}
+}

src/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java

@@ -55,8 +55,9 @@ public class SharePasswordDialogFragment extends DialogFragment
      * Public factory method to create new SharePasswordDialogFragment instances.
      *
      * @param   file            OCFile bound to the public share that which password will be set or updated
-     * @param   createShare     When 'true', the public share will be created; when 'false', will be assumed
-     *                          that the public share already exists, and its state will be directly updated.
+     * @param   createShare     When 'true', the request for password will be followed by the creation of a new
+     *                          public link; when 'false', a public share is assumed to exist, and the password
+     *                          is bound to it.
      * @return                  Dialog ready to show.
      */
     public static SharePasswordDialogFragment newInstance(OCFile file, boolean createShare) {

src/com/owncloud/android/ui/fragment/EditShareFragment.java

@@ -256,16 +256,25 @@ public class EditShareFragment extends Fragment {
                     boolean isFederated = ShareType.FEDERATED.equals(mShare.getShareType());
                     if (mFile.isFolder()) {
                         if (isChecked) {
-                            for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
-                                //noinspection ConstantConditions, prevented in the method beginning
-                                subordinate = (CompoundButton) getView().findViewById(sSubordinateCheckBoxIds[i]);
-                                if (!isFederated) {
+                            if (!isFederated) {
+                                /// not federated shares -> enable all the subpermisions
+                                for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
+                                    //noinspection ConstantConditions, prevented in the method beginning
+                                    subordinate = (CompoundButton) getView().findViewById(sSubordinateCheckBoxIds[i]);
                                     subordinate.setVisibility(View.VISIBLE);
-                                }
-                                if (!subordinate.isChecked() &&
+                                    if (!subordinate.isChecked() &&
                                         !mFile.isSharedWithMe()) {          // see (1)
+                                        toggleDisablingListener(subordinate);
+                                    }
+                                }
+                            } else {
+                                /// federated share -> enable delete subpermission, as server side; TODO why?
+                                //noinspection ConstantConditions, prevented in the method beginning
+                                subordinate = (CompoundButton) getView().findViewById(R.id.canEditDeleteCheckBox);
+                                if (!subordinate.isChecked()) {
                                     toggleDisablingListener(subordinate);
                                 }
+
                             }
                         } else {
                             for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
@@ -279,7 +288,8 @@ public class EditShareFragment extends Fragment {
                         }
                     }
 
-                    if(!(mFile.isFolder() && isChecked && mFile.isSharedWithMe())) {    // see (1)
+                    if(!(mFile.isFolder() && isChecked && mFile.isSharedWithMe())       // see (1)
+                        || isFederated ) {
                         updatePermissionsToShare();
                     }