Merge remote-tracking branch 'upstream/develop' into uploadNewFolder

Conflicts: src/com/owncloud/android/ui/activity/Uploader.java
2024-11-23 13:45:35 +03:00 · 2015-01-08 22:41:41 +01:00 · 2015-01-08 22:41:41 +01:00 · d54345d040
commit d54345d040
parent 6b742de58e 2fb89a9238
151 changed files with 3256 additions and 1002 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,6 +10,8 @@

 # generated files
 bin/
+build/
+*.iml
 gen/
 target/

@ -30,5 +32,11 @@ oc_framework/proguard-project.txt
 oc_framework-test-project/proguard-project.txt
 tests/proguard-project.txt

-# Should not be commited inside this repo:
-actionbarsherlock/
+# Android Studio and Gradle specific entries
+.gradle
+.idea
+*.iml
+build
+
+# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
+actionbarsherlock
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,5 @@
-[submodule "actionbarsherlock"]
-	path = actionbarsherlock
-	url = git://github.com/JakeWharton/ActionBarSherlock.git
+
 [submodule "owncloud-android-library"]
 	path = owncloud-android-library
 	url = git://github.com/owncloud/android-library.git
+	branch = develop
--- a/.travis.yml
+++ b/.travis.yml
@ -1,22 +1,14 @@
 language: android
 android:
  components:
+    - platform-tools
+    - tools
    - build-tools-20.0.0
    - android-19
-    - android-17
-    - android-14
-    - extra-android-support
-  licenses:
-    - 'android-sdk-license-5be876d5'
-    - 'android-sdk-license-598b93a6'
-  
-jdk: oraclejdk7
-
 before_install:
  - rm pom.xml
-  - ./setup_env.sh
-
 script:
+  - ./setup_env.sh ant
  - ant clean
  - ant debug

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -18,8 +18,8 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest package="com.owncloud.android"
-    android:versionCode="10600100"
-    android:versionName="1.6.1" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10600200"
+    android:versionName="1.6.2" xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@ -191,7 +191,11 @@
 			android:icon="@drawable/copy_link"/>

        <activity 
-			android:name=".ui.activity.MoveActivity"
+			android:name=".ui.activity.FolderPickerActivity"
+			android:label="@string/app_name"/>
+
+        <activity 
+			android:name=".ui.activity.UploadPathActivity"
 			android:label="@string/app_name"/>
        
    </application>
--- a/README.md
+++ b/README.md
@ -5,4 +5,4 @@ The app performs file synchronization with an ownCloud server. Other ownCloud fe
 Make sure you read [SETUP.md][1] when you start working on this project.

 [0]: https://github.com/owncloud/core
-[1]: https://raw.github.com/owncloud/android/master/SETUP.md
+[1]: https://github.com/owncloud/android/blob/master/SETUP.md
--- a/SETUP.md
+++ b/SETUP.md
@ -1,13 +1,11 @@
-  
+
 If you want to start help developing ownCloud please follow the [contribution guidelines][0] and observe these instructions.

 If you have any problems, start again with 1) and work your way down. If something still does not work as described here, please open a new issue describing exactly what you did, what happened, and what should have happened.
-  
-### 1) Fork and download android/develop repository:

-NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be installed.
-      You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.
-      "git" need to be installed and in your environment path variable.
+### 1. Fork and download android/develop repository:
+
+NOTE: You must have git in your environment path variable to perform the next operations.

 * Navigate to https://github.com/owncloud/android, click fork.
 * Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git"
@ -16,23 +14,28 @@ NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be inst
 * Pull changes from your develop branch: "git pull origin develop"
 * Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git"
 * Make sure to get the latest changes from official android/develop branch: "git pull upstream develop"
-* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .

-At this point you can continue using different tools to build the project. Sections 2a), 2b), and 2c) describe some of the existing alternatives.
+At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe some of the existing alternatives.
+
+### 2. Building with Ant:

-### 2a) Building with Ant:
-  
 NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.

-* Run "ant clean" .
+* Resolve necessary dependencies running:
+    - Windows: "setup_env.bat ant"
+    - Mac OS/Linux: "./setup_env.sh ant"
+* Run "ant clean".
 * Run "ant debug" to generate a debuggable version of the ownCloud app.

-### 2b) Building with console/maven:
+### 3. Building with console/maven:

 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, install owncloud-android-library, then build ownCloud with mvn:
+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
@ -41,43 +44,65 @@ Download/install Android plugin for Maven, install owncloud-android-library, the
 * mvn install
 * cd ..

-Now you can create ownCloud APK using "mvn package"
+Now you can create ownCloud APK using "mvn package" and find it as ownCloud.apk under the target

-### 2c) Building with Eclipse:
+### 4. Building with Gradle:
+
+* Complete the setup of project properties running:
+    - Windows: "setup_env.bat gradle"
+    - Mac OS/Linux: "./setup_env.sh gradle"
+* Open a terminal and go to the "android" directory that contains the repository.
+* Run the 'clean' and 'build' tasks using the Gradle wrapper provided:
+    - Windows: gradlew.bat clean build
+    - Mac OS/Linux: ./gradlew clean build
+* You can find the generated apk file in android/build/outputs/apk
+
+### 5. Building with Eclipse:

 NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.

-* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .
-* Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root.
+* Resolve necessary dependencies running:
+    - Windows: "setup_env.bat ant"
+    - Mac OS/Linux: "./setup_env.sh ant"
+    * Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root.
 * Clean project and compile.
-* If any error appear, check the project properties; in the 'Android' section, API Level should be greater or equal than 14.
-* If "error loading libz.so.1" appears, try "sudo apt-get install lib32z1"
+* If any error appears, check the project properties; in the 'Android' section, API Level should be greater or equal than 14.
 * Make sure android/actionbarsherlock/library/bin/library.jar was created.
-* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. (test and sample clients are not required.)
+* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root.
 * Clean project and compile.
-* If any error appear, check the project properties; in the 'Android' section, API Level should be 19 or greater.
-* Make sure 'android/owncloud-android-library/bin/owncloud android library.jar' was created.
+* If any error appears, check the project properties; in the 'Android' section, API Level should be 19 or greater.
+* Make sure android/owncloud-android-library/bin/classes.jar was created.
 * Import ownCloud Android project.
 * Clean project and compile.
 * If any error appears, check the project properties of owncloud-android project; in the 'Android' section:
-  - API Level should be 19 or greater.
-  - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. 
+    - API Level should be 19 or greater.
+    - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed.
 * After those actions you should be good to go. HAVE FUN!

 NOTE: Even though API level is set to 19, APK also runs on older devices because in AndroidManifest.xml minSdkVersion is set to 8.

-### 3) Create pull request:
-  
+### 6. Building with Android Studio:
+
+* Complete the setup of project properties running:
+    - Windows: "setup_env.bat gradle"
+    - Mac OS/Linux: "./setup_env.sh gradle"
+* The first time you want to open the project in Android Studio, select 'Import Project...' and choose the file "android/settings.gradle".
+  Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select
+  'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project.
+* To build the project, follow the guidelines shown on [4. Building with Gradle][2].
+
+### 7. Create pull request:
+
 NOTE: You must sign the [Contributor Agreement][1] before your changes can be accepted!

 * Commit your changes locally: "git commit -a"
-* Push your changes to your Github repo: "git push"
+* Push your changes to your GitHub repo: "git push"
 * Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
 * Click "Edit" and set "base:develop"
 * Again, click "Edit" and set "compare:develop"
 * Enter description and send pull request.

-### 4) Create another pull request:
+### 8. Create another pull request:

 To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/develop.

@ -85,8 +110,9 @@ To make sure your new pull request does not contain commits which are already co
 * git checkout -b my_new_develop_branch upstream/develop
 * If you want to rename that branch later: "git checkout -b my_new_develop_branch_with_new_name"
 * Push branch to server: "git push -u origin name_of_local_develop_branch"
-* Use Github to issue PR
+* Use GitHub to issue PR


 [0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
 [1]: http://owncloud.org/about/contributor-agreement/
+[2]: https://github.com/owncloud/android/blob/master/SETUP.md#4-building-with-gradle
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc
--- a/build.gradle
+++ b/build.gradle
@ -0,0 +1,78 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.14.0'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+
+repositories {
+    mavenCentral()
+
+    flatDir {
+        dirs 'libs'
+    }
+}
+
+artifacts.add("default", file('libs/actionbarsherlock.aar'))
+
+dependencies {
+    compile name: 'touch-image-view'
+    compile 'com.android.support:support-v4:19.1.0'
+    compile project('libs/actionbarsherlock_lib')
+    compile project(':owncloud-android-library')
+    compile 'com.jakewharton:disklrucache:2.0.2'
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "20.0.0"
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['res']
+        }
+
+        // Move the tests to tests/java, tests/res, etc...
+        instrumentTest.setRoot('tests')
+
+        // Move the build types to build-types/<type>
+        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+        // This moves them out of them default location under src/<type>/... which would
+        // conflict with src/ being used by the main source set.
+        // Adding new build types or product flavors should be accompanied
+        // by a similar customization.
+        debug.setRoot('build-types/debug')
+        release.setRoot('build-types/release')
+    }
+
+    android {
+        lintOptions {
+            abortOnError false
+        }
+    }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    
+    productFlavors {
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+    }
+}
+
+
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Wed Oct 15 10:45:44 CEST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
--- a/164
+++ b/164
@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/libs/actionbarsherlock_lib/build.gradle
+++ b/libs/actionbarsherlock_lib/build.gradle
@ -0,0 +1,2 @@
+configurations.create("default")
+artifacts.add("default", file('library-4.1.0.aar'))
--- a/libs/actionbarsherlock_lib/library-4.1.0.aar
+++ b/libs/actionbarsherlock_lib/library-4.1.0.aar
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/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="0100019"
-    android:versionName="1.0.19" >
+    android:versionCode="0100020"
+    android:versionName="1.0.20" >

    <uses-sdk
        android:minSdkVersion="16"
--- a/oc_jb_workaround/build.gradle
+++ b/oc_jb_workaround/build.gradle
@ -0,0 +1,42 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.13.0'
+    }
+}
+apply plugin: 'com.android.library'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "20.0.0"
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        // Move the tests to tests/java, tests/res, etc...
+        instrumentTest.setRoot('tests')
+
+        // Move the build types to build-types/<type>
+        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+        // This moves them out of them default location under src/<type>/... which would
+        // conflict with src/ being used by the main source set.
+        // Adding new build types or product flavors should be accompanied
+        // by a similar customization.
+        debug.setRoot('build-types/debug')
+        release.setRoot('build-types/release')
+    }
+}
--- a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar
+++ b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar
--- a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties
+++ b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
--- a/oc_jb_workaround/gradlew
+++ b/oc_jb_workaround/gradlew
@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/oc_jb_workaround/gradlew.bat
+++ b/oc_jb_workaround/gradlew.bat
@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/oc_jb_workaround/project.properties
+++ b/oc_jb_workaround/project.properties
@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

 # Project target.
-target=android-17
+target=android-19
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4f315c7e06f6eef48df246be0ee9252fdfccdf00
+Subproject commit 8261865ff24c1bfc05be19ae9364a66dac8f26c3
--- a/pom.xml
+++ b/pom.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>
@ -13,7 +14,7 @@
        <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_r3</google.android-version>
+        <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>
@ -26,8 +27,17 @@
        <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>
@ -44,6 +54,13 @@
            <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>
@ -51,7 +68,15 @@
            <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>
@ -59,26 +84,19 @@
            <scope>provided</scope>
        </dependency>

-        <dependency>
-            <groupId>com.actionbarsherlock</groupId>
-            <artifactId>actionbarsherlock</artifactId>
-            <version>${actionbarsherlock-version}</version>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>android.support</groupId>-->
+            <!--<artifactId>compatibility-v4</artifactId>-->
+            <!--<version>19.1.0</version>-->
+        <!--</dependency>-->

-        <dependency>
-            <groupId>com.actionbarsherlock</groupId>
-            <artifactId>actionbarsherlock</artifactId>
-            <version>${actionbarsherlock-version}</version>
-            <type>apklib</type>
-        </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>
+            <groupId>com.owncloud.android</groupId>
+            <artifactId>owncloud-android-library</artifactId>
+            <version>${owncloud.version}</version>
+        </dependency>

    </dependencies>

@ -92,7 +110,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.1</version>
                <configuration>
                    <source>${java-version}</source>
                    <target>${java-version}</target>
@ -102,7 +120,7 @@
            <plugin>
                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                <artifactId>android-maven-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.2</version>
                <configuration>
                    <sdk>
                        <path>${env.ANDROID_HOME}</path>
--- a/res/layout/files_folder_picker.xml
+++ b/res/layout/files_folder_picker.xml
@ -18,18 +18,18 @@
        android:orientation="horizontal" >

        <Button
-            android:id="@+id/move_files_btn_cancel"
+            android:id="@+id/folder_picker_btn_cancel"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:text="@string/common_cancel" />

 		<Button
-		    android:id="@+id/move_files_btn_choose"
+		    android:id="@+id/folder_picker_btn_choose"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="1"
-		    android:text="@string/move_choose_button_text" />
+		    android:text="@string/folder_picker_choose_button_text" />

 	</LinearLayout>

--- a/res/layout/list_footer.xml
+++ b/res/layout/list_footer.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="56dp"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:showDividers="none" >
+
+    <TextView
+        android:id="@+id/footerText"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textColor="@color/setup_text_hint" />
+
+</LinearLayout> 
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@ -25,16 +25,18 @@
    <android.support.v4.widget.SwipeRefreshLayout
        android:id="@+id/swipe_refresh_files"
        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
+        android:layout_height="match_parent" 
+        android:layout_weight="1"
+        android:footerDividersEnabled="false" > 
+        
        <com.owncloud.android.ui.ExtendedListView
            android:id="@+id/list_root"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
-        
+            
    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <android.support.v4.widget.SwipeRefreshLayout
+    	
+    	<android.support.v4.widget.SwipeRefreshLayout
        android:id="@+id/swipe_refresh_files_emptyView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@ -32,16 +32,16 @@

        <ImageView
            android:id="@+id/imageView2"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
            android:layout_gravity="center_vertical"
            android:layout_marginLeft="22dp"
            android:src="@drawable/local_file_indicator" />

        <ImageView
            android:id="@+id/imageView1"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
            android:layout_gravity="center_vertical"
            android:layout_marginLeft="9dp"
            android:src="@drawable/ic_menu_archive" />
--- a/res/layout/preference_widget_radiobutton.xml
+++ b/res/layout/preference_widget_radiobutton.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
+inside android.R.layout.preference. -->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+android:id/checkbox"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:layout_gravity="center"
+android:focusable="false"
+android:clickable="false" />
--- a/res/layout/video_layout.xml
+++ b/res/layout/video_layout.xml
@ -3,9 +3,10 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent" >

-	<VideoView  android:id="@+id/videoPlayer"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"  
-				android:layout_gravity="center" />
+	<VideoView
+	    android:id="@+id/videoPlayer"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:layout_gravity="center" />
 	
 </FrameLayout>
--- a/res/menu/file_select_all.xml
+++ b/res/menu/file_select_all.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:id="@+id/actionbar_select_all"
-        android:icon="@android:drawable/checkbox_off_background"
-        android:orderInCategory="1"
-        android:showAsAction="always"
-        android:title="actionbar_select_all"/>
-    
-
-</menu>
--- a/res/values-af-rZA/strings.xml
+++ b/res/values-af-rZA/strings.xml
@ -6,8 +6,12 @@
  <string name="prefs_help">Hulp</string>
  <string name="auth_username">Gebruikersnaam</string>
  <string name="auth_password">Wagwoord</string>
+  <string name="file_list_seconds_ago">sekondes gelede</string>
+  <string name="common_yes">Ja</string>
+  <string name="common_no">Nee</string>
  <string name="common_ok">OK</string>
  <string name="common_cancel">Kanseleer</string>
+  <string name="common_error">Fout</string>
  <string name="empty"></string>
-  <string name="move_choose_button_text">Kies</string>
+  <string name="folder_picker_choose_button_text">Kies</string>
 </resources>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@ -50,8 +50,13 @@
  <string name="uploader_wrn_no_content_text">لم يتم استلام أي محتوى. لا شيء للرفع.</string>
  <string name="uploader_error_forbidden_content">%1$s  غير مسموح له بالوصول للمحتوى المشارك</string>
  <string name="uploader_info_uploading">يتم الرفع</string>
+  <string name="file_list_seconds_ago">منذ ثواني</string>
  <string name="file_list_empty">لا يوجد شيء هنا. إرفع بعض الملفات!</string>
  <string name="file_list_loading">جاري التحميل ...</string>
+  <string name="file_list_folder">مجلد</string>
+  <string name="file_list_folders">مجلدات</string>
+  <string name="file_list_file">ملف</string>
+  <string name="file_list_files">ملفات</string>
  <string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
  <string name="filedetails_size">الحجم :</string>
  <string name="filedetails_type">النوع :</string>
@ -251,6 +256,7 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">حسابات</string>
  <string name="saml_authentication_wrong_pass">كلمة مرور خاطئة</string>
-  <string name="move_choose_button_text">اختيار</string>
+  <string name="folder_picker_choose_button_text">اختيار</string>
  <string name="prefs_category_security">الأمان</string>
+  <string name="shared_subject_header">مُشارك</string>
 </resources>
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@ -220,4 +220,5 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş
  <string name="prefs_category_accounts">Hesablar</string>
  <string name="prefs_add_account">Hesab əlavə et</string>
  <string name="saml_authentication_wrong_pass">Yalnış şifrə</string>
+  <string name="shared_subject_header">yayımlanmış</string>
 </resources>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@ -3,10 +3,11 @@
  <string name="actionbar_settings">Налады</string>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
+  <string name="file_list_seconds_ago">Секунд таму</string>
  <string name="common_yes">Так</string>
  <string name="common_no">Не</string>
  <string name="common_ok">Добра</string>
  <string name="common_error">Памылка</string>
  <string name="empty"></string>
-  <string name="move_choose_button_text">Выбар</string>
+  <string name="folder_picker_choose_button_text">Выбар</string>
 </resources>
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Препоръчай на приятел</string>
  <string name="prefs_feedback">Обратна Връзка</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Запомни мястото за споделяне</string>
+  <string name="prefs_remember_last_upload_location_summary">Запомни мястото на последната споделена папка</string>
  <string name="recommend_subject">Опитай %1$s на смартфона си!</string>
  <string name="recommend_text">Бих желал да те поканя да ползваш %1$s на своя смартфон!\nИзтеглия я от тук:%2$s</string>
  <string name="auth_check_server">Проверка на сървъра</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Не беше получено съдържание. Няма какво да се качи.</string>
  <string name="uploader_error_forbidden_content">%1$s няма разрешен достъп до споделеното съдържание.</string>
  <string name="uploader_info_uploading">Качване</string>
+  <string name="file_list_seconds_ago">преди секунди</string>
  <string name="file_list_empty">Тук няма нищо. Качете нещо!</string>
  <string name="file_list_loading">Зареждане...</string>
  <string name="local_file_list_empty">Няма файлове в тази папка.</string>
+  <string name="file_list_folder">папка</string>
+  <string name="file_list_folders">папки</string>
+  <string name="file_list_file">файл</string>
+  <string name="file_list_files">файл</string>
  <string name="filedetails_select_file">Натисни върху файл, за да видиш допълнителна информация.</string>
  <string name="filedetails_size">Размер:</string>
  <string name="filedetails_type">Тип:</string>
@ -275,13 +282,11 @@
  <string name="auth_redirect_non_secure_connection_title">Сигурна връзка е пренасочена по несигурен път.</string>
  <string name="actionbar_logger">Доклади</string>
  <string name="log_send_history_button">Изпрати История</string>
-  <string name="log_mail_subject">ownCloud 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>
  <string name="file_list_empty_moving">Тук няма нищо. Можеш да добавиш папка!</string>
-  <string name="move_choose_button_text">Избери</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>
@ -289,4 +294,5 @@
  <string name="forbidden_permissions_move">за да преместиш този файл</string>
  <string name="prefs_category_instant_uploading">Незабавно качване</string>
  <string name="prefs_category_security">Сигурност</string>
+  <string name="shared_subject_header">споделен</string>
 </resources>
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@ -50,6 +50,7 @@
  <string name="uploader_wrn_no_content_text">কোন কনটেনট আসেনি৷ আপলোডের কনটেনট নেই</string>
  <string name="uploader_error_forbidden_content">এই যৌথ কনটেন্ট এ %1$s এর প্রবেশ অনুমোদিত নয়</string>
  <string name="uploader_info_uploading">আপলোড করা হচ্ছে</string>
+  <string name="file_list_seconds_ago">সেকেন্ড পূর্বে</string>
  <string name="file_list_empty">এখানে কিছুই নেই। কিছু আপলোড করুন !</string>
  <string name="file_list_loading">লোড হচ্ছে....</string>
  <string name="local_file_list_empty">এই ফোলডারে কোন ফাইল নেই</string>
@ -264,7 +265,8 @@
  <string name="saml_authentication_wrong_pass">ভুল কুটশব্দ</string>
  <string name="actionbar_move">সরাও</string>
  <string name="file_list_empty_moving">এখানে কিছু নেই। একটি ফোল্ডার যোগ করতে পারেন!</string>
-  <string name="move_choose_button_text">বেছে নিন</string>
+  <string name="folder_picker_choose_button_text">বেছে নিন</string>
  <string name="move_file_not_found">সরাতে ব্যার্থ হলো। ফাইলটি রয়েছে কিনা দেখুন।</string>
  <string name="prefs_category_security">নিরাপত্তা</string>
+  <string name="shared_subject_header">ভাগাভাগিকৃত</string>
 </resources>
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@ -1,7 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="actionbar_upload">Učitaj</string>
+  <string name="actionbar_upload_files">Datoteke</string>
  <string name="actionbar_mkdir">Nova fascikla</string>
+  <string name="actionbar_settings">Postavke</string>
+  <string name="actionbar_send_file">Pošalji</string>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
+  <string name="prefs_category_more">Više</string>
+  <string name="prefs_help">Pomoć</string>
+  <string name="auth_username">Korisničko ime</string>
+  <string name="auth_password">Lozinka</string>
+  <string name="sync_string_files">Datoteke</string>
+  <string name="uploader_btn_upload_text">Učitaj</string>
+  <string name="filedetails_download">Preuzmite</string>
+  <string name="action_share_file">Podijelite vezu</string>
+  <string name="common_yes">Da</string>
+  <string name="common_no">Ne</string>
+  <string name="common_ok">Ok</string>
+  <string name="common_cancel_upload">Prekini učitavanje</string>
+  <string name="common_cancel">Odustani</string>
+  <string name="common_error">Greška</string>
+  <string name="common_error_unknown">Nepoznata greška</string>
+  <string name="change_password">Promijeni lozinku</string>
+  <string name="create_account">Kreiraj račun</string>
+  <string name="common_rename">Preimenuj</string>
+  <string name="activity_chooser_send_file_title">Pošalji</string>
  <string name="empty"></string>
+  <string name="saml_authentication_required_text">Potrebna autentifikacija</string>
+  <string name="saml_authentication_wrong_pass">Pogrešna lozinka</string>
+  <string name="folder_picker_choose_button_text">Izaberite</string>
+  <string name="prefs_category_security">Sigurnost</string>
 </resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@ -50,9 +50,14 @@
  <string name="uploader_wrn_no_content_text">No s\'ha rebut cap contingut. Res per pujar</string>
  <string name="uploader_error_forbidden_content">%1$s no pot accedir al contingut compartit</string>
  <string name="uploader_info_uploading">S\'està pujant</string>
+  <string name="file_list_seconds_ago">segons enrere</string>
  <string name="file_list_empty">Res per aquí. Pugeu alguna cosa!</string>
  <string name="file_list_loading">Carregant...</string>
  <string name="local_file_list_empty">No hi ha arxius a aquesta carpeta</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetes</string>
+  <string name="file_list_file">fitxer</string>
+  <string name="file_list_files">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>
@ -261,6 +266,7 @@
  <string name="prefs_add_account">Afegeix compte</string>
  <string name="saml_authentication_required_text">Es requereix autenticació</string>
  <string name="saml_authentication_wrong_pass">Contrasenya incorrecta</string>
-  <string name="move_choose_button_text">Escull</string>
+  <string name="folder_picker_choose_button_text">Escull</string>
  <string name="prefs_category_security">Seguretat</string>
+  <string name="shared_subject_header">compartit</string>
 </resources>
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Doporučit přátelům</string>
  <string name="prefs_feedback">Odezva</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Zapamatovat umístění sdílení</string>
+  <string name="prefs_remember_last_upload_location_summary">Zapamatovat poslední umístění pro nahrání sdílených souborů</string>
  <string name="recommend_subject">Zkuste %1$s na vašem smartphonu!</string>
  <string name="recommend_text">Chtěl bych vás pozvat k používání %1$s na vašem chytrém telefonu!\nKe stažení zde: %2$s</string>
  <string name="auth_check_server">Zkontrolovat server</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Neobdržen žádný obsah. Nic k odeslání.</string>
  <string name="uploader_error_forbidden_content">%1$s nemá právo přistupovat ke sdílenému obsahu</string>
  <string name="uploader_info_uploading">Odesílání</string>
+  <string name="file_list_seconds_ago">před pár sekundami</string>
  <string name="file_list_empty">Žádný obsah. Nahrajte něco!</string>
  <string name="file_list_loading">Načítám...</string>
  <string name="local_file_list_empty">V tomto adresáři nejsou žádné soubory.</string>
+  <string name="file_list_folder">adresář</string>
+  <string name="file_list_folders">adresáře</string>
+  <string name="file_list_file">soubor</string>
+  <string name="file_list_files">soubory</string>
  <string name="filedetails_select_file">Více informací získáte klepnutím na soubor.</string>
  <string name="filedetails_size">Velikost:</string>
  <string name="filedetails_type">Typ:</string>
@ -177,7 +184,7 @@
  <string name="auth_connecting_auth_server">Připojuji se k přihlašovacímu serveru...</string>
  <string name="auth_unsupported_auth_method">Server nepodporuje tuto přihlašovací metodu</string>
  <string name="auth_unsupported_multiaccount">%1$s nepodporuje více účtů</string>
-  <string name="auth_fail_get_user_name">Váš server nevrací správné přihlašovací ID, kontaktujte vašeho administrátora</string>
+  <string name="auth_fail_get_user_name">Váš server nevrací správné přihlašovací ID, kontaktujte prosím svého správce systému</string>
  <string name="auth_can_not_auth_against_server">Není možné provést ověření  </string>
  <string name="fd_keep_in_sync">Udržovat soubor aktuální</string>
  <string name="common_rename">Přejmenovat</string>
@ -247,7 +254,7 @@
  <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
  <string name="prefs_instant_upload_path_title">Cesta pro nahrání</string>
  <string name="share_link_no_support_share_api">Je nám líto, ale sdílení není na vašem serveru povoleno. Kontaktujte svého
-administrátora.</string>
+správce systému.</string>
  <string name="share_link_file_no_exist">Nelze sdílet. Zkontrolujte prosím že soubor existuje</string>
  <string name="share_link_file_error">Při pokusu o sdílení tohoto souboru či složky nastala chyba</string>
  <string name="unshare_link_file_no_exist">Nelze ukončit sdílení. Zkontrolujte prosím že soubor existuje</string>
@ -274,13 +281,14 @@ administrátora.</string>
  <string name="auth_redirect_non_secure_connection_title">Bezpečné spojení je přesměrováno na nezabezpečenou trasu.</string>
  <string name="actionbar_logger">Logy</string>
  <string name="log_send_history_button">Odeslat historii</string>
-  <string name="log_mail_subject">Logy aplikace ownCloud pro Android</string>
-  <string name="log_progress_dialog_text">Načítám data...</string>
+  <string name="log_send_no_mail_app">Nebyla nalezena žádná aplikace pro zasílání logů. Nainstalujte poštovní aplikaci!</string>
+  <string name="log_send_mail_subject">%1$s logy aplikace pro Android</string>
+  <string name="log_progress_dialog_text">Načítání dat…</string>
  <string name="saml_authentication_required_text">Vyžadováno přihlášení</string>
  <string name="saml_authentication_wrong_pass">Nesprávné heslo</string>
  <string name="actionbar_move">Přesunout</string>
  <string name="file_list_empty_moving">Zde nic není. Můžete přidat adresář!</string>
-  <string name="move_choose_button_text">Vybrat</string>
+  <string name="folder_picker_choose_button_text">Vybrat</string>
  <string name="move_file_not_found">Nelze přesunout. Zkontrolujte prosím že soubor existuje</string>
  <string name="move_file_invalid_into_descendent">Není možné adresář přesunout do vlastního podadresáře</string>
  <string name="move_file_invalid_overwrite">Soubor již v cílovém adresáři existuje</string>
@ -288,4 +296,8 @@ administrátora.</string>
  <string name="forbidden_permissions_move">pro přesun tohoto souboru</string>
  <string name="prefs_category_instant_uploading">Okamžitá odesílání</string>
  <string name="prefs_category_security">Zabezpečení</string>
+  <string name="prefs_instant_video_upload_path_title">Cesta pro nahrávání videí</string>
+  <string name="shared_subject_header">sdílené</string>
+  <string name="with_you_subject_header">s vámi</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-cy-rGB/strings.xml
+++ b/res/values-cy-rGB/strings.xml
@ -27,6 +27,7 @@
  <string name="uploader_wrn_no_content_text">Heb dderbyn cynnwys. Dim cynnwys i lwytho i fyny</string>
  <string name="uploader_error_forbidden_content">Does dim mynediad gan %1$s i gynnwys a rennir</string>
  <string name="uploader_info_uploading">Yn llwytho i fyny</string>
+  <string name="file_list_seconds_ago">eiliad yn ôl</string>
  <string name="file_list_empty">Does dim byd fan hyn. Llwythwch rhywbeth i fyny!</string>
  <string name="filedetails_select_file">Tapiwch ffeil i ddangos gwybodaeth ychwanegol</string>
  <string name="filedetails_size">Maint:</string>
@ -143,5 +144,5 @@
  <string name="activity_chooser_send_file_title">Anfon</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Cyfrifon</string>
-  <string name="move_choose_button_text">Dewisiwch</string>
+  <string name="folder_picker_choose_button_text">Dewisiwch</string>
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Anbefal til en ven</string>
  <string name="prefs_feedback">Feedback</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Husk delt placering</string>
+  <string name="prefs_remember_last_upload_location_summary">Husk seneste delte placering for overførsel</string>
  <string name="recommend_subject">Prøv %1$s på din smartphone!</string>
  <string name="recommend_text">Jeg ønsker at invitere dig til at bruge %1$s på din smartphone!\nHent den her: %2$s</string>
  <string name="auth_check_server">Tjek server</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Intet indhold blev modtaget. Intet at uploade.</string>
  <string name="uploader_error_forbidden_content">%1$s er ikke tilladt adgang til delt indhold</string>
  <string name="uploader_info_uploading">Uploader</string>
+  <string name="file_list_seconds_ago">sekunder siden</string>
  <string name="file_list_empty">Her er tomt. Upload noget!</string>
  <string name="file_list_loading">Indlæser...</string>
  <string name="local_file_list_empty">Der er ingen filer i denne mappe.</string>
+  <string name="file_list_folder">mappe</string>
+  <string name="file_list_folders">mapper</string>
+  <string name="file_list_file">fil</string>
+  <string name="file_list_files">filer</string>
  <string name="filedetails_select_file">Tryk på en fil for at vise yderligere information.</string>
  <string name="filedetails_size">Størelse:</string>
  <string name="filedetails_type">Type:</string>
@ -273,13 +280,14 @@
  <string name="auth_redirect_non_secure_connection_title">Sikker forbindelse videredirigeres til en usikker rute.</string>
  <string name="actionbar_logger">Logge</string>
  <string name="log_send_history_button">Send historik</string>
-  <string name="log_mail_subject">App-logregistreringer for ownCloud Android</string>
-  <string name="log_progress_dialog_text">Indlæser data...</string>
+  <string name="log_send_no_mail_app">Der blev ikke fundet apps, der kan sende logge. Installér mail-app\'en!</string>
+  <string name="log_send_mail_subject">%1$s Android-app - logge</string>
+  <string name="log_progress_dialog_text">Indlæser data ...</string>
  <string name="saml_authentication_required_text">Godkendelse påkrævet</string>
  <string name="saml_authentication_wrong_pass">Forkert kodeord</string>
  <string name="actionbar_move">Flyt</string>
  <string name="file_list_empty_moving">Der er intet her. Du kan tilføje en mappe!</string>
-  <string name="move_choose_button_text">Vælg</string>
+  <string name="folder_picker_choose_button_text">Vælg</string>
  <string name="move_file_not_found">Kan ikke flytte. Tjek venligst om filen findes</string>
  <string name="move_file_invalid_into_descendent">Det er ikke muligt at flytte en mappe til en undermappe</string>
  <string name="move_file_invalid_overwrite">Filen findes allerede i destinationsmappen</string>
@ -287,4 +295,8 @@
  <string name="forbidden_permissions_move">til at flytte denne fil</string>
  <string name="prefs_category_instant_uploading">Øjeblikkelige uploads</string>
  <string name="prefs_category_security">Sikkerhed</string>
+  <string name="prefs_instant_video_upload_path_title">Sti til videoupload</string>
+  <string name="shared_subject_header">delt</string>
+  <string name="with_you_subject_header">med dig</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@ -25,21 +25,23 @@
  <string name="prefs_manage_accounts">Konten verwalten</string>
  <string name="prefs_pincode">App-PIN</string>
  <string name="prefs_pincode_summary">Schützen Sie Ihren Client</string>
-  <string name="prefs_instant_upload">Sofortiges Bilderhochladen</string>
+  <string name="prefs_instant_upload">Sofortiger Bilderupload</string>
  <string name="prefs_instant_upload_summary">Fotos von der Kamera sofort hochladen</string>
-  <string name="prefs_instant_video_upload">Sofortiges Videohochladen</string>
+  <string name="prefs_instant_video_upload">Sofortiger Videoupload</string>
  <string name="prefs_instant_video_upload_summary">Videos von der Kamera sofort hochladen</string>
  <string name="prefs_log_title">Protokollierung aktivieren</string>
-  <string name="prefs_log_summary">Dieses wird zur Protokollierung von Problemen benutzt</string>
-  <string name="prefs_log_title_history">Protokollierungsverlauf</string>
-  <string name="prefs_log_summary_history">Dieses zeigt die gespeicherten Protokollierungen</string>
+  <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen benutzt</string>
+  <string name="prefs_log_title_history">Protokollverlauf</string>
+  <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokolle</string>
  <string name="prefs_log_delete_history_button">Verlauf löschen</string>
  <string name="prefs_help">Hilfe</string>
-  <string name="prefs_recommend">Dieses einem Freund empfehlen</string>
+  <string name="prefs_recommend">Dies einem Freund empfehlen</string>
  <string name="prefs_feedback">Rückmeldungen</string>
  <string name="prefs_imprint">Impressum</string>
+  <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
+  <string name="prefs_remember_last_upload_location_summary">Geteilten Upload-Speicherort merken</string>
  <string name="recommend_subject">%1$s auf Ihrem Smartphone ausprobieren!</string>
-  <string name="recommend_text">Ich möchte Sie zum Benutzen von %1$s auf Ihrem Smartphone einladen!\nHier herunterladen: %2$s</string>
+  <string name="recommend_text">Ich möchte Sie einladen, %1$s auf Ihrem Smartphone zu verwenden!\nHier herunterladen: %2$s</string>
  <string name="auth_check_server">Server überprüfen</string>
  <string name="auth_host_url">Server-Adresse https://…</string>
  <string name="auth_username">Benutzername</string>
@ -48,7 +50,7 @@
  <string name="sync_string_files">Dateien</string>
  <string name="setup_btn_connect">Verbinden</string>
  <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_top_message">Zielordner auswählen:</string>
+  <string name="uploader_top_message">Uploadordner auswählen:</string>
  <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
  <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Konten auf Ihrem Gerät eingerichtet. Bitte richten Sie zuerst ein Konto ein.</string>
  <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
  <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
  <string name="uploader_info_uploading">Lade hoch</string>
+  <string name="file_list_seconds_ago">Gerade eben</string>
  <string name="file_list_empty">Alles leer. Laden Sie etwas hoch!</string>
  <string name="file_list_loading">Ladevorgang …</string>
  <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
+  <string name="file_list_folder">Ordner</string>
+  <string name="file_list_folders">Ordner</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
  <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
  <string name="filedetails_size">Größe:</string>
  <string name="filedetails_type">Art:</string>
@ -92,7 +99,7 @@
  <string name="uploader_upload_succeeded_content_single">%1$s wurde(n) erfolgreich hochgeladen</string>
  <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
  <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
-  <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, Sie müssen sich nochmals anmelden</string>
+  <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, Sie müssen sich neu anmelden</string>
  <string name="downloader_download_in_progress_ticker">Herunterladen...</string>
  <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
  <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
@ -100,7 +107,7 @@
  <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
  <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
  <string name="downloader_not_downloaded_yet">Noch nicht heruntergeladen</string>
-  <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, Sie müssen sich nochmals anmelden</string>
+  <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, Sie müssen sich neu anmelden</string>
  <string name="common_choose_account">Konto auswählen</string>
  <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
  <string name="sync_fail_ticker_unauthorized">Synchronisation fehlgeschlagen, Sie müssen sich neu anmelden</string>
@ -119,7 +126,7 @@
  <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
  <string name="foreign_files_local_text">Lokal: %1$s</string>
  <string name="foreign_files_remote_text">Remote: %1$s</string>
-  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie diese stattdessen verschieben?</string>
+  <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung um die ausgewählten Dateien in den Ordner %1$s zu kopieren. Möchten Sie diese stattdessen verschieben?</string>
  <string name="pincode_enter_pin_code">Bitte geben Sie Ihre App-PIN ein</string>
  <string name="pincode_configure_your_pin">Bitte geben Sie Ihre App-PIN ein</string>
  <string name="pincode_configure_your_pin_explanation">PIN-Abfrage erfolgt nach Starten der App.</string>
@ -174,9 +181,9 @@
  <string name="auth_expired_oauth_token_toast">Ihre Legitimierung ist abgelaufen. Bitte Legitimierung nochmals durchführen</string>
  <string name="auth_expired_basic_auth_toast">Bitte geben Sie Ihr aktuelles Passwort ein</string>
  <string name="auth_expired_saml_sso_token_toast">Ihre Sitzung ist abgelaufen. Bitte Anmeldung nochmals durchführen</string>
-  <string name="auth_connecting_auth_server">Zum Legitimierungsserver wird verbunden …</string>
+  <string name="auth_connecting_auth_server">Zum Legitimierungsserver verbinden…</string>
  <string name="auth_unsupported_auth_method">Der Server unterstützt diese Legitimierungsmethode nicht</string>
-  <string name="auth_unsupported_multiaccount">%1$s unterstützt nicht mehrere Benutzerkonten</string>
+  <string name="auth_unsupported_multiaccount">%1$s unterstützt mehrere Benutzerkonten nicht</string>
  <string name="auth_fail_get_user_name">Ihr Server gibt keine richtige Benutzerkennung zurück, bitte kontaktieren Sie einen Administrator
 ⇥</string>
  <string name="auth_can_not_auth_against_server">Die Legitimierung gegenüber dem Server konnte nicht durchgeführt werden</string>
@ -246,20 +253,20 @@
  <string name="preview_image_description">Bildvorschau</string>
  <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
  <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
-  <string name="prefs_instant_upload_path_title">Pfad hochladen</string>
+  <string name="prefs_instant_upload_path_title">Upload Pfad</string>
  <string name="share_link_no_support_share_api">Entschuldigung, Freigaben sind auf Ihrem Server nicht aktiviert. Bitte kontaktieren Sie Ihren
 ⇥⇥Administrator.</string>
-  <string name="share_link_file_no_exist">Teilen nicht möglich. Prüfen Sie, dass die Datei existiert</string>
+  <string name="share_link_file_no_exist">Teilen nicht möglich. Prüfen Sie, ob die Datei existiert</string>
  <string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
-  <string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfen Sie, dass die Datei existiert</string>
+  <string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfen Sie, ob die Datei existiert</string>
  <string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
  <string name="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="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>
-  <string name="network_error_connect_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann 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>
+  <string name="network_error_connect_timeout_exception">Es ist ein Fehler während des Wartens auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
  <string name="network_host_not_available">Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar</string>
  <string name="empty"></string>
  <string name="forbidden_permissions">Sie haben keine Berechtigung %s</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird auf eine unsichere Route weitergeleitet.</string>
  <string name="actionbar_logger">Protokolle</string>
  <string name="log_send_history_button">Verlauf senden</string>
-  <string name="log_mail_subject">Protokolle der ownCloud-Android-App</string>
-  <string name="log_progress_dialog_text">Daten werden geladen …</string>
+  <string name="log_send_no_mail_app">Keine App zum Versenden der Meldungen gefunden. Bitte installieren Sie die Mail-App!</string>
+  <string name="log_send_mail_subject">%1$s Android-App Meldungen</string>
+  <string name="log_progress_dialog_text">Lade Daten…</string>
  <string name="saml_authentication_required_text">Legitimierung benötigt</string>
  <string name="saml_authentication_wrong_pass">Falsches Passwort</string>
  <string name="actionbar_move">Verschieben</string>
  <string name="file_list_empty_moving">Nichts vorhanden. Sie können einen Ordner hinzufügen!</string>
-  <string name="move_choose_button_text">Auswählen</string>
+  <string name="folder_picker_choose_button_text">Auswählen</string>
  <string name="move_file_not_found">Verschieben nicht möglich. Bitte überprüfen Sie, ob die Datei existiert</string>
  <string name="move_file_invalid_into_descendent">Es ist nicht möglich einen Ordner eine Ebene tiefer zu verschieben</string>
  <string name="move_file_invalid_overwrite">Die Datei ist bereits im Zielordner vorhanden</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">um diese Datei zu verschieben</string>
  <string name="prefs_category_instant_uploading">Sofortiges Hochladen</string>
  <string name="prefs_category_security">Sicherheit</string>
+  <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
+  <string name="shared_subject_header">geteilt</string>
+  <string name="with_you_subject_header">Mit Ihnen</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Empfehle dies einem Freund</string>
  <string name="prefs_feedback">Rückmeldungen</string>
  <string name="prefs_imprint">Impressum</string>
+  <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
+  <string name="prefs_remember_last_upload_location_summary">Geteilten Upload-Speicherort merken</string>
  <string name="recommend_subject">Probiere %1$s auf Deinem Smartphone!</string>
  <string name="recommend_text">Ich möchte Dich zum Benutzen von %1$s auf Deinem Smartphone einladen!\nLade es hier herunter: %2$s</string>
  <string name="auth_check_server">Überprüfe den Server</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
  <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
  <string name="uploader_info_uploading">Lade hoch</string>
+  <string name="file_list_seconds_ago">Gerade eben</string>
  <string name="file_list_empty">Alles leer. Lade etwas hoch!</string>
  <string name="file_list_loading">Ladevorgang …</string>
  <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
+  <string name="file_list_folder">Ordner</string>
+  <string name="file_list_folders">Ordner</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
  <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
  <string name="filedetails_size">Größe:</string>
  <string name="filedetails_type">Art:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird auf eine unsichere Route weitergeleitet.</string>
  <string name="actionbar_logger">Protokolle</string>
  <string name="log_send_history_button">Verlauf senden</string>
-  <string name="log_mail_subject">Protokolle der ownCloud-Android-App</string>
-  <string name="log_progress_dialog_text">Daten werden geladen …</string>
+  <string name="log_send_no_mail_app">Keine App zum Versenden der Meldungen gefunden. Bitte installiere die Mail-App!</string>
+  <string name="log_send_mail_subject">%1$s Android-App Meldungen</string>
+  <string name="log_progress_dialog_text">Lade Daten…</string>
  <string name="saml_authentication_required_text">Legitimierung benötigt</string>
  <string name="saml_authentication_wrong_pass">Falsches Passwort</string>
  <string name="actionbar_move">Verschieben</string>
  <string name="file_list_empty_moving">Nichts vorhanden. Du kannst einen Ordner hinzufügen!</string>
-  <string name="move_choose_button_text">Auswählen</string>
+  <string name="folder_picker_choose_button_text">Auswählen</string>
  <string name="move_file_not_found">Verschieben nicht möglich. Prüfe, dass die Datei existiert</string>
  <string name="move_file_invalid_into_descendent">Es ist nicht möglich, einen Ordner in einen seiner Unterordner zu verschieben</string>
  <string name="move_file_invalid_overwrite">Die Datei ist bereits im Zielordner vorhanden</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">um diese Datei zu verschieben</string>
  <string name="prefs_category_instant_uploading">Sofortiges Hochladen</string>
  <string name="prefs_category_security">Sicherheit</string>
+  <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
+  <string name="shared_subject_header">geteilt</string>
+  <string name="with_you_subject_header">Mit Dir</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@ -11,6 +11,12 @@
  <string name="actionbar_settings">Ρυθμίσεις</string>
  <string name="actionbar_see_details">Λεπτομέρειες</string>
  <string name="actionbar_send_file">Αποστολή</string>
+  <string name="actionbar_sort">Ταξινόμηση</string>
+  <string name="actionbar_sort_title">Ταξινόμηση κατά</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Νεότερο - Παλαιότερο</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Γενικά</string>
@ -32,6 +38,8 @@
  <string name="prefs_recommend">Προτείνετε σε φίλο</string>
  <string name="prefs_feedback">Σχόλια </string>
  <string name="prefs_imprint">Αποτύπωμα</string>
+  <string name="prefs_remember_last_share_location">Αποθήκευση σημείου διαμοιρασμού</string>
+  <string name="prefs_remember_last_upload_location_summary">Αποθήκευση τελευταίου σημείου διαμοιρασμού μεταφόρτωσης</string>
  <string name="recommend_subject">Δοκιμάστε %1$s στο κινητό σας!</string>
  <string name="recommend_text">Θα ήθελα να σε προσκαλέσω να χρησιμοποιήσεις το %1$s στο κινητό σου!\nΛήψη εδώ: %2$s</string>
  <string name="auth_check_server">Έλεγχος Διακομιστή</string>
@ -51,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να μεταφορτώσετε.</string>
  <string name="uploader_error_forbidden_content">Ο %1$s δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
  <string name="uploader_info_uploading">Μεταφόρτωση</string>
+  <string name="file_list_seconds_ago">δευτερόλεπτα πριν</string>
  <string name="file_list_empty">Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!</string>
  <string name="file_list_loading">Φόρτωση ...</string>
  <string name="local_file_list_empty">Δεν υπάρχουν αρχεία σε αυτό τον φάκελο.</string>
+  <string name="file_list_folder">φάκελος</string>
+  <string name="file_list_folders">φάκελοι</string>
+  <string name="file_list_file">αρχείο</string>
+  <string name="file_list_files">αρχεία</string>
  <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
  <string name="filedetails_size">Μέγεθος:</string>
  <string name="filedetails_type">Τύπος:</string>
@ -269,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Ασφαλής σύνδεση ανακατευθύνεται σε μια μη ασφαλή διαδρομή.</string>
  <string name="actionbar_logger">Αρχεία καταγραφών</string>
  <string name="log_send_history_button">Αποστολή ιστορικού</string>
-  <string name="log_mail_subject">αρχεία καταγραφής της εφαρμογής ownCloud Android</string>
+  <string name="log_send_no_mail_app">Δεν εντοπίστηκε εφαρμογή αποστολής αναφορών συστήματος. Εγκαταστήστε το mail app!</string>
+  <string name="log_send_mail_subject">%1$s αναφορές του Android app</string>
  <string name="log_progress_dialog_text">Φόρτωση δεδομένων....</string>
  <string name="saml_authentication_required_text">Απαιτείται πιστοποίηση</string>
  <string name="saml_authentication_wrong_pass">Εσφαλμένο συνθηματικό</string>
  <string name="actionbar_move">Μετακίνηση</string>
  <string name="file_list_empty_moving">Δεν υπάρχει τίποτα εδώ. Μπορείτε να προσθέσετε ένα φάκελο!</string>
-  <string name="move_choose_button_text">Επιλέξτε</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>
@ -283,4 +297,6 @@
  <string name="forbidden_permissions_move">για μετακίνηση αυτού του αρχείου</string>
  <string name="prefs_category_instant_uploading">Στιγμιαίες Μεταφορτώσεις</string>
  <string name="prefs_category_security">Ασφάλεια</string>
+  <string name="prefs_instant_video_upload_path_title">Διαδρομή Μεταφόρτωσης Βίντεο</string>
+  <string name="shared_subject_header">μοιρασμένο </string>
 </resources>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Recommend to a friend</string>
  <string name="prefs_feedback">Feedback</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Remember share location</string>
+  <string name="prefs_remember_last_upload_location_summary">Remember last share upload location</string>
  <string name="recommend_subject">Try %1$s on your smartphone!</string>
  <string name="recommend_text">I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s</string>
  <string name="auth_check_server">Check Server</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
  <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
  <string name="uploader_info_uploading">Uploading</string>
+  <string name="file_list_seconds_ago">seconds ago</string>
  <string name="file_list_empty">Nothing in here. Upload something!</string>
  <string name="file_list_loading">Loading...</string>
  <string name="local_file_list_empty">There are no files in this folder.</string>
+  <string name="file_list_folder">folder</string>
+  <string name="file_list_folders">folders</string>
+  <string name="file_list_file">file</string>
+  <string name="file_list_files">files</string>
  <string name="filedetails_select_file">Tap on a file to display additional information.</string>
  <string name="filedetails_size">Size:</string>
  <string name="filedetails_type">Type:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  <string name="actionbar_logger">Logs</string>
  <string name="log_send_history_button">Send History</string>
-  <string name="log_mail_subject">ownCloud Android app logs</string>
-  <string name="log_progress_dialog_text">Loading data...</string>
+  <string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
+  <string name="log_send_mail_subject">%1$s Android app logs</string>
+  <string name="log_progress_dialog_text">Loading data…</string>
  <string name="saml_authentication_required_text">Authentication required</string>
  <string name="saml_authentication_wrong_pass">Incorrect password</string>
  <string name="actionbar_move">Move</string>
  <string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
-  <string name="move_choose_button_text">Choose</string>
+  <string name="folder_picker_choose_button_text">Choose</string>
  <string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
  <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
  <string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">to move this file</string>
  <string name="prefs_category_instant_uploading">Instant Uploads</string>
  <string name="prefs_category_security">Security</string>
+  <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
+  <string name="shared_subject_header">shared</string>
+  <string name="with_you_subject_header">with you</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@ -36,7 +36,12 @@
  <string name="uploader_wrn_no_content_text">Neniu enhavo riceviĝis. Nenio alŝutota.</string>
  <string name="uploader_error_forbidden_content">$1%s ne estas permesata aliri la kunhavigitan enhavon</string>
  <string name="uploader_info_uploading">Alŝutante</string>
+  <string name="file_list_seconds_ago">sekundoj antaŭe</string>
  <string name="file_list_empty">Nenio estas ĉi tie. Alŝutu ion!</string>
+  <string name="file_list_folder">dosierujo</string>
+  <string name="file_list_folders">dosierujoj</string>
+  <string name="file_list_file">dosiero</string>
+  <string name="file_list_files">dosieroj</string>
  <string name="filedetails_size">Grando:</string>
  <string name="filedetails_type">Tipo:</string>
  <string name="filedetails_created">Kreita je:</string>
@ -187,6 +192,7 @@
  <string name="prefs_category_accounts">Kontoj</string>
  <string name="saml_authentication_required_text">Aŭtentiĝo nepras</string>
  <string name="saml_authentication_wrong_pass">Malĝusta pasvorto</string>
-  <string name="move_choose_button_text">Elekti</string>
+  <string name="folder_picker_choose_button_text">Elekti</string>
  <string name="prefs_category_security">Sekuro</string>
+  <string name="shared_subject_header">kunhavigita</string>
 </resources>
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@ -50,9 +50,14 @@
  <string name="uploader_wrn_no_content_text">No se recibió ningún contenido. No hay nada para subir.</string>
  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
  <string name="uploader_info_uploading">Subiendo</string>
+  <string name="file_list_seconds_ago">segundos atrás</string>
  <string name="file_list_empty">No hay nada. ¡Subí contenido!</string>
  <string name="file_list_loading">Cargando...</string>
  <string name="local_file_list_empty">No existen archivos en esta carpeta.</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetas</string>
+  <string name="file_list_file">archivo</string>
+  <string name="file_list_files">archivos</string>
  <string name="filedetails_select_file">Pulsá sobre un archivo para mostrar información adicional.</string>
  <string name="filedetails_size">Tamaño:</string>
  <string name="filedetails_type">Tipo:</string>
@ -242,6 +247,7 @@
  <string name="prefs_category_accounts">Cuentas</string>
  <string name="saml_authentication_required_text">Autentificación requerida</string>
  <string name="saml_authentication_wrong_pass">Clave incorrecta</string>
-  <string name="move_choose_button_text">Elegir</string>
+  <string name="folder_picker_choose_button_text">Elegir</string>
  <string name="prefs_category_security">Seguridad</string>
+  <string name="shared_subject_header">compartido</string>
 </resources>
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@ -33,6 +33,7 @@
  <string name="uploader_wrn_no_content_text">No se ha recibido ningún contenido. No hay nada para subir.</string>
  <string name="uploader_error_forbidden_content">%1$s no esta autorizado para acceder al contenido compartido</string>
  <string name="uploader_info_uploading">Subiendo</string>
+  <string name="file_list_seconds_ago">segundos antes</string>
  <string name="filedetails_select_file">Seleccione un archivo para desplegar información adicional.</string>
  <string name="filedetails_size">Tamaño:</string>
  <string name="filedetails_type">Tipo:</string>
@ -168,5 +169,5 @@
  <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Cuentas</string>
-  <string name="move_choose_button_text">Choose</string>
+  <string name="folder_picker_choose_button_text">Choose</string>
 </resources>
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@ -45,6 +45,7 @@
  <string name="uploader_wrn_no_content_text">Ningún contenido ha sido recibido. No hay nada que subir.</string>
  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
  <string name="uploader_info_uploading">Enviando</string>
+  <string name="file_list_seconds_ago">hace segundos</string>
  <string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
  <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
  <string name="filedetails_size">Tamaño:</string>
@ -216,6 +217,7 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">Cuentas</string>
  <string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
-  <string name="move_choose_button_text">Seleccionar</string>
+  <string name="folder_picker_choose_button_text">Seleccionar</string>
  <string name="prefs_category_security">Seguridad</string>
+  <string name="shared_subject_header">compartido</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Recomendar a un amigo</string>
  <string name="prefs_feedback">Mensajes de retroalimentación</string>
  <string name="prefs_imprint">pie de imprenta</string>
+  <string name="prefs_remember_last_share_location">Recordar la ubicación de los archivos compartidos</string>
+  <string name="prefs_remember_last_upload_location_summary">Recordar la ubicación de los últimos archivos compartidos subidos</string>
  <string name="recommend_subject">Prueba  %1$s en tu smarthphone!</string>
  <string name="recommend_text">¡Quiero invitarle a usar %1$s en su smartphone!\nDescárguelo aquí: %2$s</string>
  <string name="auth_check_server">Compruebe el servidor.</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Ningún contenido ha sido recibido. No hay nada que subir.</string>
  <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
  <string name="uploader_info_uploading">Subiendo...</string>
+  <string name="file_list_seconds_ago">hace segundos</string>
  <string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
  <string name="file_list_loading">Cargando...</string>
  <string name="local_file_list_empty">No hay archivos en esta carpeta.</string>
+  <string name="file_list_folder">carpeta</string>
+  <string name="file_list_folders">carpetas</string>
+  <string name="file_list_file">archivo</string>
+  <string name="file_list_files">archivos</string>
  <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
  <string name="filedetails_size">Tamaño:</string>
  <string name="filedetails_type">Tipo:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">La conexión segura está siendo desviada por una ruta insegura.</string>
  <string name="actionbar_logger">Logs</string>
  <string name="log_send_history_button">Enviar historial</string>
-  <string name="log_mail_subject">Logs de las apps ownCloud Android</string>
+  <string name="log_send_no_mail_app">No se ha encontrado una app para enviar logs. Instale la app mail!</string>
+  <string name="log_send_mail_subject">Se han encontrado %1$s logs de la app Android</string>
  <string name="log_progress_dialog_text">Cargando datos...</string>
  <string name="saml_authentication_required_text">Se necesita autenticación</string>
  <string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
  <string name="actionbar_move">Mover</string>
  <string name="file_list_empty_moving">Aquí no hay nada. ¡Puede agregar una carpeta!</string>
-  <string name="move_choose_button_text">Seleccionar</string>
+  <string name="folder_picker_choose_button_text">Seleccionar</string>
  <string name="move_file_not_found">No se puede mover. Revise si el archivo existe</string>
  <string name="move_file_invalid_into_descendent">No se puede mover una carpeta dentro de una de SUS subcarpetas.</string>
  <string name="move_file_invalid_overwrite">El archivo ya existe en la carpeta de destino</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">para mover este archivo</string>
  <string name="prefs_category_instant_uploading">Subidas instantáneas</string>
  <string name="prefs_category_security">Seguridad</string>
+  <string name="prefs_instant_video_upload_path_title">Ruta de vídeo de subida</string>
+  <string name="shared_subject_header">compartido</string>
+  <string name="with_you_subject_header">contigo</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@ -11,6 +11,12 @@
  <string name="actionbar_settings">Seaded</string>
  <string name="actionbar_see_details">Üksikasjad</string>
  <string name="actionbar_send_file">Saada</string>
+  <string name="actionbar_sort">Sorteeri</string>
+  <string name="actionbar_sort_title">Sorteeri</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Uuem - vanem</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Üldine</string>
@ -32,6 +38,8 @@
  <string name="prefs_recommend">Soovita sõbrale</string>
  <string name="prefs_feedback">Tagasiside</string>
  <string name="prefs_imprint">Impressum</string>
+  <string name="prefs_remember_last_share_location">Jäta meelde jagamise asukoht</string>
+  <string name="prefs_remember_last_upload_location_summary">Jäta meelde viimase jagamise üleslaadimise asukoht</string>
  <string name="recommend_subject">Proovi oma nutitelefonil rakendust %1$s!</string>
  <string name="recommend_text">Kutsun sind kasutama oma nutitelefonis rakendust %1$s!\nLaadi see alla siit: %2$s</string>
  <string name="auth_check_server">Kontrolli serverit</string>
@ -51,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Sisu ei saadud. Pole midagi üles laadida.</string>
  <string name="uploader_error_forbidden_content">%1$sile pole lubatud ligipääs jagatud sisule</string>
  <string name="uploader_info_uploading">Üleslaadimine</string>
+  <string name="file_list_seconds_ago">sekundit tagasi</string>
  <string name="file_list_empty">Siin pole midagi. Lae midagi üles!</string>
  <string name="file_list_loading">Laen ...</string>
  <string name="local_file_list_empty">Kaustas pole faile.</string>
+  <string name="file_list_folder">kaust</string>
+  <string name="file_list_folders">kausta</string>
+  <string name="file_list_file">fail</string>
+  <string name="file_list_files">faili</string>
  <string name="filedetails_select_file">Lisainfo vaatamiseks vajuta failile.</string>
  <string name="filedetails_size">Suurus:</string>
  <string name="filedetails_type">Tüüp:</string>
@ -273,13 +286,11 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
  <string name="auth_redirect_non_secure_connection_title">Turvaline ühendus suunatakse läbi turvamata ühenduse.</string>
  <string name="actionbar_logger">Logid</string>
  <string name="log_send_history_button">Saada ajalugu</string>
-  <string name="log_mail_subject">ownCloud Android rakenduse logid</string>
-  <string name="log_progress_dialog_text">Andmete laadimine...</string>
  <string name="saml_authentication_required_text">Autentimine on vajalik</string>
  <string name="saml_authentication_wrong_pass">Vale parool</string>
  <string name="actionbar_move">Tõsta ümber</string>
  <string name="file_list_empty_moving">Siin pole midagi. Sa võid lisada kausta!</string>
-  <string name="move_choose_button_text">Vali</string>
+  <string name="folder_picker_choose_button_text">Vali</string>
  <string name="move_file_not_found">Liigutamine ebaõnnestus. Palun kontrolli, kas fail on olemas</string>
  <string name="move_file_invalid_into_descendent">Kausta ei saa liigutada selle alamkausta</string>
  <string name="move_file_invalid_overwrite">See fail on juba sihtkaustas olemas</string>
@ -287,4 +298,5 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
  <string name="forbidden_permissions_move">selle faili liigutamiseks</string>
  <string name="prefs_category_instant_uploading">Kohesed üleslaadimised</string>
  <string name="prefs_category_security">Turvalisus</string>
+  <string name="shared_subject_header">jagatud</string>
 </resources>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@ -55,9 +55,14 @@
  <string name="uploader_wrn_no_content_text">Ez da edukirik jaso. Ez dago ezer igotzeko.</string>
  <string name="uploader_error_forbidden_content">%1$s-(e)k ez du baimenik elkarbanatutako edukian sartzeko</string>
  <string name="uploader_info_uploading">Igotzen</string>
+  <string name="file_list_seconds_ago">segundu</string>
  <string name="file_list_empty">Ez dago ezer. Igo zerbait!</string>
  <string name="file_list_loading">Kargatzen...</string>
  <string name="local_file_list_empty">Ez dago fitxategirik karpeta honetan.</string>
+  <string name="file_list_folder">karpeta</string>
+  <string name="file_list_folders">Karpetak</string>
+  <string name="file_list_file">fitxategia</string>
+  <string name="file_list_files">fitxategiak</string>
  <string name="filedetails_select_file">Sakatu fitxategi baten gainean informazio gehiago lortzeko</string>
  <string name="filedetails_size">Tamaina:</string>
  <string name="filedetails_type">Mota:</string>
@ -266,12 +271,11 @@ Mesedez, baimendu berriz</string>
  <string name="downloader_download_file_not_found">Fitxategia jadanik ez dago eskuragarri zerbitzarian</string>
  <string name="prefs_category_accounts">Kontuak</string>
  <string name="prefs_add_account">Gehitu kontua</string>
-  <string name="log_mail_subject">ownCloud Android programaren egunerokoak</string>
-  <string name="log_progress_dialog_text">Datuak kargatzen...</string>
  <string name="saml_authentication_required_text">Autentikazioa beharrezkoa</string>
  <string name="saml_authentication_wrong_pass">Pasahitz okerra</string>
  <string name="actionbar_move">Mugitu</string>
-  <string name="move_choose_button_text">Aukeratu</string>
+  <string name="folder_picker_choose_button_text">Aukeratu</string>
  <string name="prefs_category_instant_uploading">Berehalako Igoerak</string>
  <string name="prefs_category_security">Segurtasuna</string>
+  <string name="shared_subject_header">konpartitua</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -46,9 +46,14 @@
  <string name="uploader_wrn_no_content_text">هیچ مطلبی دریافت نشده است. هیچ‌‌چیزی بارگزاری نشده.</string>
  <string name="uploader_error_forbidden_content">%1$s اجازه ی دسترسی به محتوای مشترک را نمی دهد</string>
  <string name="uploader_info_uploading">در حال بارگزاری</string>
+  <string name="file_list_seconds_ago">ثانیه‌ها پیش</string>
  <string name="file_list_empty">اینجا هیچ چیز نیست.</string>
  <string name="file_list_loading">درحال بارگذاری...</string>
  <string name="local_file_list_empty">هیچ فایلی در این پوشه نیست.</string>
+  <string name="file_list_folder">پوشه</string>
+  <string name="file_list_folders">پوشه ها</string>
+  <string name="file_list_file">پرونده</string>
+  <string name="file_list_files">پرونده ها</string>
  <string name="filedetails_select_file">روی هر فایل کلیک کنید تا اطلاعات اضافی نمایش داده شود.</string>
  <string name="filedetails_size">اندازه</string>
  <string name="filedetails_type">نوع:</string>
@ -233,6 +238,7 @@
  <string name="prefs_category_accounts">حساب‌ها</string>
  <string name="saml_authentication_required_text">احراز هویت مورد نیاز است</string>
  <string name="saml_authentication_wrong_pass">رمز عبور اشتباه است</string>
-  <string name="move_choose_button_text">انتخاب کردن</string>
+  <string name="folder_picker_choose_button_text">انتخاب کردن</string>
  <string name="prefs_category_security">امنیت</string>
+  <string name="shared_subject_header">اشتراک گذاشته شده</string>
 </resources>
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@ -37,6 +37,8 @@
  <string name="prefs_help">Ohje</string>
  <string name="prefs_recommend">Suosittele kaverille</string>
  <string name="prefs_feedback">Palaute</string>
+  <string name="prefs_remember_last_share_location">Muista jaon sijainti</string>
+  <string name="prefs_remember_last_upload_location_summary">Muista viimeisin jaon lähetyssijainti</string>
  <string name="recommend_subject">Kokeile %1$sia älypuhelimellasi!</string>
  <string name="recommend_text">Kutsun sinut käyttämään %1$sia älypuhelimellasi!\nLataa se tästä: %2$s</string>
  <string name="auth_check_server">Tarkista palvelin</string>
@ -56,9 +58,14 @@
  <string name="uploader_wrn_no_content_text">Sisältöä ei saatu. Ei lähetettävää palvelimelle.</string>
  <string name="uploader_error_forbidden_content">%1$silla ei ole oikeuksia jaettuun sisältöön</string>
  <string name="uploader_info_uploading">Lähetetään</string>
+  <string name="file_list_seconds_ago">sekuntia sitten</string>
  <string name="file_list_empty">Täällä ei ole mitään. Lähetä tänne jotakin!</string>
  <string name="file_list_loading">Ladataan...</string>
  <string name="local_file_list_empty">Tässä kansiossa ei ole tiedostoja</string>
+  <string name="file_list_folder">kansio</string>
+  <string name="file_list_folders">kansiota</string>
+  <string name="file_list_file">tiedosto</string>
+  <string name="file_list_files">tiedostoa</string>
  <string name="filedetails_select_file">Napauta tiedostoa nähdäksesi lisätietoja.</string>
  <string name="filedetails_size">Koko:</string>
  <string name="filedetails_type">Tyyppi:</string>
@ -68,6 +75,7 @@
  <string name="filedetails_sync_file">Päivitä tiedosto</string>
  <string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
  <string name="action_share_file">Jaa linkki</string>
+  <string name="action_unshare_file">Poista linkin jako</string>
  <string name="common_yes">Kyllä</string>
  <string name="common_no">Ei</string>
  <string name="common_ok">OK</string>
@ -144,6 +152,7 @@
  <string name="auth_testing_connection">Testataan yhteyttä...</string>
  <string name="auth_not_configured_title">Väärin tehdyt palvelin-asetukset</string>
  <string name="auth_account_not_new">Laitteella on jo tili samalle käyttäjälle ja palvelimelle</string>
+  <string name="auth_account_not_the_same">Syötetty käyttäjä ei täsmää tämän tilin käyttäjän kanssa</string>
  <string name="auth_unknown_error_title">Tuntematon virhe</string>
  <string name="auth_unknown_host_title">Isäntää ei löydy</string>
  <string name="auth_incorrect_path_title">Palvelin-instanssia ei löydetty</string>
@ -249,18 +258,21 @@
  <string name="downloader_download_file_not_found">Tämä tiedosto ei ole enää palvelimella käytettävissä</string>
  <string name="prefs_category_accounts">Tilit</string>
  <string name="prefs_add_account">Lisää tili</string>
+  <string name="auth_redirect_non_secure_connection_title">Salattu yhteys on ohjattu uudelleen salaamatonta reittiä pitkin.</string>
  <string name="actionbar_logger">Lokit</string>
  <string name="log_send_history_button">Lähetä historia</string>
-  <string name="log_mail_subject">ownCloudin Android-sovelluksen lokit</string>
-  <string name="log_progress_dialog_text">Ladataan tietoja...</string>
+  <string name="log_send_no_mail_app">Lokien lähettämistä varten ei löytynyt sovellusta. Asenna sähköpostisovellus!</string>
+  <string name="log_progress_dialog_text">Ladataan tietoja…</string>
  <string name="saml_authentication_required_text">Tunnistautuminen vaaditaan</string>
  <string name="saml_authentication_wrong_pass">Väärä salasana</string>
  <string name="actionbar_move">Siirrä</string>
  <string name="file_list_empty_moving">Täällä ei ole mitään. Voit lisätä kansion!</string>
-  <string name="move_choose_button_text">Valitse</string>
+  <string name="folder_picker_choose_button_text">Valitse</string>
  <string name="move_file_not_found">Siirto ei onnistu. Tarkista, ettei tiedostoa ole jo olemassa</string>
  <string name="move_file_invalid_overwrite">Tiedosto on jo olemassa kohdekansiossa</string>
  <string name="move_file_error">Tämän tiedoston tai kansion siirtoa yrittäessä tapahtui virhe</string>
  <string name="prefs_category_instant_uploading">Välittömät lähetykset</string>
  <string name="prefs_category_security">Tietoturva</string>
+  <string name="shared_subject_header">jaettu</string>
+  <string name="with_you_subject_header">kanssasi</string>
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="actionbar_upload">Lähetä</string>
+  <string name="actionbar_open_with">Avaa sovelluksessa</string>
+  <string name="actionbar_mkdir">Luo kansio</string>
+  <string name="actionbar_settings">Asetukset</string>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
+  <string name="prefs_category_more">Lisää</string>
+  <string name="prefs_manage_accounts">Hallitse tilejä</string>
+  <string name="prefs_pincode">Sovelluksen PIN</string>
+  <string name="prefs_help">Apua</string>
+  <string name="auth_host_url">http://esimerkki.fi/palvelu/</string>
+  <string name="auth_username">Käyttäjätunnus</string>
+  <string name="auth_password">Salasana</string>
+  <string name="uploader_btn_upload_text">Lähetä</string>
+  <string name="file_list_empty">Ei sisältöä. Siirrä tänne jotakin!</string>
+  <string name="file_list_loading">Ladataan...</string>
+  <string name="file_list_folder">kansio</string>
+  <string name="file_list_folders">kansiot</string>
+  <string name="file_list_file">tiedosto</string>
+  <string name="file_list_files">Tiedostot</string>
+  <string name="action_share_file">Jaa linkki</string>
+  <string name="action_unshare_file">Poista linkin jako</string>
+  <string name="common_yes">KYLLÄ</string>
+  <string name="common_no">EI</string>
+  <string name="common_ok">Ok</string>
+  <string name="common_cancel">Peruuta</string>
+  <string name="common_error">Virhe</string>
+  <string name="pincode_wrong">Virheellinen PIN</string>
+  <string name="pincode_removed">Sovelluksen PIN poistettu</string>
+  <string name="pincode_stored">Sovelluksen PIN tallennettu</string>
+  <string name="auth_account_not_the_same">Syötetty käyttäjä ei täsmää tämän tilin käyttäjän kanssa</string>
+  <string name="auth_unsupported_auth_method">Palvelin ei tue tätä autentikointitapaa</string>
+  <string name="common_rename">Nimeä uudelleen</string>
+  <string name="ssl_validator_label_L">Sijainti:</string>
+  <string name="conflict_overwrite">Ylikirjoita</string>
+  <string name="copy_link">Kopioi linkki</string>
+  <string name="empty"></string>
+  <string name="actionbar_move">Siirrä</string>
+  <string name="folder_picker_choose_button_text">Valitse</string>
+  <string name="move_file_invalid_overwrite">Tiedosto on jo kohdekansiossa.</string>
+</resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -12,10 +12,10 @@
  <string name="actionbar_see_details">Détails</string>
  <string name="actionbar_send_file">Envoyer</string>
  <string name="actionbar_sort">Trier</string>
-  <string name="actionbar_sort_title">Trier par</string>
+  <string name="actionbar_sort_title">Trier</string>
  <string-array name="actionbar_sortby">
-    <item>A-Z</item>
-    <item>Plus récent - Plus ancien</item>
+    <item>par ordre alphabétique</item>
+    <item>du plus récent au plus ancien</item>
  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
@ -23,12 +23,12 @@
  <string name="prefs_category_more">Plus</string>
  <string name="prefs_accounts">Comptes</string>
  <string name="prefs_manage_accounts">Gestion des comptes utilisateur</string>
-  <string name="prefs_pincode">Utilisation d\'un code de sécurité</string>
-  <string name="prefs_pincode_summary">Protéger l\'accès aux données manipulées par le client</string>
-  <string name="prefs_instant_upload">Téléchargements instantanés d\'images</string>
-  <string name="prefs_instant_upload_summary">Téléversement instantané des photos prises par la caméra</string>
-  <string name="prefs_instant_video_upload">Téléchargements instantanés de vidéos</string>
-  <string name="prefs_instant_video_upload_summary">Téléversement instantané des vidéos prises par la caméra</string>
+  <string name="prefs_pincode">Code de sécurité</string>
+  <string name="prefs_pincode_summary">Protéger l\'accès à l\'application</string>
+  <string name="prefs_instant_upload">Envoi instantané des photos</string>
+  <string name="prefs_instant_upload_summary">Téléverser immédiatement les photos prises par la caméra</string>
+  <string name="prefs_instant_video_upload">Envoi instantané des vidéos</string>
+  <string name="prefs_instant_video_upload_summary">Téléverser immédiatement les vidéos prises par la caméra</string>
  <string name="prefs_log_title">Activer les logs</string>
  <string name="prefs_log_summary">Utilisé pour enregistrer les problèmes dans les logs</string>
  <string name="prefs_log_title_history">Historique des logs</string>
@ -38,11 +38,13 @@
  <string name="prefs_recommend">Recommander à un ami</string>
  <string name="prefs_feedback">Commentaires</string>
  <string name="prefs_imprint">Empreinte</string>
+  <string name="prefs_remember_last_share_location">Mémoriser l\'emplacement de partage</string>
+  <string name="prefs_remember_last_upload_location_summary">Mémoriser le dernier emplacement d\'upload</string>
  <string name="recommend_subject">Essayez %1$s sur votre smartphone !</string>
  <string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone !
 Téléchargez-le ici : %2$s</string>
  <string name="auth_check_server">Vérifier le serveur</string>
-  <string name="auth_host_url">Adresse du serveur https://...</string>
+  <string name="auth_host_url">Adresse du serveur https://…</string>
  <string name="auth_username">Nom d\'utilisateur</string>
  <string name="auth_password">Mot de passe</string>
  <string name="auth_register">Nouveau dans %1$s ?</string>
@ -58,9 +60,14 @@ Téléchargez-le ici : %2$s</string>
  <string name="uploader_wrn_no_content_text">Aucun contenu reçu. Rien à envoyer.</string>
  <string name="uploader_error_forbidden_content">%1$s n\'est pas autorisé à accéder au contenu partagé</string>
  <string name="uploader_info_uploading">Téléversement</string>
+  <string name="file_list_seconds_ago">il y a quelques secondes</string>
  <string name="file_list_empty">Il n\'y a rien ici ! Envoyez donc quelque chose :)</string>
  <string name="file_list_loading">Chargement…</string>
  <string name="local_file_list_empty">Aucun fichier n\'est présent dans ce dossier.</string>
+  <string name="file_list_folder">dossier</string>
+  <string name="file_list_folders">dossiers</string>
+  <string name="file_list_file">fichier</string>
+  <string name="file_list_files">fichiers</string>
  <string name="filedetails_select_file">Effleurez un fichier pour afficher les informations complémentaires</string>
  <string name="filedetails_size">Taille :</string>
  <string name="filedetails_type">Type :</string>
@ -79,8 +86,8 @@ Téléchargez-le ici : %2$s</string>
  <string name="common_cancel">Annuler</string>
  <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
  <string name="common_error">Erreur</string>
-  <string name="common_loading">Chargement ...</string>
-  <string name="common_error_unknown">Erreur Inconnue </string>
+  <string name="common_loading">Chargement…</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>
  <string name="delete_account">Effacer ce compte</string>
@ -88,7 +95,7 @@ Téléchargez-le ici : %2$s</string>
  <string name="upload_chooser_title">Téléverser un fichier depuis…</string>
  <string name="uploader_info_dirname">Nom du dossier</string>
  <string name="uploader_upload_in_progress_ticker">Téléversement…</string>
-  <string name="uploader_upload_in_progress_content">Envoi du fichier %2$s en cours, %1$d%% effectués</string>
+  <string name="uploader_upload_in_progress_content">Envoi du fichier %2$s : %1$d%% effectués</string>
  <string name="uploader_upload_succeeded_ticker">Téléversement réussi</string>
  <string name="uploader_upload_succeeded_content_single">Le fichier %1$s a été envoyé avec succès</string>
  <string name="uploader_upload_failed_ticker">Échec de l\'envoi</string>
@ -110,7 +117,7 @@ Téléchargez-le ici : %2$s</string>
  <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
  <string name="sync_conflicts_in_favourites_content">%1$d fichiers à garder synchronisés n\'ont put être synchronisé</string>
  <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
-  <string name="sync_fail_in_favourites_content">Le contenu de %1$d fichiers n\'a put être synchronisé (%2$d conflits)</string>
+  <string name="sync_fail_in_favourites_content">Le contenu de %1$d fichiers n\'a pu être synchronisé (%2$d conflits)</string>
  <string name="sync_foreign_files_forgotten_ticker">Certains fichiers locaux ont été oubliés</string>
  <string name="sync_foreign_files_forgotten_content">%1$d fichiers du dossier %2$s n\'ont pas pu être copiés dans</string>
  <string name="sync_foreign_files_forgotten_explanation">Depuis la version 1.3.16, les fichiers envoyé depuis ce périphérique sont copiés dans le dossier local %1$s pour éviter une perte de données lorsqu\'un même fichier est synchronisé avec plusieurs comptes.
@ -122,8 +129,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="foreign_files_move">Tout déplacer</string>
  <string name="foreign_files_success">Tous les fichiers ont été déplacés</string>
  <string name="foreign_files_fail">Certains fichiers n\'ont pu être déplacés</string>
-  <string name="foreign_files_local_text">Local: %1$s</string>
-  <string name="foreign_files_remote_text">Distant: %1$s</string>
+  <string name="foreign_files_local_text">Local : %1$s</string>
+  <string name="foreign_files_remote_text">Distant : %1$s</string>
  <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous quand même les déplacer ?</string>
  <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
  <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité </string>
@ -137,24 +144,24 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="media_notif_ticker">%1$s lecteur de musique</string>
  <string name="media_state_playing">%1$s (lecture)</string>
  <string name="media_state_loading">%1$s (chargement)</string>
-  <string name="media_event_done">%1$s pourcentage de lecture finie</string>
+  <string name="media_event_done">Lecture de %1$s terminée</string>
  <string name="media_err_nothing_to_play">Fichier média introuvable </string>
  <string name="media_err_no_account">Aucun compte n\'a été trouvé</string>
  <string name="media_err_not_in_owncloud">Le fichier n\'est pas dans un compte valide</string>
-  <string name="media_err_unsupported">Le codec de ce média n\'est pas supporté </string>
+  <string name="media_err_unsupported">Le codec de ce média n\'est pas pris en charge </string>
  <string name="media_err_io">Le fichier média ne peut pas être lu</string>
  <string name="media_err_malformed">Le fichier média n\'est pas correctement encodé</string>
  <string name="media_err_timeout">Délai dépassé pour la lecture du morceau.</string>
  <string name="media_err_invalid_progressive_playback">Le fichier média ne peut pas être diffusé</string>
-  <string name="media_err_unknown">Fichier média ne peut être joué avec le stock de media player</string>
-  <string name="media_err_security_ex">taux %1$s erreurs de sécurité essayant de jouer</string>
-  <string name="media_err_io_ex">Taux %1$s d\'erreurs de saisie essayant de jouer</string>
-  <string name="media_err_unexpected">Taux %1$s d\'erreurs inattendues essayant de jouer</string>
-  <string name="media_rewind_description">Bouton de rem-bobinage</string>
-  <string name="media_play_pause_description">Bouton de Lecture ou de Pause</string>
+  <string name="media_err_unknown">Le fichier média ne peut être joué avec le lecteur standard</string>
+  <string name="media_err_security_ex">Erreur de sécurité à la lecture de %1$s</string>
+  <string name="media_err_io_ex">Erreur de lecture de fichier à la lecture de %1$s</string>
+  <string name="media_err_unexpected">Erreur inattendue à la lecture de %1$s </string>
+  <string name="media_rewind_description">Bouton de rembobinage</string>
+  <string name="media_play_pause_description">Bouton de lecture ou de pause</string>
  <string name="media_forward_description">Bouton d\'avance rapide</string>
-  <string name="auth_getting_authorization">Demande d\'autorisation...</string>
-  <string name="auth_trying_to_login">Tentative de connexion …</string>
+  <string name="auth_getting_authorization">Demande d\'autorisation…</string>
+  <string name="auth_trying_to_login">Tentative de connexion…</string>
  <string name="auth_no_net_conn_title">Pas de connexion réseau</string>
  <string name="auth_nossl_plain_ok_title">Connexion sécurisée non disponible</string>
  <string name="auth_connection_established">Connexion établie</string>
@ -166,22 +173,22 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>
  <string name="auth_incorrect_path_title">Aucune instance du serveur n\'a été trouvée</string>
  <string name="auth_timeout_title">Le serveur met trop longtemps à répondre</string>
-  <string name="auth_incorrect_address_title">Adresse invalide</string>
+  <string name="auth_incorrect_address_title">Adresse non valide</string>
  <string name="auth_ssl_general_error_title">Échec de l\'initialisation SSL</string>
-  <string name="auth_ssl_unverified_server_title">Impossible de vérifier l\'identité du serveur SSL.</string>
+  <string name="auth_ssl_unverified_server_title">Impossible de vérifier l\'identité du serveur SSL</string>
  <string name="auth_bad_oc_version_title">La version du serveur n\'est pas reconnue</string>
  <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
  <string name="auth_secure_connection">Connexion sécurisée établie</string>
  <string name="auth_unauthorized">Nom d\'utilisateur ou mot de passe incorrect</string>
  <string name="auth_oauth_error">Échec d\'autorisation</string>
  <string name="auth_oauth_error_access_denied">Accès refusé par le serveur d\'autorisation</string>
-  <string name="auth_wtf_reenter_URL">État inattendu ; veuillez entrer à nouveau l\'URL du serveur</string>
+  <string name="auth_wtf_reenter_URL">État inattendu ; veuillez saisir à nouveau l\'URL du serveur</string>
  <string name="auth_expired_oauth_token_toast">Votre autorisation a expiré. Merci de vous authentifier à nouveau</string>
  <string name="auth_expired_basic_auth_toast">Veuillez saisir le mot de passe courant</string>
  <string name="auth_expired_saml_sso_token_toast">Votre session a expiré. Merci de vous reconnecter</string>
-  <string name="auth_connecting_auth_server">Connexion au serveur d\'authentification...</string>
-  <string name="auth_unsupported_auth_method">Le serveur ne supporte pas cette méthode d\'authentification</string>
-  <string name="auth_unsupported_multiaccount">%1$s ne supporte pas les comptes multiples</string>
+  <string name="auth_connecting_auth_server">Connexion au serveur d\'authentification…</string>
+  <string name="auth_unsupported_auth_method">Le serveur ne prend pas en charge pas cette méthode d\'authentification</string>
+  <string name="auth_unsupported_multiaccount">%1$s ne prend pas en charge les comptes multiples</string>
  <string name="auth_fail_get_user_name">Votre serveur a retourné un identifiant d\'utilisateur incorrect. Veuillez prendre contact avec votre administrateur
 </string>
  <string name="auth_can_not_auth_against_server">Impossible de s\'authentifier sur ce serveur</string>
@ -191,25 +198,25 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
  <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
  <string name="confirmation_remove_local">Local seulement</string>
-  <string name="confirmation_remove_folder_local">Le contenu local uniquement</string>
+  <string name="confirmation_remove_folder_local">Contenu local uniquement</string>
  <string name="confirmation_remove_remote">Effacer du serveur</string>
-  <string name="confirmation_remove_remote_and_local">Les deux distant et local</string>
+  <string name="confirmation_remove_remote_and_local">Distant et local</string>
  <string name="remove_success_msg">Suppression effectuée avec succès</string>
  <string name="remove_fail_msg">Suppression impossible</string>
  <string name="rename_dialog_title">Entrez un nouveau nom</string>
  <string name="rename_local_fail_msg">La version locale ne peut être renommée, veuillez réessayer avec un nom différent</string>
  <string name="rename_server_fail_msg">Renommage impossible</string>
  <string name="sync_file_fail_msg">Le fichier distant n\'a pu être vérifié</string>
-  <string name="sync_file_nothing_to_do_msg">Le contenu des fichiers est déjà synchronisé</string>
+  <string name="sync_file_nothing_to_do_msg">Le contenu du fichier est déjà synchronisé</string>
  <string name="create_dir_fail_msg">Le dossier n\'a pas pu être créé</string>
  <string name="filename_forbidden_characters">Caractères interdits : / \\ &lt; &gt; : \" | ? *</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="filedisplay_unexpected_bad_get_content">Problème inattendu ; veuillez essayer une autre app pour la sélection du fichier</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 un lien à…</string>
-  <string name="oauth_check_onoff">Connexion avec aAuth2.</string>
-  <string name="oauth_login_connection">Connexion au serveur aAuth2...</string>
+  <string name="activity_chooser_title">Envoyer le lien vers…</string>
+  <string name="oauth_check_onoff">Connexion avec oAuth2</string>
+  <string name="oauth_login_connection">Connexion au serveur oAuth2…</string>
  <string name="ssl_validator_header">L\'identité du site ne peut être vérifiée</string>
  <string name="ssl_validator_reason_cert_not_trusted">- Le certificat du serveur n\'est pas sûr</string>
  <string name="ssl_validator_reason_cert_expired">- Le certificat du serveur a expiré</string>
@ -228,8 +235,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="ssl_validator_label_ST">Région :</string>
  <string name="ssl_validator_label_L">Localisation :</string>
  <string name="ssl_validator_label_validity">Validité :</string>
-  <string name="ssl_validator_label_validity_from">De :</string>
-  <string name="ssl_validator_label_validity_to">À :</string>
+  <string name="ssl_validator_label_validity_from">Du :</string>
+  <string name="ssl_validator_label_validity_to">Au :</string>
  <string name="ssl_validator_label_signature">Signature :</string>
  <string name="ssl_validator_label_signature_algorithm">Algorithme :</string>
  <string name="ssl_validator_null_cert">Impossible d\'afficher le certificat.</string>
@ -242,7 +249,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="placeholder_media_time">12:23:45</string>
  <string name="instant_upload_on_wifi">Téléverser les images via une connexion WiFi uniquement</string>
  <string name="instant_video_upload_on_wifi">Téléverser les vidéos via une connexion WiFi uniquement</string>
-  <string name="instant_upload_path">/TéléversementInstantané</string>
+  <string name="instant_upload_path">/Instantané</string>
  <string name="conflict_title">Conflit de mise à jour</string>
  <string name="conflict_message">Le fichier distant %s n\'est pas synchronisé avec le fichier local. En choisissant de continuer, vous remplacerez le contenu de fichier sur le serveur.</string>
  <string name="conflict_keep_both">Garder les deux versions</string>
@ -251,8 +258,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="preview_image_description">Prévisualisation de l\'image</string>
  <string name="preview_image_error_unknown_format">Cette image ne peut pas être affichée</string>
  <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié dans le dossier local %2$s</string>
-  <string name="prefs_instant_upload_path_title">Chemin d\'accès pour le téléversement</string>
-  <string name="share_link_no_support_share_api">Désolé, le partage n\'est pas disponible sur votre serveur. Contactez votre administrateur, s\'il vous plait.</string>
+  <string name="prefs_instant_upload_path_title">Répertoire d\'envoi</string>
+  <string name="share_link_no_support_share_api">Désolé, le partage n\'est pas disponible sur votre serveur. Veuillez contacter votre administrateur.</string>
  <string name="share_link_file_no_exist">Impossible de partager. Vérifiez que le fichier est bien présent</string>
  <string name="share_link_file_error">Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire</string>
  <string name="unshare_link_file_no_exist">Impossible de supprimer le partage. Vérifiez que le fichier est bien présent</string>
@ -279,18 +286,23 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
  <string name="auth_redirect_non_secure_connection_title">La connexion sécurisée est redirigée via une route non-sécurisée.</string>
  <string name="actionbar_logger">Journaux</string>
  <string name="log_send_history_button">Envoyer l\'historique</string>
-  <string name="log_mail_subject">Journaux de l\'application Android ownCloud</string>
+  <string name="log_send_no_mail_app">Aucune application trouvée pour envoyer les logs. Installez une application de courriel !</string>
+  <string name="log_send_mail_subject">Journaux de l\'application Android %1$s</string>
  <string name="log_progress_dialog_text">Chargement des données...</string>
  <string name="saml_authentication_required_text">Authentification requise</string>
  <string name="saml_authentication_wrong_pass">Mot de passe incorrect</string>
  <string name="actionbar_move">Déplacer</string>
  <string name="file_list_empty_moving">Il n\'y a rien ici. Vous pouvez ajouter un dossier !</string>
-  <string name="move_choose_button_text">Choisir</string>
+  <string name="folder_picker_choose_button_text">Choisir</string>
  <string name="move_file_not_found">Impossible de déplacer. Vérifiez que le fichier existe</string>
  <string name="move_file_invalid_into_descendent">Il n\'est pas possible de déplacer un dossier vers un de ses descendants</string>
  <string name="move_file_invalid_overwrite">Le fichier existe déjà dans le dossier de destination</string>
  <string name="move_file_error">Une erreur est survenue lors de la tentative de déplacement de ce fichier ou dossier</string>
  <string name="forbidden_permissions_move">de déplacer ce fichier</string>
-  <string name="prefs_category_instant_uploading">Téléchargements instantanés</string>
+  <string name="prefs_category_instant_uploading">Envoi instantané</string>
  <string name="prefs_category_security">Sécurité</string>
+  <string name="prefs_instant_video_upload_path_title">Répertoire d\'envoi des vidéos</string>
+  <string name="shared_subject_header">partagé(e)</string>
+  <string name="with_you_subject_header">avec vous</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@ -11,14 +11,20 @@
  <string name="actionbar_settings">Preferencias</string>
  <string name="actionbar_see_details">Detalles</string>
  <string name="actionbar_send_file">Enviar</string>
+  <string name="actionbar_sort">Ordenar</string>
+  <string name="actionbar_sort_title">Ordenar por</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Máis novo - Máis antigo</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Xeral</string>
  <string name="prefs_category_more">Máis</string>
  <string name="prefs_accounts">Contas</string>
-  <string name="prefs_manage_accounts">Xestionar as contas</string>
+  <string name="prefs_manage_accounts">Administrar as contas</string>
  <string name="prefs_pincode">PIN da aplicación</string>
-  <string name="prefs_pincode_summary">Protexe o seu cliente</string>
+  <string name="prefs_pincode_summary">Protexa o seu cliente</string>
  <string name="prefs_instant_upload">Envío instantáneo de fotos</string>
  <string name="prefs_instant_upload_summary">Enviar instantaneamente as fotos tiradas coa cámara</string>
  <string name="prefs_instant_video_upload">Envío instantáneo de vídeos</string>
@ -32,7 +38,11 @@
  <string name="prefs_recommend">Recomendar a un amigo</string>
  <string name="prefs_feedback">Comentarios</string>
  <string name="prefs_imprint">Impresión</string>
+  <string name="prefs_remember_last_share_location">Lembrar a localización da compartición</string>
+  <string name="prefs_remember_last_upload_location_summary">Lembrar a localización do envío da última compartición</string>
  <string name="recommend_subject">Tente %1$s no seu teléfono intelixente!</string>
+  <string name="recommend_text">Quero convidalo a empregar %1$s no seu teléfono intelixente!
+Descárgueo de aquí: %2$s</string>
  <string name="auth_check_server">Comprobar o servidor</string>
  <string name="auth_host_url">Enderezo do servidor https://…</string>
  <string name="auth_username">Nome de usuario</string>
@ -50,9 +60,14 @@
  <string name="uploader_wrn_no_content_text">Non se recibiu contido. Non hai nada para enviar.</string>
  <string name="uploader_error_forbidden_content">%1$s non ten permiso para acceder ao contido compartido</string>
  <string name="uploader_info_uploading">Enviando</string>
+  <string name="file_list_seconds_ago">segundos atrás</string>
  <string name="file_list_empty">Aquí non hai nada. Envíe algo!</string>
  <string name="file_list_loading">Cargando...</string>
  <string name="local_file_list_empty">Non hai ficheiros neste cartafol.</string>
+  <string name="file_list_folder">cartafol</string>
+  <string name="file_list_folders">cartafoles</string>
+  <string name="file_list_file">ficheiro</string>
+  <string name="file_list_files">ficheiros</string>
  <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
  <string name="filedetails_size">Tamaño:</string>
  <string name="filedetails_type">Tipo:</string>
@ -105,6 +120,7 @@
  <string name="sync_fail_in_favourites_content">Non foi posíbel sincronizar o contido de %1$d ficheiros (%2$d conflitos)</string>
  <string name="sync_foreign_files_forgotten_ticker">Algúns ficheiros locais foron esquecidos</string>
  <string name="sync_foreign_files_forgotten_content">Non é posíbel copiar %1$d ficheiros do cartafol %2$s en</string>
+  <string name="sync_foreign_files_forgotten_explanation">Desde a versión 1.3.16, os ficheiros enviados desde este dispositivo cópianse no cartafol local %1$s para evitar a perda de datos cando se sincroniza un ficheiro con varias contas.\n\nPor mor deste cambio, todos os ficheiros enviados coas versións anteriores desta aplicación cópianse no cartafol %2$s. Porén, un erro impediu a finalización desta operación durante a sincronización da conta. É posíbel deixar o(s) ficheiro(s) como está(n) e retirar a ligazón a %3$s, ou mover o(s) ficheiro(s) ao directorio %1$s e manter a ligazón a %4$s.\n\nA seguir enuméranse o(s) ficheiro(s) local(is), e o(s) ficheiro(s) remoto(s) en %5$s co(s) que estaba(n) ligado(s).</string>
  <string name="sync_current_folder_was_removed">O cartafol %1$s xa non existe</string>
  <string name="foreign_files_move">Mover todo</string>
  <string name="foreign_files_success">Foron movidos todos os ficheiros</string>
@ -238,9 +254,12 @@
  <string name="preview_image_description">Vista previa da imaxe</string>
  <string name="preview_image_error_unknown_format">Esta imaxe non pode ser amosada</string>
  <string name="error__upload__local_file_not_copied">Non foi posíbel copiar %1$s no cartafol local %2$s</string>
+  <string name="prefs_instant_upload_path_title">Enviar a ruta</string>
  <string name="share_link_no_support_share_api">O seu servidor non ten activada a opción de compartir. Póñase en contacto co
 		administrador.</string>
+  <string name="share_link_file_no_exist">Non foi posíbel compartir. Comprobe que existe o ficheiro</string>
  <string name="share_link_file_error">Produciuse un erro ao tentar compartir este ficheiro ou cartafol.</string>
+  <string name="unshare_link_file_no_exist">Non foi posíbel deixar de compartir. Comprobe que existe o ficheiro</string>
  <string name="unshare_link_file_error">Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol</string>
  <string name="activity_chooser_send_file_title">Enviar</string>
  <string name="copy_link">Copiar a ligazón</string>
@ -261,9 +280,26 @@
  <string name="downloader_download_file_not_found">O ficheiro xa non está dispoñíbel no servidor</string>
  <string name="prefs_category_accounts">Contas</string>
  <string name="prefs_add_account">Engadir unha conta</string>
+  <string name="auth_redirect_non_secure_connection_title">A conexión segura está a ser redirixida a unha ruta non segura.</string>
+  <string name="actionbar_logger">Rexistros</string>
+  <string name="log_send_history_button">Enviar o historial</string>
+  <string name="log_send_no_mail_app">Non se atopou unha aplicación para enviar os rexistros. Instale unha aplicación de correo!</string>
+  <string name="log_send_mail_subject">Rexistros da aplicación %1$s Android</string>
+  <string name="log_progress_dialog_text">Cargando os datos...</string>
  <string name="saml_authentication_required_text">Requírese autenticación</string>
  <string name="saml_authentication_wrong_pass">Contrasinal incorrecto</string>
  <string name="actionbar_move">Mover</string>
-  <string name="move_choose_button_text">Escoller</string>
+  <string name="file_list_empty_moving">Aquí non hai nada. Pode engadir un cartafol!</string>
+  <string name="folder_picker_choose_button_text">Escoller</string>
+  <string name="move_file_not_found">Non é posíbel movelo. Comprobe se existe o ficheiro</string>
+  <string name="move_file_invalid_into_descendent">Non é posíbel mover un cartafol cara un descendente</string>
+  <string name="move_file_invalid_overwrite">Este ficheiro xa existe no cartafol de destino</string>
+  <string name="move_file_error">Produciuse un erro ao tentar mover este ficheiro ou cartafol.</string>
+  <string name="forbidden_permissions_move">para mover este ficheiro</string>
+  <string name="prefs_category_instant_uploading">Envío instantáneo</string>
  <string name="prefs_category_security">Seguranza</string>
+  <string name="prefs_instant_video_upload_path_title">Enviar a ruta do vídeo</string>
+  <string name="shared_subject_header">compartido</string>
+  <string name="with_you_subject_header">con vostede</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@ -50,9 +50,14 @@
  <string name="uploader_wrn_no_content_text">לא התקבל תוכן. אין מה להעלות.</string>
  <string name="uploader_error_forbidden_content">ל־%1$s אין הרשאה לגשת לתוכן המשותף שלך</string>
  <string name="uploader_info_uploading">בהעלאה</string>
+  <string name="file_list_seconds_ago">שניות</string>
  <string name="file_list_empty">אין כאן שום דבר. אולי ברצונך להעלות משהו?</string>
  <string name="file_list_loading">בטעינה...</string>
  <string name="local_file_list_empty">אין קבצים בתיקייה זו:</string>
+  <string name="file_list_folder">תקיה</string>
+  <string name="file_list_folders">תקיות</string>
+  <string name="file_list_file">קובץ</string>
+  <string name="file_list_files">קבצים</string>
  <string name="filedetails_select_file">יש לגעת בקובץ כדי להציג פרטים נוספים.</string>
  <string name="filedetails_size">גודל:</string>
  <string name="filedetails_type">סוג:</string>
@ -262,6 +267,6 @@
  <string name="downloader_download_file_not_found">הקובץ אינו זמין יותר על השרת</string>
  <string name="prefs_category_accounts">חשבונות</string>
  <string name="prefs_add_account">הוספת חשבון</string>
-  <string name="move_choose_button_text">בחירה</string>
+  <string name="folder_picker_choose_button_text">בחירה</string>
  <string name="prefs_category_security">אבטחה</string>
 </resources>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@ -17,7 +17,12 @@
  <string name="setup_btn_connect">Poveži</string>
  <string name="uploader_btn_upload_text">Učitaj</string>
  <string name="uploader_wrn_no_account_quit_btn_text">Izlaz</string>
+  <string name="file_list_seconds_ago">prije par sekundi</string>
  <string name="file_list_empty">Nema ničega u ovoj mapi. Pošalji nešto!</string>
+  <string name="file_list_folder">mapa</string>
+  <string name="file_list_folders">mape</string>
+  <string name="file_list_file">datoteka</string>
+  <string name="file_list_files">datoteke</string>
  <string name="filedetails_download">Preuzimanje</string>
  <string name="action_share_file">Podijelite vezu</string>
  <string name="common_yes">Da</string>
@ -37,6 +42,6 @@
  <string name="prefs_category_accounts">Korisnićki računi</string>
  <string name="saml_authentication_required_text">Potrebna autentikacija</string>
  <string name="saml_authentication_wrong_pass">Pogrešna lozinka</string>
-  <string name="move_choose_button_text">Izaberi</string>
+  <string name="folder_picker_choose_button_text">Odaberite</string>
  <string name="prefs_category_security">Sigurnost</string>
 </resources>
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@ -50,9 +50,14 @@
  <string name="uploader_wrn_no_content_text">Nem jött tartalom. Nincs mit feltölteni.</string>
  <string name="uploader_error_forbidden_content">%1$s nem jogosult a megosztott tartalom elérésére</string>
  <string name="uploader_info_uploading">Feltöltés</string>
+  <string name="file_list_seconds_ago">pár másodperce</string>
  <string name="file_list_empty">Itt nincs semmi. Töltsön fel valamit!</string>
  <string name="file_list_loading">Betöltés...</string>
  <string name="local_file_list_empty">Nincs fájl ebben a mappában.</string>
+  <string name="file_list_folder">mappa</string>
+  <string name="file_list_folders">mappák</string>
+  <string name="file_list_file">fájl</string>
+  <string name="file_list_files">fájlok</string>
  <string name="filedetails_select_file">Érintsen meg egy fájlt a további információkért.</string>
  <string name="filedetails_size">Méret:</string>
  <string name="filedetails_type">Tipus:</string>
@ -241,8 +246,12 @@
  <string name="clipboard_text_copied">Bemásolva a vágólapra</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Fiókok</string>
+  <string name="prefs_add_account">Fiók hozzáadása</string>
+  <string name="actionbar_logger">Naplók</string>
  <string name="saml_authentication_required_text">Felhasználóazonosítás szükséges</string>
  <string name="saml_authentication_wrong_pass">Hibás jelszó</string>
-  <string name="move_choose_button_text">Válasszon</string>
+  <string name="actionbar_move">Mozgatás</string>
+  <string name="folder_picker_choose_button_text">Válasszon</string>
  <string name="prefs_category_security">Biztonság</string>
+  <string name="shared_subject_header">Megosztott</string>
 </resources>
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@ -15,6 +15,7 @@
  <string name="sync_string_files">Files</string>
  <string name="setup_btn_connect">Connecte</string>
  <string name="uploader_btn_upload_text">Incargar</string>
+  <string name="file_list_seconds_ago">secundas passate</string>
  <string name="file_list_empty">Nihil hic. Incarga alcun cosa!</string>
  <string name="filedetails_download">Discargar</string>
  <string name="action_share_file">Compartir ligamine</string>
@ -28,5 +29,5 @@
  <string name="uploader_info_dirname">Nomine de dossier</string>
  <string name="activity_chooser_send_file_title">Invia</string>
  <string name="empty"></string>
-  <string name="move_choose_button_text">Seliger</string>
+  <string name="folder_picker_choose_button_text">Seliger</string>
 </resources>
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@ -38,8 +38,10 @@
  <string name="prefs_recommend">Rekomendasikan ke teman</string>
  <string name="prefs_feedback">Umpan balik</string>
  <string name="prefs_imprint">Jejak</string>
+  <string name="prefs_remember_last_share_location">Ingat lokasi berbagi</string>
+  <string name="prefs_remember_last_upload_location_summary">Ingat lokasi unggahan berbagi terakhir</string>
  <string name="recommend_subject">Cobalah %1$s pada ponsel cerdas Anda!</string>
-  <string name="recommend_text">Saya ingin mengajak Anda untuk menggunakan %1$s di ponsel cerdas Anda!\nUnduh gratis disini: %2$s</string>
+  <string name="recommend_text">Saya mengajak Anda untuk menggunakan %1$s di ponsel cerdas Anda!\nUnduh gratis disini: %2$s</string>
  <string name="auth_check_server">Periksa Server</string>
  <string name="auth_host_url">Alamat server https://…</string>
  <string name="auth_username">Nama Pengguna</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Tidak ada konten yang diterima. Tidak ada yang diunggah</string>
  <string name="uploader_error_forbidden_content">%1$s tidak diizinkan mengakses konten berbagi</string>
  <string name="uploader_info_uploading">Mengunggah</string>
+  <string name="file_list_seconds_ago">beberapa detik yang lalu</string>
  <string name="file_list_empty">Tidak ada apa-apa di sini. Unggah sesuatu!</string>
  <string name="file_list_loading">Memuat...</string>
  <string name="local_file_list_empty">Tidak ada satupun berkas dalam folder ini.</string>
+  <string name="file_list_folder">folder</string>
+  <string name="file_list_folders">folder-folder</string>
+  <string name="file_list_file">berkas</string>
+  <string name="file_list_files">berkas-berkas</string>
  <string name="filedetails_select_file">Sentuh pada berkas untuk menampilkan informasi tambahan</string>
  <string name="filedetails_size">Ukuran:</string>
  <string name="filedetails_type">Tipe:</string>
@ -112,7 +119,7 @@
  <string name="sync_fail_in_favourites_content">Konten berkas %1$d tidak dapat disinkronasikan (%2$d konflik)</string>
  <string name="sync_foreign_files_forgotten_ticker">Beberapa berkas lokal terlupakan</string>
  <string name="sync_foreign_files_forgotten_content">%1$d berkas diluar folder %2$s tidak dapat disalin kedalamnya</string>
-  <string name="sync_foreign_files_forgotten_explanation">Sejak versi  1.3.16, berkas-berkas yang diunggah dari piranti ini akan disalin kedalam folder %1$s lokal untuk mencagah kehilangan data ketika berkas tunggal disinkronkan dengan akun lebih dari satu.\n\nAkibat perubahan ini, semua berkas yang diunggah di versi aplikasi sebelumnya disalin kedalam folder %2$s. Namun, sebuah kesalahan mencegah penyelesaian operasi ini saat sinkronisasi berlangsung akun. Anda boleh meninggalkan berkas seperti ini dan menghapus tautan ke %3$s atau memindahkan berkas kedalam folder %1$s dan membiarkan tautan ke %4$s.\n\nYang tampak dibawah adalah berkas lokal, dan berkas remote didalam %5$s yang dihubungkan dengannya.</string>
+  <string name="sync_foreign_files_forgotten_explanation">Sejak versi  1.3.16, berkas-berkas yang diunggah dari piranti ini akan disalin kedalam folder %1$s lokal untuk mencagah kehilangan data saat berkas tunggal disinkronkan dengan akun lebih dari satu.\n\nAkibat perubahan ini, semua berkas yang diunggah di versi aplikasi sebelumnya disalin kedalam folder %2$s. Namun, sebuah kesalahan mencegah penyelesaian operasi ini saat sinkronisasi akun. Anda boleh meninggalkan berkas seperti ini dan menghapus tautan ke %3$s atau memindahkan berkas kedalam folder %1$s dan membiarkan tautan ke %4$s.\n\nYang tampak dibawah adalah berkas lokal, dan berkas remote didalam %5$s yang dihubungkan dengannya.</string>
  <string name="sync_current_folder_was_removed">Folder %1$s tidak ada lagi</string>
  <string name="foreign_files_move">Pindahkan semua</string>
  <string name="foreign_files_success">Semua berkas sudah dipindahkan</string>
@ -228,7 +235,7 @@
  <string name="ssl_validator_label_signature">Tanda tangan:</string>
  <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
  <string name="ssl_validator_null_cert">Sertifikat tidak dapat ditampilkan.</string>
-  <string name="ssl_validator_no_info_about_error">- Tidak ada informasi tantang terror</string>
+  <string name="ssl_validator_no_info_about_error">- Tidak ada informasi tantang error</string>
  <string name="placeholder_sentence">Ini adalah placeholder</string>
  <string name="placeholder_filename">placeholder.txt</string>
  <string name="placeholder_filetype">Gambar PNG</string>
@ -275,13 +282,11 @@
  <string name="auth_redirect_non_secure_connection_title">Sambungan aman dialihkan ke rute yang tidak aman.</string>
  <string name="actionbar_logger">Log</string>
  <string name="log_send_history_button">Kirim Riwayat</string>
-  <string name="log_mail_subject">Log apl ownCloud Android</string>
-  <string name="log_progress_dialog_text">Memuat data...</string>
  <string name="saml_authentication_required_text">Diperlukan otentikasi</string>
  <string name="saml_authentication_wrong_pass">Sandi salah</string>
  <string name="actionbar_move">Pindah</string>
  <string name="file_list_empty_moving">Tdak ada apapun disini. Anda dapat menambahkan sebuah folder!</string>
-  <string name="move_choose_button_text">Pilih</string>
+  <string name="folder_picker_choose_button_text">Pilih</string>
  <string name="move_file_not_found">Tidak dapat memindahkan. Silakan periksa apakah berkas ada</string>
  <string name="move_file_invalid_into_descendent">Tidak mungkin untuk memindahkan folder kedalam turunannya</string>
  <string name="move_file_invalid_overwrite">Berkas sudah ada didalam folder tujuan</string>
@ -289,4 +294,5 @@
  <string name="forbidden_permissions_move">untuk memindahkan berkas ini</string>
  <string name="prefs_category_instant_uploading">Unggah Cepat</string>
  <string name="prefs_category_security">Keamanan</string>
+  <string name="shared_subject_header">dibagikan</string>
 </resources>
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@ -12,6 +12,7 @@
  <string name="auth_password">Lykilorð</string>
  <string name="sync_string_files">Skrár</string>
  <string name="uploader_btn_upload_text">Senda inn</string>
+  <string name="file_list_seconds_ago">sek.</string>
  <string name="file_list_empty">Ekkert hér. Settu eitthvað inn!</string>
  <string name="filedetails_download">Niðurhal</string>
  <string name="common_yes">Já</string>
@ -26,5 +27,5 @@
  <string name="common_remove">Fjarlægja</string>
  <string name="activity_chooser_send_file_title">Senda</string>
  <string name="empty"></string>
-  <string name="move_choose_button_text">Veldu</string>
+  <string name="folder_picker_choose_button_text">Veldu</string>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -35,9 +35,11 @@
  <string name="prefs_log_summary_history">Mostra i log registrati</string>
  <string name="prefs_log_delete_history_button">Elimina la cronologia</string>
  <string name="prefs_help">Aiuto</string>
-  <string name="prefs_recommend">Consiglia ad un amico</string>
+  <string name="prefs_recommend">Consiglia a un amico</string>
  <string name="prefs_feedback">Segnalazioni</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Ricorda la posizione della condivisione</string>
+  <string name="prefs_remember_last_upload_location_summary">Ricorda l\'ultima posizione di caricamento della condivisione</string>
  <string name="recommend_subject">Prova %1$s sul tuo smartphone!</string>
  <string name="recommend_text">Vorrei invitarti a usare %1$s sul tuo smartphone!\nScarica qui: %2$s</string>
  <string name="auth_check_server">Verifica server</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Non è stato ricevuto alcun contenuto. Niente da caricare.</string>
  <string name="uploader_error_forbidden_content">%1$s non è abilitato ad accedere al contenuto condiviso</string>
  <string name="uploader_info_uploading">Caricamento in corso</string>
+  <string name="file_list_seconds_ago">secondi fa</string>
  <string name="file_list_empty">Non c\'è niente qui. Carica qualcosa!</string>
  <string name="file_list_loading">Caricamento in corso...</string>
  <string name="local_file_list_empty">Non ci sono file in questa cartella.</string>
+  <string name="file_list_folder">cartella</string>
+  <string name="file_list_folders">cartelle</string>
+  <string name="file_list_file">file</string>
+  <string name="file_list_files">file</string>
  <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
  <string name="filedetails_size">Dimensione:</string>
  <string name="filedetails_type">Tipo:</string>
@ -74,7 +81,7 @@
  <string name="common_no">No</string>
  <string name="common_ok">OK</string>
  <string name="common_cancel_download">Annulla lo scaricamento</string>
-  <string name="common_cancel_upload">Annulla invio</string>
+  <string name="common_cancel_upload">Annulla caricamento</string>
  <string name="common_cancel">Annulla</string>
  <string name="common_save_exit">Salva ed esci</string>
  <string name="common_error">Errore</string>
@ -242,7 +249,7 @@
  <string name="conflict_message">Il file remoto %s non è sincronizzato con il file locale. Se continui, il contenuto del file sarà sostituito sul server.</string>
  <string name="conflict_keep_both">Mantieni entrambi</string>
  <string name="conflict_overwrite">Sovrascrivi</string>
-  <string name="conflict_dont_upload">Non inviare</string>
+  <string name="conflict_dont_upload">Non caricare</string>
  <string name="preview_image_description">Anteprima dell\'immagine</string>
  <string name="preview_image_error_unknown_format">Questa immagine non può essere mostrata</string>
  <string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">La connessione sicura è rediretta su un percorso non sicuro.</string>
  <string name="actionbar_logger">Registri</string>
  <string name="log_send_history_button">Invia cronologia</string>
-  <string name="log_mail_subject">Registri applicazione ownCloud Android</string>
-  <string name="log_progress_dialog_text">Caricamento dati...</string>
+  <string name="log_send_no_mail_app">Non è stata trovata alcuna applicazione per l\'invio dei registri. Installa l\'applicazione mail!</string>
+  <string name="log_send_mail_subject">Registri applicazione %1$s Android</string>
+  <string name="log_progress_dialog_text">Caricamento dati in corso...</string>
  <string name="saml_authentication_required_text">Autenticazione richiesta</string>
  <string name="saml_authentication_wrong_pass">Password errata</string>
  <string name="actionbar_move">Sposta</string>
  <string name="file_list_empty_moving">Qui non c\'è niente. Puoi aggiungere una cartella.</string>
-  <string name="move_choose_button_text">Scegli</string>
+  <string name="folder_picker_choose_button_text">Scegli</string>
  <string name="move_file_not_found">Impossibile spostare. Assicurati che il file esista</string>
  <string name="move_file_invalid_into_descendent">Impossibile spostare una cartella in una cartella inferiore</string>
  <string name="move_file_invalid_overwrite">Il file esiste già nella cartella di destinazione</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">per spostare questo file</string>
  <string name="prefs_category_instant_uploading">Caricamenti istantanei</string>
  <string name="prefs_category_security">Protezione</string>
+  <string name="prefs_instant_video_upload_path_title">Percorso di caricamento video</string>
+  <string name="shared_subject_header">condiviso</string>
+  <string name="with_you_subject_header">con te</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">友達に推薦</string>
  <string name="prefs_feedback">フィードバック</string>
  <string name="prefs_imprint">インプリント</string>
+  <string name="prefs_remember_last_share_location">共有場所を記憶する</string>
+  <string name="prefs_remember_last_upload_location_summary">最後に共有アップロードした場所を記憶する</string>
  <string name="recommend_subject">スマートフォンで %1$s を試してください！</string>
  <string name="recommend_text">スマートフォンで %1$s を利用してみませんか！
 ここからダウンロードしてください: %2$s</string>
@ -58,9 +60,14 @@
  <string name="uploader_wrn_no_content_text">コンテンツを受信しませんでした。アップロードするものはありません。</string>
  <string name="uploader_error_forbidden_content">%1$sで共有コンテンツへのアクセスが許可されていません。</string>
  <string name="uploader_info_uploading">アップロード中</string>
+  <string name="file_list_seconds_ago">数秒前</string>
  <string name="file_list_empty">ここには何もありません。何かアップロードしてください。</string>
  <string name="file_list_loading">読込中 ...</string>
  <string name="local_file_list_empty">このフォルダーにはファイルがありません。</string>
+  <string name="file_list_folder">フォルダ</string>
+  <string name="file_list_folders">フォルダ</string>
+  <string name="file_list_file">ファイル</string>
+  <string name="file_list_files">ファイル</string>
  <string name="filedetails_select_file">ファイルをタップすると追加情報が表示されます。</string>
  <string name="filedetails_size">サイズ:</string>
  <string name="filedetails_type">タイプ:</string>
@ -276,13 +283,14 @@
  <string name="auth_redirect_non_secure_connection_title">暗号化接続は非暗号化接続にリダイレクトされました。</string>
  <string name="actionbar_logger">ログ</string>
  <string name="log_send_history_button">ログを送信</string>
-  <string name="log_mail_subject">ownCloud Android アプリログ</string>
+  <string name="log_send_no_mail_app">ログを送るアプリが見つかりませんでした。メールアプリをインストールして下さい。</string>
+  <string name="log_send_mail_subject">%1$s アンドロイドアプリログ</string>
  <string name="log_progress_dialog_text">読込中 ...</string>
  <string name="saml_authentication_required_text">認証を必要とする</string>
  <string name="saml_authentication_wrong_pass">無効なパスワード</string>
  <string name="actionbar_move">移動</string>
  <string name="file_list_empty_moving">ファイルが有りません。フォルダを追加してください。</string>
-  <string name="move_choose_button_text">選択</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>
@ -290,4 +298,8 @@
  <string name="forbidden_permissions_move">このファイルを移動</string>
  <string name="prefs_category_instant_uploading">自動アップロード</string>
  <string name="prefs_category_security">セキュリティ</string>
+  <string name="prefs_instant_video_upload_path_title">動画のアップロードパス</string>
+  <string name="shared_subject_header">共有中</string>
+  <string name="with_you_subject_header">あなたと</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@ -30,6 +30,7 @@
  <string name="uploader_wrn_no_content_text">კონტენტი არ იქნა მიღებული. არაფერია ასატვირთად.</string>
  <string name="uploader_error_forbidden_content">%1$s–ი არ დაიშვება გაზიარებული კონტენტის სანახავად</string>
  <string name="uploader_info_uploading">მიმდინარეობს ატვირთვა</string>
+  <string name="file_list_seconds_ago">წამის წინ</string>
  <string name="file_list_empty">აქ არაფერი არ არის. ატვირთე რამე!</string>
  <string name="filedetails_select_file">დააჭირეთ ფაილს დამატებითი ინფორმაციის გამოსაჩენად.</string>
  <string name="filedetails_size">ზომა:</string>
@ -150,6 +151,6 @@
  <string name="clipboard_text_copied">კოპირებულია კლიპბორდში</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">ანგარიში</string>
-  <string name="move_choose_button_text">არჩევა</string>
+  <string name="folder_picker_choose_button_text">არჩევა</string>
  <string name="prefs_category_security">უსაფრთხოება</string>
 </resources>
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@ -23,6 +23,7 @@
  <string name="uploader_wrn_no_account_setup_btn_text">ដំឡើង</string>
  <string name="uploader_wrn_no_account_quit_btn_text">ចាក់ចេញ</string>
  <string name="uploader_info_uploading">កំពុងផ្ទុកឡើង</string>
+  <string name="file_list_seconds_ago">វិនាទីមុន</string>
  <string name="file_list_empty">គ្មានអ្វីនៅទីនេះទេ។ ផ្ទុកឡើងអ្វីមួយ!</string>
  <string name="filedetails_select_file">ចុចមួយលើឯកសារ ដើម្បីបង្ហាញព័ត៌មានបន្ថែម។</string>
  <string name="filedetails_size">ទំហំ៖</string>
@ -84,6 +85,6 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">គណនី</string>
  <string name="saml_authentication_wrong_pass">ខុសពាក្យសម្ងាត់</string>
-  <string name="move_choose_button_text">ជ្រើស</string>
+  <string name="folder_picker_choose_button_text">ជ្រើស</string>
  <string name="prefs_category_security">សុវត្ថិភាព</string>
 </resources>
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@ -1,6 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="actionbar_upload">ಪೇರಿಸು</string>
+  <string name="actionbar_upload_files">ಕಡತಗಳು</string>
+  <string name="actionbar_mkdir">ಹೊಸ ಕಡತಕೋಶ</string>
+  <string name="actionbar_settings">ಆಯ್ಕೆ</string>
+  <string name="actionbar_send_file">ಕಳುಹಿಸಿ</string>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
+  <string name="prefs_category_more">ಇನ್ನಷ್ಟು</string>
+  <string name="prefs_help">ಸಹಾಯ</string>
+  <string name="prefs_imprint">ಮುದ್ರೆ</string>
+  <string name="auth_username">ಬಳಕೆಯ ಹೆಸರು</string>
+  <string name="auth_password">ಗುಪ್ತ ಪದ</string>
+  <string name="sync_string_files">ಕಡತಗಳು</string>
+  <string name="uploader_btn_upload_text">ಪೇರಿಸು</string>
+  <string name="filedetails_download">ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ</string>
+  <string name="action_share_file">ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು</string>
+  <string name="common_yes">ಹೌದು</string>
+  <string name="common_no">ಇಲ್ಲ</string>
+  <string name="common_ok">ಸರಿ</string>
+  <string name="common_cancel_upload">ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ</string>
+  <string name="common_cancel">ರದ್ದು</string>
+  <string name="common_error">ತಪ್ಪಾಗಿದೆ</string>
+  <string name="common_error_unknown">ಗೊತ್ತಿಲ್ಲದ ದೋಷ</string>
+  <string name="change_password">ಗುಪ್ತ ಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
+  <string name="common_rename">ಮರುಹೆಸರಿಸು</string>
+  <string name="common_remove">ತೆಗೆದುಹಾಕಿ</string>
+  <string name="activity_chooser_send_file_title">ಕಳುಹಿಸಿ</string>
  <string name="empty"></string>
+  <string name="saml_authentication_required_text">ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ</string>
+  <string name="saml_authentication_wrong_pass">ದುರ್ಬಲ ಗುಪ್ತಪದ</string>
+  <string name="folder_picker_choose_button_text">ಆಯ್ಕೆ</string>
+  <string name="prefs_category_security">ಭದ್ರತೆ</string>
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -45,7 +45,12 @@
  <string name="uploader_wrn_no_content_text">받은 콘텐츠가 없습니다. 업로드할 항목이 없습니다.</string>
  <string name="uploader_error_forbidden_content">%1$s에서 공유된 콘텐츠에 접근할 수 없습니다</string>
  <string name="uploader_info_uploading">업로드 중</string>
+  <string name="file_list_seconds_ago">초 전</string>
  <string name="file_list_empty">내용이 없습니다. 업로드할 수 있습니다!</string>
+  <string name="file_list_folder">폴더</string>
+  <string name="file_list_folders">폴더</string>
+  <string name="file_list_file">파일</string>
+  <string name="file_list_files">파일</string>
  <string name="filedetails_select_file">파일을 누르면 추가 정보가 표시됩니다.</string>
  <string name="filedetails_size">크기:</string>
  <string name="filedetails_type">종류:</string>
@ -218,6 +223,7 @@
  <string name="prefs_category_accounts">계정</string>
  <string name="saml_authentication_required_text">인증 필요함</string>
  <string name="saml_authentication_wrong_pass">잘못된 암호</string>
-  <string name="move_choose_button_text">선택</string>
+  <string name="folder_picker_choose_button_text">선택</string>
  <string name="prefs_category_security">보안</string>
+  <string name="shared_subject_header">공유됨</string>
 </resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@ -24,7 +24,12 @@
  <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
  <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
  <string name="uploader_info_uploading">Eroplueden</string>
+  <string name="file_list_seconds_ago">Sekonnen hir</string>
  <string name="file_list_empty">Hei ass näischt. Lued eppes rop!</string>
+  <string name="file_list_folder">Dossier</string>
+  <string name="file_list_folders">Dossieren</string>
+  <string name="file_list_file">Datei</string>
+  <string name="file_list_files">Dateien</string>
  <string name="filedetails_size">Gréisst:</string>
  <string name="filedetails_type">Typ:</string>
  <string name="filedetails_created">Erstallt:</string>
@ -86,5 +91,5 @@
  <string name="activity_chooser_send_file_title">Schécken</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Accounten</string>
-  <string name="move_choose_button_text">Auswielen</string>
+  <string name="folder_picker_choose_button_text">Auswielen</string>
 </resources>
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+    	<item>Biggest - Smallest</item>-->
+  <string name="empty"></string>
+</resources>
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@ -11,6 +11,12 @@
  <string name="actionbar_settings">Nustatymai</string>
  <string name="actionbar_see_details">Informacija</string>
  <string name="actionbar_send_file">Siųsti</string>
+  <string name="actionbar_sort">Rikiuoti</string>
+  <string name="actionbar_sort_title">Rikiuoti pagal</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Naujausi - Seniausi</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Bendras</string>
@ -32,6 +38,8 @@
  <string name="prefs_recommend">Rekomenduoti draugui</string>
  <string name="prefs_feedback">Atsiliepimai</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Prisiminti bendrinimo vietą</string>
+  <string name="prefs_remember_last_upload_location_summary">Prisiminti paskutinio bendrinimo įkėlimo vietą</string>
  <string name="recommend_subject">Išbandykite %1$s savo išmaniajame telefone!</string>
  <string name="auth_check_server">Patikrinti Serverį</string>
  <string name="auth_host_url">Serverio adresas </string>
@ -50,9 +58,14 @@
  <string name="uploader_wrn_no_content_text">nebuvo gauta turinio. Nėra įkeltino turinio</string>
  <string name="uploader_error_forbidden_content">%1$s neleidžiama prieiti prie turinio, kuriuo dalijamasi</string>
  <string name="uploader_info_uploading">Išsiunčiama</string>
+  <string name="file_list_seconds_ago">prieš sekundę</string>
  <string name="file_list_empty">Čia tuščia. Įkelkite ką nors!</string>
  <string name="file_list_loading">Įkeliama ...</string>
  <string name="local_file_list_empty">Šiame aplanke nėra failų.</string>
+  <string name="file_list_folder">katalogas</string>
+  <string name="file_list_folders">katalogai</string>
+  <string name="file_list_file">failas</string>
+  <string name="file_list_files">failai</string>
  <string name="filedetails_select_file">Palieskite failą, kad parodyti papildomą informaciją.</string>
  <string name="filedetails_size">Dydis:</string>
  <string name="filedetails_type">Tipas:</string>
@ -235,6 +248,7 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">Paskyros</string>
  <string name="saml_authentication_wrong_pass">Neteisingas slaptažodis</string>
-  <string name="move_choose_button_text">Pasirinkite</string>
+  <string name="folder_picker_choose_button_text">Pasirinkite</string>
  <string name="prefs_category_security">Saugumas</string>
+  <string name="shared_subject_header">bendrinamas</string>
 </resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@ -28,7 +28,12 @@
  <string name="uploader_wrn_no_content_text">Nav saņemts nekāds saturs. Nav ko augšupielādēt.</string>
  <string name="uploader_error_forbidden_content">%1$s nedrīkst piekļūt koplietotajam saturam</string>
  <string name="uploader_info_uploading">Augšupielādē</string>
+  <string name="file_list_seconds_ago">sekundes atpakaļ</string>
  <string name="file_list_empty">Te vēl nekas nav. Rīkojies, sāc augšupielādēt!</string>
+  <string name="file_list_folder">mape</string>
+  <string name="file_list_folders">mapes</string>
+  <string name="file_list_file">fails</string>
+  <string name="file_list_files">faili</string>
  <string name="filedetails_select_file">Uzsitiet uz datnes, lai redzētu papildinformāciju.</string>
  <string name="filedetails_size">Izmērs:</string>
  <string name="filedetails_type">Tips:</string>
@ -144,6 +149,6 @@
  <string name="activity_chooser_send_file_title">Sūtīt</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Konti</string>
-  <string name="move_choose_button_text">Izvēlieties</string>
+  <string name="folder_picker_choose_button_text">Izvēlieties</string>
  <string name="prefs_category_security">Drošība</string>
 </resources>
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@ -28,7 +28,12 @@
  <string name="uploader_wrn_no_account_title">Не е пронајдена сметка</string>
  <string name="uploader_wrn_no_account_setup_btn_text">Нагодување</string>
  <string name="uploader_wrn_no_account_quit_btn_text">Прекини</string>
+  <string name="file_list_seconds_ago">пред секунди</string>
  <string name="file_list_empty">Тука нема ништо. Снимете нешто!</string>
+  <string name="file_list_folder">фолдер</string>
+  <string name="file_list_folders">фолдери</string>
+  <string name="file_list_file">датотека</string>
+  <string name="file_list_files">датотеки</string>
  <string name="filedetails_size">Големина:</string>
  <string name="filedetails_type">Тип:</string>
  <string name="filedetails_created">Создадено:</string>
@ -123,6 +128,7 @@
  <string name="prefs_category_accounts">Сметки</string>
  <string name="saml_authentication_required_text">Потребна е автентификација</string>
  <string name="saml_authentication_wrong_pass">Погрешна лозинка</string>
-  <string name="move_choose_button_text">Избери</string>
+  <string name="folder_picker_choose_button_text">Избери</string>
  <string name="prefs_category_security">Безбедност</string>
+  <string name="shared_subject_header">споделен</string>
 </resources>
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@ -1,6 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="actionbar_upload">Байршуулах</string>
+  <string name="actionbar_upload_files">Файлууд</string>
+  <string name="actionbar_settings">Тохиргоо</string>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
+  <string name="prefs_category_general">Ерөнхий</string>
+  <string name="auth_username">Хэрэглэгчийн нэр</string>
+  <string name="auth_password">Нууц үг</string>
+  <string name="sync_string_files">Файлууд</string>
+  <string name="uploader_btn_upload_text">Байршуулах</string>
+  <string name="create_account">Аккаунт үүсгэх</string>
+  <string name="common_remove">Устгах</string>
  <string name="empty"></string>
+  <string name="prefs_category_security">Аюулгүй байдал</string>
 </resources>
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@ -20,6 +20,10 @@
  <string name="uploader_wrn_no_account_quit_btn_text">Berhenti</string>
  <string name="uploader_info_uploading">Memuatnaik</string>
  <string name="file_list_empty">Tiada apa-apa di sini. Muat naik sesuatu!</string>
+  <string name="file_list_folder">direktori</string>
+  <string name="file_list_folders">direktori</string>
+  <string name="file_list_file">fail</string>
+  <string name="file_list_files">fail</string>
  <string name="filedetails_size">Saiz</string>
  <string name="filedetails_type">Jenis</string>
  <string name="filedetails_created">Telah dibina:</string>
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@ -7,11 +7,12 @@
  <string name="auth_username">သုံးစွဲသူအမည်</string>
  <string name="auth_password">စကားဝှက်</string>
  <string name="sync_string_files">ဖိုင်များ</string>
+  <string name="file_list_seconds_ago">စက္ကန့်အနည်းငယ်က</string>
  <string name="filedetails_download">ဒေါင်းလုတ်</string>
  <string name="common_yes">ဟုတ်</string>
  <string name="common_no">မဟုတ်ဘူး</string>
  <string name="common_ok">အိုကေ</string>
  <string name="common_cancel">ပယ်ဖျက်မည်</string>
  <string name="empty"></string>
-  <string name="move_choose_button_text">ရွေးချယ်</string>
+  <string name="folder_picker_choose_button_text">ရွေးချယ်</string>
 </resources>
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@ -51,9 +51,14 @@
  <string name="uploader_wrn_no_content_text">Intet innhold ble mottatt. Intet å laste opp.</string>
  <string name="uploader_error_forbidden_content">%1$s har ikke tilgang til det delte innholdet</string>
  <string name="uploader_info_uploading">Laster opp</string>
+  <string name="file_list_seconds_ago">for få sekunder siden</string>
  <string name="file_list_empty">Ingenting her. Last opp noe!</string>
  <string name="file_list_loading">Laster...</string>
  <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
+  <string name="file_list_folder">mappe</string>
+  <string name="file_list_folders">mapper</string>
+  <string name="file_list_file">fil</string>
+  <string name="file_list_files">filer</string>
  <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
  <string name="filedetails_size">Størrelse:</string>
  <string name="filedetails_type">Type:</string>
@ -267,17 +272,16 @@
  <string name="prefs_add_account">Legg til en konto</string>
  <string name="actionbar_logger">Logger</string>
  <string name="log_send_history_button">Send historikk</string>
-  <string name="log_mail_subject">logger for ownCloud Android app</string>
-  <string name="log_progress_dialog_text">Laster data...</string>
  <string name="saml_authentication_required_text">Autentisering kreves</string>
  <string name="saml_authentication_wrong_pass">Feil passord</string>
  <string name="actionbar_move">Flytt</string>
  <string name="file_list_empty_moving">Ingenting her. Du kan legge til en mappe!</string>
-  <string name="move_choose_button_text">Velg</string>
+  <string name="folder_picker_choose_button_text">Velg</string>
  <string name="move_file_not_found">Kan ikke flytte. Sjekk om filen eksisterer.</string>
  <string name="move_file_invalid_into_descendent">Det er ikke mulig å flytte en mappe inn i sin egen undermappe</string>
  <string name="move_file_invalid_overwrite">Filen finnes allerede i målmappen</string>
  <string name="move_file_error">En feil oppstod ved flytting av denne filen eller mappen</string>
  <string name="forbidden_permissions_move">å flytte denne filen</string>
  <string name="prefs_category_security">Sikkerhet</string>
+  <string name="shared_subject_header">delt</string>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Aanbevelen bij een vriend</string>
  <string name="prefs_feedback">Feedback</string>
  <string name="prefs_imprint">afdruk</string>
+  <string name="prefs_remember_last_share_location">Onthoud de share locatie</string>
+  <string name="prefs_remember_last_upload_location_summary">Onthoud de laatste upload locatie</string>
  <string name="recommend_subject">Probeer %1$s op uw smartphone!</string>
  <string name="recommend_text">Uitnodiging om %1$s op uw smartphone uit te proberen!
 Download hier: %2$s</string>
@ -58,9 +60,14 @@ Download hier: %2$s</string>
  <string name="uploader_wrn_no_content_text">Er werd geen inhoud ontvangen. Niets om te uploaden.</string>
  <string name="uploader_error_forbidden_content">%1$s is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
  <string name="uploader_info_uploading">Uploaden</string>
+  <string name="file_list_seconds_ago">seconden geleden</string>
  <string name="file_list_empty">Er bevindt zich hier niets. Upload een bestand!</string>
  <string name="file_list_loading">Laden ...</string>
  <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
+  <string name="file_list_folder">map</string>
+  <string name="file_list_folders">mappen</string>
+  <string name="file_list_file">bestand</string>
+  <string name="file_list_files">bestanden</string>
  <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
  <string name="filedetails_size">Grootte:</string>
  <string name="filedetails_type">Type:</string>
@ -68,7 +75,7 @@ Download hier: %2$s</string>
  <string name="filedetails_modified">Aangepast:</string>
  <string name="filedetails_download">Download</string>
  <string name="filedetails_sync_file">Bestand verversen</string>
-  <string name="filedetails_renamed_in_upload_msg">Bestand was hernoemt naar %1$s tijdens het uploaden</string>
+  <string name="filedetails_renamed_in_upload_msg">Bestand is tijdens het uploaden hernoemd naar %1$s</string>
  <string name="action_share_file">Deel link</string>
  <string name="action_unshare_file">Link niet meer delen</string>
  <string name="common_yes">Ja</string>
@ -117,7 +124,7 @@ Download hier: %2$s</string>
 Door deze aanpassing werden alle bestanden die met een eerdere versie zijn ge-uploaded gekopieerd naar de %2$s map. Maar een fout voorkwam het succesvol afronden van deze actie tijdens het synchroniseren. U kunt de/het bestand(en) laten staan zoals ze nu zijn en de link naar %3$s verwijderen, of u kunt de bestanden verplaatsen naar de %1$s map en de link naar %4$s laten staan.
 Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar verwezen.</string>
  <string name="sync_current_folder_was_removed">Map %1$s bestaat niet meer</string>
-  <string name="foreign_files_move">Alle verplaatsen</string>
+  <string name="foreign_files_move">Alles verplaatsen</string>
  <string name="foreign_files_success">Alle bestanden zijn verplaatst</string>
  <string name="foreign_files_fail">Een paar bestanden konden niet worden verplaatst</string>
  <string name="foreign_files_local_text">Lokaal: %1$s</string>
@ -278,13 +285,14 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
  <string name="auth_redirect_non_secure_connection_title">De beveiligde verbinding is omgeleid naar een onveilige route.</string>
  <string name="actionbar_logger">Logs</string>
  <string name="log_send_history_button">Verstuur geschiedenis</string>
-  <string name="log_mail_subject">ownCloud Android app logs</string>
+  <string name="log_send_no_mail_app">Geen app voor versturen van logs gevonden. Installeer de mail app!</string>
+  <string name="log_send_mail_subject">%1$s Android app logs</string>
  <string name="log_progress_dialog_text">Laden data...</string>
  <string name="saml_authentication_required_text">Authenticatie vereist</string>
  <string name="saml_authentication_wrong_pass">Onjuist wachtwoord</string>
  <string name="actionbar_move">verplaatsen</string>
  <string name="file_list_empty_moving">Niets hier. U kunt een map toevoegen!</string>
-  <string name="move_choose_button_text">Kies</string>
+  <string name="folder_picker_choose_button_text">Kies</string>
  <string name="move_file_not_found">Kan niet verplaatsen. Ga na of het bestand wel bestaat</string>
  <string name="move_file_invalid_into_descendent">De map kan niet naar een onderliggende map worden verplaatst</string>
  <string name="move_file_invalid_overwrite">Het bestand bestaat al in de doelmap</string>
@ -292,4 +300,8 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
  <string name="forbidden_permissions_move">om dit bestand te verplaatsen</string>
  <string name="prefs_category_instant_uploading">Directe uploads</string>
  <string name="prefs_category_security">Beveiliging</string>
+  <string name="prefs_instant_video_upload_path_title">Upload Video Pad</string>
+  <string name="shared_subject_header">gedeeld</string>
+  <string name="with_you_subject_header">met u</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-nn-rNO/strings.xml
+++ b/res/values-nn-rNO/strings.xml
@ -46,6 +46,7 @@
  <string name="uploader_wrn_no_content_title">Inga innhald å lasta opp</string>
  <string name="uploader_wrn_no_content_text">Mottok ikkje noko innhald. Ingenting å lasta opp.</string>
  <string name="uploader_info_uploading">Lastar opp</string>
+  <string name="file_list_seconds_ago">sekund sidan</string>
  <string name="file_list_empty">Ingenting her. Last noko opp!</string>
  <string name="filedetails_select_file">Trykk på ei fil for å visa meir informasjon.</string>
  <string name="filedetails_size">Storleik:</string>
@ -130,6 +131,6 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">Kontoar</string>
  <string name="saml_authentication_wrong_pass">Feil passord</string>
-  <string name="move_choose_button_text">Vel</string>
+  <string name="folder_picker_choose_button_text">Vel</string>
  <string name="prefs_category_security">Tryggleik</string>
 </resources>
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@ -19,7 +19,12 @@
  <string name="uploader_wrn_no_account_setup_btn_text">Configuracion</string>
  <string name="uploader_wrn_no_account_quit_btn_text">Quita</string>
  <string name="uploader_info_uploading">Al amontcargar</string>
+  <string name="file_list_seconds_ago">segonda a</string>
  <string name="file_list_empty">Pas res dedins. Amontcarga qualquaren</string>
+  <string name="file_list_folder">Dorsièr</string>
+  <string name="file_list_folders">Dorsièrs</string>
+  <string name="file_list_file">fichièr</string>
+  <string name="file_list_files">fichièrs</string>
  <string name="filedetails_size">Talha :</string>
  <string name="filedetails_type">Tipe :</string>
  <string name="filedetails_created">Creat :</string>
@ -43,5 +48,5 @@
  <string name="common_rename">Torna nomenar</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Comptes</string>
-  <string name="move_choose_button_text">Causís</string>
+  <string name="folder_picker_choose_button_text">Causís</string>
 </resources>
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@ -29,6 +29,7 @@
  <string name="uploader_wrn_no_content_title">ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਕੋਈ ਸਮੱਗਰੀ ਨਹੀਂ</string>
  <string name="uploader_wrn_no_content_text">ਕੋਈ ਸਮੱਗਰੀ ਨਹੀਂ ਮਿਲੀ। ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ ਹੈ।</string>
  <string name="uploader_info_uploading">ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="file_list_seconds_ago">ਸਕਿੰਟ ਪਹਿਲਾਂ</string>
  <string name="filedetails_select_file">ਹੋਰ ਜਾਣਕਾਰੀ ਵੇਖਣ ਲਈ ਫਾਇਲ ਉੱਤੇ ਛੂਹੋ</string>
  <string name="filedetails_size">ਆਕਾਰ:</string>
  <string name="filedetails_type">ਕਿਸਮ:</string>
@ -121,5 +122,5 @@
  <string name="activity_chooser_send_file_title">ਭੇਜੋ</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">ਅਕਾਊਂਟ</string>
-  <string name="move_choose_button_text">ਚੁਣੋ</string>
+  <string name="folder_picker_choose_button_text">ਚੁਣੋ</string>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -38,6 +38,7 @@
  <string name="prefs_recommend">Poleć znajomemu</string>
  <string name="prefs_feedback">Wsparcie</string>
  <string name="prefs_imprint">Stopka</string>
+  <string name="prefs_remember_last_share_location">Zapamiętaj położenie udostępnienia</string>
  <string name="recommend_subject">Wypróbuj %1$s na swoim smartphonie!</string>
  <string name="recommend_text">Chciałbym zaprosić Cię do używania %1$s na swoim smartfonie!\nŚciągnij tutaj: %2$s</string>
  <string name="auth_check_server">Sprawdź serwer</string>
@ -57,9 +58,14 @@
  <string name="uploader_wrn_no_content_text">Nie otrzymano danych. Nie ma nic do wysłania.</string>
  <string name="uploader_error_forbidden_content">%1$s nie ma dostępu do udostępnionych treści</string>
  <string name="uploader_info_uploading">Wysyłanie</string>
+  <string name="file_list_seconds_ago">sekund temu</string>
  <string name="file_list_empty">Pusto. Wyślij coś!</string>
  <string name="file_list_loading">Ładowanie...</string>
  <string name="local_file_list_empty">Nie ma plików w tym folderze.</string>
+  <string name="file_list_folder">folder</string>
+  <string name="file_list_folders">foldery</string>
+  <string name="file_list_file">plik</string>
+  <string name="file_list_files">pliki</string>
  <string name="filedetails_select_file">Dotknij plik aby wyświetlić dodatkowe informacje</string>
  <string name="filedetails_size">Rozmiar:</string>
  <string name="filedetails_type">Typ:</string>
@ -275,13 +281,13 @@
  <string name="auth_redirect_non_secure_connection_title">Bezpieczne połączenie jest przekierowywane przez niezabezpieczone trasy.</string>
  <string name="actionbar_logger">Logi</string>
  <string name="log_send_history_button">Wyślij historię</string>
-  <string name="log_mail_subject">Logi aplikacji ownCloud Android</string>
+  <string name="log_send_mail_subject">%1$s Logi aplikacji Android</string>
  <string name="log_progress_dialog_text">Ładuję dane...</string>
  <string name="saml_authentication_required_text">Wymagana autoryzacja</string>
  <string name="saml_authentication_wrong_pass">Złe hasło</string>
  <string name="actionbar_move">Przenieś</string>
  <string name="file_list_empty_moving">Nic tu nie ma. Możesz dodać folder!</string>
-  <string name="move_choose_button_text">Wybierz</string>
+  <string name="folder_picker_choose_button_text">Wybierz</string>
  <string name="move_file_not_found">Nie można przenieść. Proszę sprawdzić, czy plik istnieje</string>
  <string name="move_file_invalid_into_descendent">Nie jest możliwe przeniesienie folderu do potomka</string>
  <string name="move_file_invalid_overwrite">Plik istnieje już w folderze docelowym</string>
@ -289,4 +295,6 @@
  <string name="forbidden_permissions_move">aby przenieść ten plik</string>
  <string name="prefs_category_instant_uploading">Automatyczne wysyłanie</string>
  <string name="prefs_category_security">Bezpieczeństwo</string>
+  <string name="prefs_instant_video_upload_path_title">Katalog wysyłania dla wideo</string>
+  <string name="shared_subject_header">współdzielone</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Recomendar a um amigo</string>
  <string name="prefs_feedback">Feedback</string>
  <string name="prefs_imprint">Imprint</string>
+  <string name="prefs_remember_last_share_location">Lembre-se do local de compartilhamento</string>
+  <string name="prefs_remember_last_upload_location_summary">Lembrar do último local de envio de compartilhamento</string>
  <string name="recommend_subject">Tentar %1$s em seu smartfone!</string>
  <string name="recommend_text">Gostaria de convida-lo a usar %1$s em seu smartphone!\nBaixe aqui: %2$s</string>
  <string name="auth_check_server">Verificar Servidor</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Nenhum conteúdo foi recebido. Nada para enviar.</string>
  <string name="uploader_error_forbidden_content">%1$s não é permitido acessar o conteúdo compartilhado</string>
  <string name="uploader_info_uploading">Enviando</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>
  <string name="local_file_list_empty">Não existe nenhum arquivo nesta pasta.</string>
+  <string name="file_list_folder">pasta</string>
+  <string name="file_list_folders">pastas</string>
+  <string name="file_list_file">arquivo</string>
+  <string name="file_list_files">arquivos</string>
  <string name="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
  <string name="filedetails_size">Tamanho:</string>
  <string name="filedetails_type">Tipo:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Conexão segura esta redirecionada para uma rota não segura.</string>
  <string name="actionbar_logger">Logs</string>
  <string name="log_send_history_button">Enviar Histórico</string>
-  <string name="log_mail_subject">Logs do aplicativo ownCloud Android</string>
-  <string name="log_progress_dialog_text">Carregamento de dados...</string>
+  <string name="log_send_no_mail_app">Não foi encontrado nenhum app para envio de logs. Instale o mail app!</string>
+  <string name="log_send_mail_subject">%1$s logs do Android app</string>
+  <string name="log_progress_dialog_text">Carregando dados...</string>
  <string name="saml_authentication_required_text">Autenticação é requerida</string>
  <string name="saml_authentication_wrong_pass">Senha incorreta</string>
  <string name="actionbar_move">Mover</string>
  <string name="file_list_empty_moving">Nada aqui. Você pode adicionar uma pasta!</string>
-  <string name="move_choose_button_text">Escolher</string>
+  <string name="folder_picker_choose_button_text">Escolher</string>
  <string name="move_file_not_found">Não é possível mover. Por favor verifique se o arquivo existe</string>
  <string name="move_file_invalid_into_descendent">Não é possível mover a pasta para uma descendente</string>
  <string name="move_file_invalid_overwrite">O arquivo já existe na pasta de destino</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">mover este arquivo</string>
  <string name="prefs_category_instant_uploading">Envios Instantâneos</string>
  <string name="prefs_category_security">Segurança</string>
+  <string name="prefs_instant_video_upload_path_title">Enviar o Caminho do Vídeo</string>
+  <string name="shared_subject_header">compartilhado</string>
+  <string name="with_you_subject_header">com você</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="about_android">%1$s Aplicação(ões) Android</string>
+  <string name="about_android">%1$s App(s) Android</string>
  <string name="about_version">versão %1$s</string>
-  <string name="actionbar_sync">Actualizar</string>
+  <string name="actionbar_sync">Atualizar conta</string>
  <string name="actionbar_upload">Enviar</string>
-  <string name="actionbar_upload_from_apps">Conteúdo das outras apps</string>
+  <string name="actionbar_upload_from_apps">Conteúdo de outras apps</string>
  <string name="actionbar_upload_files">Ficheiros</string>
  <string name="actionbar_open_with">Abrir com</string>
  <string name="actionbar_mkdir">Nova Pasta</string>
@ -22,23 +22,25 @@
  <string name="prefs_category_general">Geral</string>
  <string name="prefs_category_more">Mais</string>
  <string name="prefs_accounts">Contas</string>
-  <string name="prefs_manage_accounts">Gerir contas</string>
-  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_manage_accounts">Gerir Contas</string>
+  <string name="prefs_pincode">PIN da App</string>
  <string name="prefs_pincode_summary">Proteja o seu cliente</string>
-  <string name="prefs_instant_upload">Transferência instantânea de imagens</string>
-  <string name="prefs_instant_upload_summary">Transferência instantânea de imagens tiradas com câmara</string>
+  <string name="prefs_instant_upload">Envios instantâneos de imagens</string>
+  <string name="prefs_instant_upload_summary">Envio instantâneo de imagens tiradas com a câmara</string>
  <string name="prefs_instant_video_upload">Envios instantâneos dos vídeos</string>
-  <string name="prefs_instant_video_upload_summary">Carregamento instantâneo de vídeos registados com a camera  </string>
-  <string name="prefs_log_title">Ativar Rastreio</string>
-  <string name="prefs_log_summary">Isto é usado para registar problemas</string>
-  <string name="prefs_log_title_history">Historico do rastreio</string>
+  <string name="prefs_instant_video_upload_summary">Envio instantâneo de vídeos gravados com a câmara  </string>
+  <string name="prefs_log_title">Ativar Registo de Eventos</string>
+  <string name="prefs_log_summary">Isto é utilizado para registar problemas</string>
+  <string name="prefs_log_title_history">Histórico dos Registos</string>
  <string name="prefs_log_summary_history">Isto mostra os registos guardados</string>
-  <string name="prefs_log_delete_history_button">Eliminar Histórico</string>
+  <string name="prefs_log_delete_history_button">Apagar Histórico</string>
  <string name="prefs_help">Ajuda</string>
  <string name="prefs_recommend">Recomendar a um amigo</string>
-  <string name="prefs_feedback">Resposta</string>
+  <string name="prefs_feedback">Feedback</string>
  <string name="prefs_imprint">Imprint</string>
-  <string name="recommend_subject">Experimente %1$s no seu smartphone!</string>
+  <string name="prefs_remember_last_share_location">Lembrar localização de partilha</string>
+  <string name="prefs_remember_last_upload_location_summary">Lembrar da última localização de envio de partilha</string>
+  <string name="recommend_subject">Test %1$s no seu smartphone!</string>
  <string name="recommend_text">Quero convidar-te a usares %1$s no teu smartphone!\nFaz download aqui: %2$s</string>
  <string name="auth_check_server">Verificar Servidor</string>
  <string name="auth_host_url">Endereço do servidor https://..</string>
@ -49,63 +51,68 @@
  <string name="setup_btn_connect">Ligar</string>
  <string name="uploader_btn_upload_text">Enviar</string>
  <string name="uploader_top_message">Escolha a pasta de envio:</string>
-  <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
-  <string name="uploader_wrn_no_account_text">Não tem nenhuma conta  %1$s no seu dispositivo. Configure uma conta.</string>
+  <string name="uploader_wrn_no_account_title">A conta não foi encontrada</string>
+  <string name="uploader_wrn_no_account_text">Não tem nenhuma conta  %1$s no seu dispositivo. Por favor, configure primeiro uma conta.</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_wrn_no_content_title">Sem conteúdo para carregar</string>
+  <string name="uploader_wrn_no_content_title">Sem conteúdo para enviar</string>
  <string name="uploader_wrn_no_content_text">Não foi recebido nenhum conteúdo. Nada para enviar.</string>
  <string name="uploader_error_forbidden_content">O  %1$s não está autorizado a aceder aos ficheiro partilhados.</string>
  <string name="uploader_info_uploading">A enviar</string>
-  <string name="file_list_empty">Vazio. Envie alguma coisa!</string>
-  <string name="file_list_loading">A carregar...</string>
+  <string name="file_list_seconds_ago">segundos atrás</string>
+  <string name="file_list_empty">Aqui não existe nada. Envie alguma coisa!</string>
+  <string name="file_list_loading">A carregar ...</string>
  <string name="local_file_list_empty">Não existem ficheiros nesta pasta.</string>
-  <string name="filedetails_select_file">Clique no ficheiro para visualizar informação adicional.</string>
+  <string name="file_list_folder">pasta</string>
+  <string name="file_list_folders">pastas</string>
+  <string name="file_list_file">ficheiro</string>
+  <string name="file_list_files">ficheiros</string>
+  <string name="filedetails_select_file">Toque num ficheiro para visualizar a informação adicional.</string>
  <string name="filedetails_size">Tamanho:</string>
  <string name="filedetails_type">Tipo:</string>
  <string name="filedetails_created">Criado:</string>
  <string name="filedetails_modified">Modificado:</string>
-  <string name="filedetails_download">Descarregar</string>
+  <string name="filedetails_download">Transferir</string>
  <string name="filedetails_sync_file">Atualizar ficheiro</string>
-  <string name="filedetails_renamed_in_upload_msg">O nome do ficheiro foi alterado para %1$s durante o envio.</string>
-  <string name="action_share_file">Partilhar o link</string>
+  <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado para %1$s durante o envio.</string>
+  <string name="action_share_file">Partilhar a hiperligação</string>
  <string name="action_unshare_file">Deixar de partilhar a ligação</string>
  <string name="common_yes">Sim</string>
  <string name="common_no">Não</string>
-  <string name="common_ok">OK</string>
+  <string name="common_ok">ACEITAR</string>
  <string name="common_cancel_download">Cancelar a transferência</string>
-  <string name="common_cancel_upload">Cancelar envio</string>
+  <string name="common_cancel_upload">Cancelar o envio</string>
  <string name="common_cancel">Cancelar</string>
  <string name="common_save_exit">Guardar &amp; Sair</string>
  <string name="common_error">Erro</string>
-  <string name="common_loading">A carregar...</string>
+  <string name="common_loading">A carregar ...</string>
  <string name="common_error_unknown">Erro Desconhecido</string>
  <string name="about_title">Sobre</string>
-  <string name="change_password">Alterar palavra-chave</string>
+  <string name="change_password">Alterar senha</string>
  <string name="delete_account">Apagar conta</string>
  <string name="create_account">Criar conta</string>
-  <string name="upload_chooser_title">Carregar de...</string>
+  <string name="upload_chooser_title">Enviar de ...</string>
  <string name="uploader_info_dirname">Nome da pasta</string>
-  <string name="uploader_upload_in_progress_ticker">A carregar...</string>
-  <string name="uploader_upload_in_progress_content">A enviar %1$d%% , %2$s completo.</string>
-  <string name="uploader_upload_succeeded_ticker">Carregado com sucesso</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s foi carregado com sucesso</string>
-  <string name="uploader_upload_failed_ticker">Carregamento falhou</string>
+  <string name="uploader_upload_in_progress_ticker">A enviar ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%%  A enviar %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Envio bem sucedido</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
+  <string name="uploader_upload_failed_ticker">Não foi possível enviar</string>
  <string name="uploader_upload_failed_content_single">O envio do ficheiro %1$s não foi concluído.</string>
  <string name="uploader_upload_failed_credentials_error">Falha no carregamento, é necessário fazer novo login</string>
-  <string name="downloader_download_in_progress_ticker">A descarregar...</string>
-  <string name="downloader_download_in_progress_content">%1$d%% A decarregar %2$s</string>
-  <string name="downloader_download_succeeded_ticker">Descarga com sucesso</string>
+  <string name="downloader_download_in_progress_ticker">A transferir ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% A transferir %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Transferência bem sucedida</string>
  <string name="downloader_download_succeeded_content">%1$s foi descarregado com sucesso</string>
  <string name="downloader_download_failed_ticker">Descarga falhou</string>
  <string name="downloader_download_failed_content">O descarregamento %1$s não foi possível descarregar</string>
-  <string name="downloader_not_downloaded_yet">Não transferido</string>
-  <string name="downloader_download_failed_credentials_error">Falha no download, é necessário fazer login </string>
+  <string name="downloader_not_downloaded_yet">Ainda não foi transferido</string>
+  <string name="downloader_download_failed_credentials_error">Não foi possível transferir, tem de iniciar a sessão novamente</string>
  <string name="common_choose_account">Escolha a conta</string>
  <string name="sync_fail_ticker">Falhou a sincronização</string>
  <string name="sync_fail_ticker_unauthorized">Falhou a sincronização, necessita fazer um novo login</string>
  <string name="sync_fail_content">Não foi possível sincronizar %1$s</string>
-  <string name="sync_fail_content_unauthorized">Password inválida para %1$s</string>
+  <string name="sync_fail_content_unauthorized">Senha inválida para %1$s</string>
  <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>
@ -115,23 +122,23 @@
  <string name="sync_foreign_files_forgotten_explanation">Tal como na versão 1.3.16, os ficheiros que foram enviados deste dispositivo são copiados para a pasta local %1$s para prevenir perda de dados quando um ficheiro é partilhado com várias contas.\n\nDevido a esta alteração, todos os ficheiros das versões anteriores foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão deste processo durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover o link para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar o link para %4$s. \n\nEm baixo estão listados ficheiro(s) locais e remotos em %5$s que foram ligados.</string>
  <string name="sync_current_folder_was_removed">A pasta %1$s já não existe</string>
  <string name="foreign_files_move">Mover Todos</string>
-  <string name="foreign_files_success">Todos os ficheiros foram movidos</string>
+  <string name="foreign_files_success">Foram movidos todos os ficheiros</string>
  <string name="foreign_files_fail">Não foi possível mover alguns ficheiros</string>
  <string name="foreign_files_local_text">Local: %1$s</string>
  <string name="foreign_files_remote_text">Remoto: %1$s</string>
  <string name="upload_query_move_foreign_files">Não existe espaço disponível para copiar o ficheiro seleccionado para a pasta %1$s . Em vez disso deseja mover o ficheiro?</string>
-  <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
-  <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação</string>
-  <string name="pincode_configure_your_pin_explanation">O PIN vai ser pedido todas as vezes que iniciar a aplicação.</string>
-  <string name="pincode_reenter_your_pincode">Volte a inserir o App PIN, por favor</string>
-  <string name="pincode_remove_your_pincode">Remover o PIN do aplicação.</string>
+  <string name="pincode_enter_pin_code">Por favor, insira o PIN da App</string>
+  <string name="pincode_configure_your_pin">Insira o PIN da App</string>
+  <string name="pincode_configure_your_pin_explanation">O PIN será pedido sempre que a app seja iniciada.</string>
+  <string name="pincode_reenter_your_pincode">Por favor, reinsira o PIN da App</string>
+  <string name="pincode_remove_your_pincode">Remover o seu PIN da App</string>
  <string name="pincode_mismatch">Os códigos PIN introduzidos não são iguais.</string>
  <string name="pincode_wrong">Código PIN Incorrecto.</string>
  <string name="pincode_removed">PIN da aplicação removido</string>
  <string name="pincode_stored">PIN da aplicação guardado</string>
  <string name="media_notif_ticker">%1$s leitor de música</string>
-  <string name="media_state_playing">A tocar: %1$s</string>
-  <string name="media_state_loading">%1$s (A carregar)</string>
+  <string name="media_state_playing">%1$s (a reproduzir)</string>
+  <string name="media_state_loading">%1$s (a carregar)</string>
  <string name="media_event_done">%1$s leitura terminada</string>
  <string name="media_err_nothing_to_play">Não foi encontrado nenhum ficheiro de média</string>
  <string name="media_err_no_account">Não foi fornecida conta</string>
@ -212,12 +219,12 @@
  <string name="ssl_validator_question">Quer confiar neste certificado de qualquer maneira?</string>
  <string name="ssl_validator_not_saved">O certificado não pôde ser guardado</string>
  <string name="ssl_validator_btn_details_see">Detalhes</string>
-  <string name="ssl_validator_btn_details_hide">Esconder</string>
+  <string name="ssl_validator_btn_details_hide">Ocultar</string>
  <string name="ssl_validator_label_subject">Emitido para:</string>
  <string name="ssl_validator_label_issuer">Emitido por:</string>
  <string name="ssl_validator_label_CN">Nome comum.</string>
  <string name="ssl_validator_label_O">Organização:</string>
-  <string name="ssl_validator_label_OU">Unidade organizaconal.</string>
+  <string name="ssl_validator_label_OU">Unidade organizacional.</string>
  <string name="ssl_validator_label_C">País:</string>
  <string name="ssl_validator_label_ST">Estado:</string>
  <string name="ssl_validator_label_L">Localização:</string>
@ -226,33 +233,33 @@
  <string name="ssl_validator_label_validity_to">Para:</string>
  <string name="ssl_validator_label_signature">Assinatura:</string>
  <string name="ssl_validator_label_signature_algorithm">Algoritmo</string>
-  <string name="ssl_validator_null_cert">O certificado não pôde ser mostrado.</string>
-  <string name="ssl_validator_no_info_about_error">- Nenhuma informação acerca do erro</string>
+  <string name="ssl_validator_null_cert">Não foi possível mostrar o certificado.</string>
+  <string name="ssl_validator_no_info_about_error">- Nenhuma informação sobre o erro</string>
  <string name="placeholder_sentence">Isto é uma variável.</string>
  <string name="placeholder_filename">placeholder.txt</string>
  <string name="placeholder_filetype">Imagem PNG</string>
  <string name="placeholder_filesize">389 KB</string>
-  <string name="placeholder_timestamp">2012/05/18 12:23 PM</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">Enviar fotografias apenas via WiFi</string>
-  <string name="instant_video_upload_on_wifi">Enviar videos apenas por WiFi</string>
-  <string name="instant_upload_path">/Upload-Instantâneo </string>
-  <string name="conflict_title">Conflito na actualização</string>
+  <string name="instant_upload_on_wifi">Só enviar as fotografias via wi-fi</string>
+  <string name="instant_video_upload_on_wifi">Só enviar os vídeos por wi-fi</string>
+  <string name="instant_upload_path">/Envio Instantâneo </string>
+  <string name="conflict_title">Conflito na atualização</string>
  <string name="conflict_message">O ficheiro remoto %s não está sincronizado com o ficheiro local. Se continuar ira substituir o ficheiro no servidor.</string>
-  <string name="conflict_keep_both">Manter os dois</string>
-  <string name="conflict_overwrite">Sobrepor</string>
+  <string name="conflict_keep_both">Manter ambos</string>
+  <string name="conflict_overwrite">Substituir</string>
  <string name="conflict_dont_upload">Não enviar.</string>
-  <string name="preview_image_description">Pré-Visualização da imagem</string>
+  <string name="preview_image_description">Pré-Visualizar imagem</string>
  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
  <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 Upload</string>
+  <string name="prefs_instant_upload_path_title">Caminho de \'A Enviar\'</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_error">Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta</string>
  <string name="unshare_link_file_no_exist">Não é possível retirar a partilha. Verifique se o ficheiro existe</string>
  <string name="unshare_link_file_error">Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta</string>
  <string name="activity_chooser_send_file_title">Enviar</string>
-  <string name="copy_link">Copiar ligação</string>
+  <string name="copy_link">Copiar hiperligação</string>
  <string name="clipboard_text_copied">Copiado para a área de transferência</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>
@ -260,31 +267,34 @@
  <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>
  <string name="empty"></string>
-  <string name="forbidden_permissions">Você não tem permissão %s</string>
+  <string name="forbidden_permissions">Não tem permissão %s</string>
  <string name="forbidden_permissions_rename">para renomear este ficheiro</string>
-  <string name="forbidden_permissions_delete">para eliminar este ficheiro</string>
+  <string name="forbidden_permissions_delete">para apagar este ficheiro</string>
  <string name="share_link_forbidden_permissions">para partilhar este ficheiro</string>
-  <string name="unshare_link_forbidden_permissions">para eliminar a partilha deste ficheiro</string>
+  <string name="unshare_link_forbidden_permissions">para cancelar a partilha deste ficheiro</string>
  <string name="forbidden_permissions_create">para criar o ficheiro</string>
-  <string name="uploader_upload_forbidden_permissions">para carregar dentro desta pasta</string>
+  <string name="uploader_upload_forbidden_permissions">para enviar nesta pasta</string>
  <string name="downloader_download_file_not_found">O ficheiro não está mais disponível no servidor</string>
  <string name="prefs_category_accounts">Contas</string>
  <string name="prefs_add_account">Adicionar conta</string>
  <string name="auth_redirect_non_secure_connection_title">Ligação segura é redireccionada para um caminho inseguro.</string>
-  <string name="actionbar_logger">Logs</string>
+  <string name="actionbar_logger">Registos de Alterações</string>
  <string name="log_send_history_button">Enviar Histórico</string>
-  <string name="log_mail_subject">Logs da app ownCloud Android</string>
+  <string name="log_send_no_mail_app">Não foi encontrado o aplicativo para envio de registos . Instale app e-mail!</string>
+  <string name="log_send_mail_subject">%1$s Android Aplicação de Registyos</string>
  <string name="log_progress_dialog_text">A carregar os dados...</string>
  <string name="saml_authentication_required_text">Autenticação necessária</string>
-  <string name="saml_authentication_wrong_pass">Password errada</string>
+  <string name="saml_authentication_wrong_pass">Palavra-passe errada</string>
  <string name="actionbar_move">Mover</string>
  <string name="file_list_empty_moving">Não está aqui nada. Pode adicionar uma pasta!</string>
-  <string name="move_choose_button_text">Escolha</string>
-  <string name="move_file_not_found">Não é possível mover. Verifique se o ficheiro existe</string>
+  <string name="folder_picker_choose_button_text">Escolher</string>
+  <string name="move_file_not_found">Não é possível mover. Por favor, verifique se o ficheiro existe</string>
  <string name="move_file_invalid_into_descendent">Não é possível mover esta pasta deste modo</string>
  <string name="move_file_invalid_overwrite">O ficheiro já existe na pasta de destino</string>
-  <string name="move_file_error">Um erro ocorreu ao tentar mover este ficheiro ou pasta</string>
+  <string name="move_file_error">Ocorreu um ocorreu quando tentava mover este ficheiro ou pasta</string>
  <string name="forbidden_permissions_move">para mover este ficheiro</string>
-  <string name="prefs_category_instant_uploading">Uploads Instantâneos</string>
+  <string name="prefs_category_instant_uploading">Envios Instantâneos</string>
  <string name="prefs_category_security">Segurança</string>
+  <string name="prefs_instant_video_upload_path_title">Envio do Caminho do Vídeo</string>
+  <string name="shared_subject_header">partilhado</string>
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@ -52,9 +52,14 @@
  <string name="uploader_wrn_no_content_text">Nu a fost primit nici un conţinut .Nu exista nimic de încărcat .</string>
  <string name="uploader_error_forbidden_content">%1$s nu este permis sa acceseze conținutul shared</string>
  <string name="uploader_info_uploading">Încărcare</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 incarca</string>
  <string name="local_file_list_empty">In acest folder nu sunt fisiere.</string>
+  <string name="file_list_folder">director</string>
+  <string name="file_list_folders">directoare</string>
+  <string name="file_list_file">fișier</string>
+  <string name="file_list_files">fișiere</string>
  <string name="filedetails_select_file">Selectati un fisier pentru a afisa informatia aditionala</string>
  <string name="filedetails_size">Mărime:</string>
  <string name="filedetails_type">Tip:</string>
@ -262,12 +267,11 @@
  <string name="downloader_download_file_not_found">Fișierul nu mai este disponibil pe server</string>
  <string name="prefs_category_accounts">Conturi</string>
  <string name="prefs_add_account">Adaugă cont</string>
-  <string name="log_progress_dialog_text">Se încarcă datele...</string>
  <string name="saml_authentication_required_text">Autentificare necesară</string>
  <string name="saml_authentication_wrong_pass">Parolă greșită</string>
  <string name="actionbar_move">Mutare</string>
  <string name="file_list_empty_moving">Nu este nimic aici. Poți adăuga un director!</string>
-  <string name="move_choose_button_text">Alege</string>
+  <string name="folder_picker_choose_button_text">Alege</string>
  <string name="forbidden_permissions_move">pentru a muta acest fișier</string>
  <string name="prefs_category_security">Securitate</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -11,6 +11,12 @@
  <string name="actionbar_settings">Настройки</string>
  <string name="actionbar_see_details">Подробно</string>
  <string name="actionbar_send_file">Отправить</string>
+  <string name="actionbar_sort">Упорядочить</string>
+  <string name="actionbar_sort_title">Упорядочить по</string>
+  <string-array name="actionbar_sortby">
+    <item>А-Я</item>
+    <item>Новые - Старые</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Основные</string>
@ -32,6 +38,8 @@
  <string name="prefs_recommend">Рекомендовать другу</string>
  <string name="prefs_feedback">Обратная связь</string>
  <string name="prefs_imprint">Штамп</string>
+  <string name="prefs_remember_last_share_location">Запомнить расположение публикации</string>
+  <string name="prefs_remember_last_upload_location_summary">Запомнить расположение загрузки последней публикации</string>
  <string name="recommend_subject">Попробуйте %1$s на вашем смартфоне!</string>
  <string name="recommend_text">Хочу предложить вам использовать %1$s на смартфоне!\nЗагрузить можно здесь: %2$s
 	</string>
@ -52,9 +60,14 @@
  <string name="uploader_wrn_no_content_text">Содержимое не получено. Нечего загружать.</string>
  <string name="uploader_error_forbidden_content">%1$s не имеет доступа к опубликованным данным</string>
  <string name="uploader_info_uploading">Загрузка</string>
+  <string name="file_list_seconds_ago">только что</string>
  <string name="file_list_empty">Здесь ничего нет. Загрузите что-нибудь!</string>
  <string name="file_list_loading">Загрузка...</string>
  <string name="local_file_list_empty">В данной папке нет файлов.</string>
+  <string name="file_list_folder">папка</string>
+  <string name="file_list_folders">папки</string>
+  <string name="file_list_file">файл</string>
+  <string name="file_list_files">файлы</string>
  <string name="filedetails_select_file">Нажмите на файл для отображения дополнительной информации.</string>
  <string name="filedetails_size">Размер:</string>
  <string name="filedetails_type">Тип:</string>
@ -241,6 +254,7 @@
  <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>
@ -265,19 +279,25 @@
  <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_mail_subject">Журналы Андроид-приложения ownCloud</string>
-  <string name="log_progress_dialog_text">Загружаются данные...</string>
+  <string name="log_send_no_mail_app">Приложение для отправки журнала не найдено. Установите почтовое приложение!</string>
+  <string name="log_send_mail_subject">Журналы приложения %1$s для Android</string>
+  <string name="log_progress_dialog_text">Загрузка данных…</string>
  <string name="saml_authentication_required_text">Требуется аутентификация </string>
  <string name="saml_authentication_wrong_pass">Неправильный пароль</string>
  <string name="actionbar_move">Переместить</string>
  <string name="file_list_empty_moving">Здесь ничего нет. Вы можете добавить папку!</string>
-  <string name="move_choose_button_text">Выбрать</string>
+  <string name="folder_picker_choose_button_text">Выбрать</string>
  <string name="move_file_not_found">Невозможно переместить. Пожалуйста, проверьте, существует ли файл</string>
  <string name="move_file_invalid_into_descendent">Невозможно переместить папку в папку-потомок</string>
  <string name="move_file_invalid_overwrite">Файл уже существует в папке назначения</string>
  <string name="move_file_error">Произошла ошибка при попытке перемещения этого файла или папки</string>
  <string name="forbidden_permissions_move">переместить этот файл</string>
+  <string name="prefs_category_instant_uploading">Мгновенные загрузки</string>
  <string name="prefs_category_security">Безопасность</string>
+  <string name="prefs_instant_video_upload_path_title">Путь для загрузки Видео</string>
+  <string name="shared_subject_header">Общие</string>
+  <string name="with_you_subject_header">с вами</string>
 </resources>
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@ -21,7 +21,12 @@
  <string name="uploader_wrn_no_account_setup_btn_text">ස්ථාපනය</string>
  <string name="uploader_wrn_no_account_quit_btn_text">නික්මෙන්න</string>
  <string name="uploader_info_uploading">උඩුගතවේ</string>
+  <string name="file_list_seconds_ago">තත්පරයන්ට පෙර</string>
  <string name="file_list_empty">මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න</string>
+  <string name="file_list_folder">ෆෝල්ඩරය</string>
+  <string name="file_list_folders">ෆෝල්ඩර</string>
+  <string name="file_list_file">ගොනුව</string>
+  <string name="file_list_files">ගොනු</string>
  <string name="filedetails_select_file">වැඩි විස්තර සඳහා ගොනුවක් ස්පර්ෂ කරන්න</string>
  <string name="filedetails_size">විශාලත්වය:</string>
  <string name="filedetails_type">ගණය:</string>
@ -75,5 +80,5 @@
  <string name="ssl_validator_btn_details_hide">සඟවන්න</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">ගිණුම්</string>
-  <string name="move_choose_button_text">තෝරන්න</string>
+  <string name="folder_picker_choose_button_text">තෝරන්න</string>
 </resources>
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@ -11,6 +11,12 @@
  <string name="actionbar_settings">Nastavenia</string>
  <string name="actionbar_see_details">Podrobnosti</string>
  <string name="actionbar_send_file">Odoslať</string>
+  <string name="actionbar_sort">Zoradiť</string>
+  <string name="actionbar_sort_title">Zoradiť podľa</string>
+  <string-array name="actionbar_sortby">
+    <item>A-Z</item>
+    <item>Najnovšie - Najstaršie</item>
+  </string-array>
  <!--TODO re-enable when server-side folder size calculation is available   
    	<item>Biggest - Smallest</item>-->
  <string name="prefs_category_general">Všeobecné</string>
@ -32,7 +38,10 @@
  <string name="prefs_recommend">Doporučiť známemu</string>
  <string name="prefs_feedback">Spätná väzba</string>
  <string name="prefs_imprint">Podmienky používania</string>
+  <string name="prefs_remember_last_share_location">Zapamätať umiestnenie zdieľania</string>
+  <string name="prefs_remember_last_upload_location_summary">Zapamätať posledné umiestnenie pre nahranie zdieľaných súborov</string>
  <string name="recommend_subject">Skúste %1$s na vašom telefóne!</string>
+  <string name="recommend_text">Chcel by som vám odporučiť %1$s na vašom smartfóne!\nSťahujte tu: %2$s</string>
  <string name="auth_check_server">Skontrolovať Server</string>
  <string name="auth_host_url">Adresa servera https://...</string>
  <string name="auth_username">Používateľské meno</string>
@ -50,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Nedodaný žiaden obsah. Nič na odoslanie.</string>
  <string name="uploader_error_forbidden_content">%1$s nemá práva pre prístup k zdieľanému obsahu</string>
  <string name="uploader_info_uploading">Nahrávanie</string>
+  <string name="file_list_seconds_ago">pred sekundami</string>
  <string name="file_list_empty">Žiadny súbor. Nahrajte niečo!</string>
  <string name="file_list_loading">Nahráva sa...</string>
  <string name="local_file_list_empty">V tomto priečinku nie sú žiadne súbory.</string>
+  <string name="file_list_folder">priečinok</string>
+  <string name="file_list_folders">priečinky</string>
+  <string name="file_list_file">súbor</string>
+  <string name="file_list_files">súbory</string>
  <string name="filedetails_select_file">Viac informácií získate kliknutím na súbor.</string>
  <string name="filedetails_size">Veľkosť:</string>
  <string name="filedetails_type">Typ:</string>
@ -105,6 +119,7 @@
  <string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
  <string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
  <string name="sync_foreign_files_forgotten_content">%1$d súborov z %2$s priečinkov sa nepodarilo skopírovať do</string>
+  <string name="sync_foreign_files_forgotten_explanation">Od verzie 1.3.16 sú súbory nahrané z tohoto zariadenia kopírované do lokálneho priečinka %1$s, aby sa zabránilo strate dát pri synchronizácii jedného súboru s viacerými účtami.\n\nVšetky súbory nahraté predchádzajúcimi verziami aplikácie boli z tohoto dôvodu prekopírované do priečinka %2$s. Bohužiaľ sa objavila chyba zabraňujúca dokončeniu tejto operácie v priebehu synchronizácie účtu. Buď môžete súbor(y) ponechať ako sú a odobrať odkaz z priečinka %3$s, alebo presunúť súbor(y) do priečinka %1$s a zachovať odkaz na %4$s.\n\nNižšie je uvedený lokálny súbor(y) a vzdialený súbor(y) v %5$s, s ktorým je prepojený.</string>
  <string name="sync_current_folder_was_removed">Priečinok %1$s už existuje</string>
  <string name="foreign_files_move">Premiestniť všetko</string>
  <string name="foreign_files_success">Všetky súbory boli premiestnené</string>
@ -238,9 +253,12 @@
  <string name="preview_image_description">Ukážka obrazu</string>
  <string name="preview_image_error_unknown_format">Obrázok nemožno zobraziť</string>
  <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
+  <string name="prefs_instant_upload_path_title">Cesta pre nahrávanie</string>
  <string name="share_link_no_support_share_api">Je nám to ľúto, ale zdieľanie nie je na vašom serveri povolené. Prosím kontaktujte vášho
 		administrátora.</string>
+  <string name="share_link_file_no_exist">Nemožno zdieľať. Skontrolujte, či súbor existuje</string>
  <string name="share_link_file_error">Pri pokuse o zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
+  <string name="unshare_link_file_no_exist">Nemožno ukončiť zdieľanie. Skontrolujte, či súbor existuje</string>
  <string name="unshare_link_file_error">Pri pokuse zrušiť zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
  <string name="activity_chooser_send_file_title">Odoslať</string>
  <string name="copy_link">Kopíruj odkaz</string>
@ -261,9 +279,20 @@
  <string name="downloader_download_file_not_found">Súbor už na serveri nie je dostupný</string>
  <string name="prefs_category_accounts">Účty</string>
  <string name="prefs_add_account">Pridať účet</string>
+  <string name="auth_redirect_non_secure_connection_title">Zabezpečené pripojenie je presmerované na nezabezpečenú trasu.</string>
+  <string name="actionbar_logger">Logy</string>
+  <string name="log_send_history_button">Odoslať históriu</string>
  <string name="saml_authentication_required_text">Vyžaduje sa overenie</string>
  <string name="saml_authentication_wrong_pass">Nesprávne heslo</string>
  <string name="actionbar_move">Presunúť</string>
-  <string name="move_choose_button_text">Vybrať</string>
+  <string name="file_list_empty_moving">Nič tu nie je. Pridajte priečinok!</string>
+  <string name="folder_picker_choose_button_text">Vybrať</string>
+  <string name="move_file_not_found">Nemožno presunúť. Skontrolujte, či súbor existuje</string>
+  <string name="move_file_invalid_into_descendent">Priečinok nemožno presunúť do vlastného podpriečinka</string>
+  <string name="move_file_invalid_overwrite">Súbor už v cieľovom priečinku existuje</string>
+  <string name="move_file_error">Pri pokuse o presun tohoto súboru alebo priečinka nastala chyba</string>
+  <string name="forbidden_permissions_move">pre presun tohoto súboru</string>
+  <string name="prefs_category_instant_uploading">Okamžité nahratie</string>
  <string name="prefs_category_security">Zabezpečenie</string>
+  <string name="shared_subject_header">zdieľané</string>
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Priporoči prijateljem</string>
  <string name="prefs_feedback">Odziv</string>
  <string name="prefs_imprint">Natis</string>
+  <string name="prefs_remember_last_share_location">Zapomni si mesto souporabe</string>
+  <string name="prefs_remember_last_upload_location_summary">Zapomni si zadnje mesto za pošiljanje v oblak</string>
  <string name="recommend_subject">Preizkusi %1$s na pametnem telefonu!</string>
  <string name="recommend_text">Želim ti predstaviti %1$s na pametnem telefonu!\nPrejmeš ga lahko na: %2$s</string>
  <string name="auth_check_server">Preveri strežnik</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Ni prejete vsebine. Ni datotek za pošiljanje.</string>
  <string name="uploader_error_forbidden_content">Oblak %1$s nima nastavljenih dovoljenj za dostop do vsebine v souporabi</string>
  <string name="uploader_info_uploading">Pošiljanje</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>
  <string name="local_file_list_empty">V tej mapi ni datotek.</string>
+  <string name="file_list_folder">mapa</string>
+  <string name="file_list_folders">mape</string>
+  <string name="file_list_file">datoteka</string>
+  <string name="file_list_files">datoteke</string>
  <string name="filedetails_select_file">Pritisnite na datoteko za prikaz dodatnih podrobnosti.</string>
  <string name="filedetails_size">Velikost:</string>
  <string name="filedetails_type">Vrsta:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Varna povezava je preusmerjena preko ne-varne poti.</string>
  <string name="actionbar_logger">Dnevnik</string>
  <string name="log_send_history_button">Pošlji zgodovino</string>
-  <string name="log_mail_subject">Dnevnik programa ownCloud</string>
+  <string name="log_send_no_mail_app">Ni nameščenega poštnega programa za pošiljanje dnevnikov.</string>
+  <string name="log_send_mail_subject">%1$s dnevniki programa</string>
  <string name="log_progress_dialog_text">Poteka nalaganje podatkov ...</string>
  <string name="saml_authentication_required_text">Zahtevana je overitev</string>
  <string name="saml_authentication_wrong_pass">Napačno geslo</string>
  <string name="actionbar_move">Premakni</string>
  <string name="file_list_empty_moving">Ni vsebine in datotek. Lahko ustvarite na primer mapo.</string>
-  <string name="move_choose_button_text">Izbor</string>
+  <string name="folder_picker_choose_button_text">Izbor</string>
  <string name="move_file_not_found">Ni mogoče premakniti datoteke. Preverite, ali obstaja.</string>
  <string name="move_file_invalid_into_descendent">Ni mogoče premakniti mape v podrejeno mapo.</string>
  <string name="move_file_invalid_overwrite">Datoteka v ciljni mapi že obstaja.</string>
@ -289,4 +297,8 @@
  <string name="forbidden_permissions_move">med premikanjem datoteke</string>
  <string name="prefs_category_instant_uploading">Takojšnje pošiljanje v oblak</string>
  <string name="prefs_category_security">Varnost</string>
+  <string name="prefs_instant_video_upload_path_title">Pot videa za pošiljanje</string>
+  <string name="shared_subject_header">v souporabi</string>
+  <string name="with_you_subject_header">z vami</string>
+  <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
 </resources>
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@ -24,6 +24,7 @@
  <string name="uploader_wrn_no_account_setup_btn_text">Ndërto</string>
  <string name="uploader_wrn_no_account_quit_btn_text">Dil</string>
  <string name="uploader_info_uploading">Ngarko</string>
+  <string name="file_list_seconds_ago">sekonda më parë</string>
  <string name="file_list_empty">Këtu nuk ka asgje. Ngarko dicka</string>
  <string name="filedetails_select_file">Trokitje e lehtë në një dokument për të shfaqur informacion shtesë.</string>
  <string name="filedetails_size">Dimensioni:</string>
@ -31,6 +32,7 @@
  <string name="filedetails_created">Krijuar:</string>
  <string name="filedetails_modified">Modifikuar:</string>
  <string name="filedetails_download">Shkarko</string>
+  <string name="action_share_file">Ndaje lidhjen</string>
  <string name="common_yes">Po</string>
  <string name="common_no">Jo</string>
  <string name="common_ok">Ok</string>
@ -73,6 +75,7 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">Llogarit</string>
  <string name="saml_authentication_wrong_pass">Fjalëkalim i gabuar</string>
-  <string name="move_choose_button_text">Zgjidh</string>
+  <string name="folder_picker_choose_button_text">Zgjidh</string>
  <string name="prefs_category_security">Siguria</string>
+  <string name="shared_subject_header">Ndarë</string>
 </resources>
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@ -17,6 +17,7 @@
  <string name="uploader_btn_upload_text">Pošalji</string>
  <string name="uploader_wrn_no_account_title">Nalog nije nađen</string>
  <string name="uploader_info_uploading">Šalje se</string>
+  <string name="file_list_seconds_ago">Pre par sekundi</string>
  <string name="file_list_empty">Ovde nema ničeg. Pošaljite nešto!</string>
  <string name="filedetails_size">Veličina:</string>
  <string name="filedetails_type">Tip:</string>
@ -56,5 +57,5 @@
  <string name="activity_chooser_send_file_title">Pošalji</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Nalozi</string>
-  <string name="move_choose_button_text">Izaberi</string>
+  <string name="folder_picker_choose_button_text">Izaberi</string>
 </resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@ -22,6 +22,7 @@
  <string name="uploader_wrn_no_content_title">Нема садржаја за отпремање</string>
  <string name="uploader_wrn_no_content_text">Садржај није примљен. Нема ништа да се отпреми.</string>
  <string name="uploader_info_uploading">Отпремање</string>
+  <string name="file_list_seconds_ago">пре неколико секунди</string>
  <string name="file_list_empty">Овде нема ничег. Отпремите нешто!</string>
  <string name="filedetails_select_file">Додирните датотеку ради приказа додатних информација.</string>
  <string name="filedetails_size">Величина:</string>
@ -110,6 +111,6 @@
  <string name="activity_chooser_send_file_title">Пошаљи</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">Налози</string>
-  <string name="move_choose_button_text">Одабери</string>
+  <string name="folder_picker_choose_button_text">Одабери</string>
  <string name="prefs_category_security">Безбедност</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@ -51,9 +51,14 @@
  <string name="uploader_wrn_no_content_text">Inget innehåll mottaget. Inget att ladda upp.</string>
  <string name="uploader_error_forbidden_content">%1$s har inte rättighet till det delade innehållet</string>
  <string name="uploader_info_uploading">Laddar upp</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>
  <string name="local_file_list_empty">Det finns inga filer i den här mappen.</string>
+  <string name="file_list_folder">mapp</string>
+  <string name="file_list_folders">mappar</string>
+  <string name="file_list_file">fil</string>
+  <string name="file_list_files">filer</string>
  <string name="filedetails_select_file">Peka på en fil för att visa mer information.</string>
  <string name="filedetails_size">Storlek:</string>
  <string name="filedetails_type">Typ:</string>
@ -262,13 +267,13 @@
  <string name="downloader_download_file_not_found">Filen är inte längre tillgänglig på servern</string>
  <string name="prefs_category_accounts">Konton</string>
  <string name="prefs_add_account">Lägg till konto</string>
-  <string name="log_progress_dialog_text">Laddar data...</string>
  <string name="saml_authentication_required_text">Autentisering krävs</string>
  <string name="saml_authentication_wrong_pass">Fel lösenord</string>
  <string name="actionbar_move">Flytta</string>
  <string name="file_list_empty_moving">Ingenting här. Du kan skapa en mapp!</string>
-  <string name="move_choose_button_text">Välj</string>
+  <string name="folder_picker_choose_button_text">Välj</string>
  <string name="move_file_not_found">Gick inte att flytta. Vänligen kontrollera att filen existerar</string>
  <string name="forbidden_permissions_move">att flytta den här filen</string>
  <string name="prefs_category_security">Säkerhet</string>
+  <string name="shared_subject_header">delad</string>
 </resources>
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@ -27,6 +27,7 @@
  <string name="uploader_wrn_no_content_text">ஒரு உள்ளடக்கமும் பெறப்படவில்லை. பதிவேற்றுவதற்கு ஒன்றும் இல்லை</string>
  <string name="uploader_error_forbidden_content">பகிரப்பட்ட உள்ளடக்ககங்களை அணுகுவதற்கு %1$s  அனுமதிக்கமாட்டாது</string>
  <string name="uploader_info_uploading">பதிவேற்றல்</string>
+  <string name="file_list_seconds_ago">செக்கன்களுக்கு முன்</string>
  <string name="file_list_empty">இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!</string>
  <string name="filedetails_select_file">மேலதிக தகவல்களை காட்சிப்படுத்துவதற்கு கோப்பின் மேல் தட்டுக.</string>
  <string name="filedetails_size">அளவு:</string>
@ -138,5 +139,5 @@
  <string name="conflict_dont_upload">பதிவேற்ற வேண்டாம்</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">கணக்குகள்</string>
-  <string name="move_choose_button_text">தெரிவுசெய்க </string>
+  <string name="folder_picker_choose_button_text">தெரிவுசெய்க </string>
 </resources>
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@ -9,6 +9,7 @@
  <string name="prefs_help">సహాయం</string>
  <string name="auth_username">వాడుకరి పేరు</string>
  <string name="auth_password">సంకేతపదం</string>
+  <string name="file_list_seconds_ago">క్షణాల క్రితం</string>
  <string name="common_yes">అవును</string>
  <string name="common_no">కాదు</string>
  <string name="common_ok">సరే</string>
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@ -29,7 +29,12 @@
  <string name="uploader_wrn_no_content_text">ยังไม่ได้รับเนื้อหา ไม่มีอะไรให้ต้องอัพโหลด</string>
  <string name="uploader_error_forbidden_content">%1$s ไม่อนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้</string>
  <string name="uploader_info_uploading">กำลังอัพโหลด</string>
+  <string name="file_list_seconds_ago">วินาที ก่อนหน้านี้</string>
  <string name="file_list_empty">ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!</string>
+  <string name="file_list_folder">โฟลเดอร์</string>
+  <string name="file_list_folders">โฟลเดอร์</string>
+  <string name="file_list_file">ไฟล์</string>
+  <string name="file_list_files">ไฟล์</string>
  <string name="filedetails_select_file">แตะที่ไฟล์ เพื่อแสดงข้อมูลเพิ่มเติม</string>
  <string name="filedetails_size">ขนาด:</string>
  <string name="filedetails_type">ชนิด:</string>
@ -151,5 +156,5 @@
  <string name="activity_chooser_send_file_title">ส่ง</string>
  <string name="empty"></string>
  <string name="prefs_category_accounts">บัญชี</string>
-  <string name="move_choose_button_text">เลือก</string>
+  <string name="folder_picker_choose_button_text">เลือก</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -38,6 +38,8 @@
  <string name="prefs_recommend">Bir arkadaşa öner</string>
  <string name="prefs_feedback">Geribildirim</string>
  <string name="prefs_imprint">İzlenim</string>
+  <string name="prefs_remember_last_share_location">Konum paylaşmayı hatırla</string>
+  <string name="prefs_remember_last_upload_location_summary">Son paylaşma yükleme konumunu hatırla</string>
  <string name="recommend_subject">%1$s uygulamasını akıllı telefonunda dene!</string>
  <string name="recommend_text">Seni, akıllı telefonunda %1$s kullanmaya davet ediyorum!\nBuradan indirebilirsin: %2$s</string>
  <string name="auth_check_server">Sunucuyu Denetle</string>
@ -57,9 +59,14 @@
  <string name="uploader_wrn_no_content_text">Hiç içerik alınmadı. Yüklenecek hiçbir şey yok.</string>
  <string name="uploader_error_forbidden_content">%1$s için paylaşılan içeriğe erişim izni yok</string>
  <string name="uploader_info_uploading">Yükleniyor</string>
+  <string name="file_list_seconds_ago">saniyeler önce</string>
  <string name="file_list_empty">Burada hiçbir şey yok. Bir şeyler yükleyin!</string>
  <string name="file_list_loading">Yükleniyor...</string>
  <string name="local_file_list_empty">Bu klasörde dosya yok.</string>
+  <string name="file_list_folder">klasör</string>
+  <string name="file_list_folders">klasörler</string>
+  <string name="file_list_file">dosya</string>
+  <string name="file_list_files">dosyalar</string>
  <string name="filedetails_select_file">Ek bilgileri görmek için dosyaya dokunun.</string>
  <string name="filedetails_size">Boyut:</string>
  <string name="filedetails_type">Tür:</string>
@ -275,13 +282,14 @@
  <string name="auth_redirect_non_secure_connection_title">Güvenli bağlantı, güvenli olmayan bir rotaya yönlendirildi.</string>
  <string name="actionbar_logger">Günlükler</string>
  <string name="log_send_history_button">Geçmişi Gönder</string>
-  <string name="log_mail_subject">ownCloud Android uygulama kayıtları</string>
-  <string name="log_progress_dialog_text">Veri yükleniyor...</string>
+  <string name="log_send_no_mail_app">Günlükleri göndermek için uygulama bulunamadı. E-posta uygulamasını yükleyin!</string>
+  <string name="log_send_mail_subject">%1$s Android uygulama kayıtları</string>
+  <string name="log_progress_dialog_text">Yükleniyor...</string>
  <string name="saml_authentication_required_text">Kimlik doğrulama gerekli</string>
  <string name="saml_authentication_wrong_pass">Hatalı parola</string>
  <string name="actionbar_move">Taşı</string>
  <string name="file_list_empty_moving">Burada bir şey yok. Bir klasör ekleyebilirsiniz!</string>
-  <string name="move_choose_button_text">Seç</string>
+  <string name="folder_picker_choose_button_text">Seç</string>
  <string name="move_file_not_found">Taşıma başarısız. Lütfen dosyanın mevcut olup olmadığını denetleyin</string>
  <string name="move_file_invalid_into_descendent">Klasörü, kendi alt klasörüne taşımak mümkün değil</string>
  <string name="move_file_invalid_overwrite">Dosya zaten hedef klasörde mevcut</string>
@ -289,4 +297,6 @@
  <string name="forbidden_permissions_move">bu dosyayı taşımak için</string>
  <string name="prefs_category_instant_uploading">Anında Yüklemeler</string>
  <string name="prefs_category_security">Güvenlik</string>
+  <string name="prefs_instant_video_upload_path_title">Video Yükleme Yolu</string>
+  <string name="shared_subject_header">paylaşılan</string>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@ -44,4 +44,5 @@
  <string name="empty"></string>
  <string name="prefs_category_accounts">ھېساباتلار</string>
  <string name="prefs_category_security">بىخەتەرلىك</string>
+  <string name="shared_subject_header">ھەمبەھىرلەنگەن</string>
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@ -57,9 +57,14 @@
  <string name="uploader_wrn_no_content_text">Не отримано даних. Нічого завантажувати.</string>
  <string name="uploader_error_forbidden_content">%1$s не може отримати доступ до спільного контенту</string>
  <string name="uploader_info_uploading">Завантаження</string>
+  <string name="file_list_seconds_ago">секунди тому</string>
  <string name="file_list_empty">Тут нічого немає. Відвантажте що-небудь!</string>
  <string name="file_list_loading">Завантаження...</string>
  <string name="local_file_list_empty">В цій теці немає файлів.</string>
+  <string name="file_list_folder">тека</string>
+  <string name="file_list_folders">теки</string>
+  <string name="file_list_file">файл</string>
+  <string name="file_list_files">файли</string>
  <string name="filedetails_select_file">Натисніть на файлі для відображення додаткової інформації</string>
  <string name="filedetails_size">Розмір:</string>
  <string name="filedetails_type">Тип:</string>
@ -274,13 +279,11 @@
  <string name="auth_redirect_non_secure_connection_title">Безпечне підключення перенаправляється через незабезпечений маршрут.</string>
  <string name="actionbar_logger">Журнали</string>
  <string name="log_send_history_button">Надіслати історію</string>
-  <string name="log_mail_subject">Журнали Android-додатка ownCloud</string>
-  <string name="log_progress_dialog_text">Завантаження даних...</string>
  <string name="saml_authentication_required_text">Потрібна аутентифікація</string>
  <string name="saml_authentication_wrong_pass">Невірний пароль</string>
  <string name="actionbar_move">Перемістити</string>
  <string name="file_list_empty_moving">Тут нічого немає. Ви можете додати теку!</string>
-  <string name="move_choose_button_text">Обрати</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>
@ -288,4 +291,5 @@
  <string name="forbidden_permissions_move">перемістити цей файл</string>
  <string name="prefs_category_instant_uploading">Миттєво завантаження</string>
  <string name="prefs_category_security">Безпека</string>
+  <string name="shared_subject_header">спільне</string>
 </resources>
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc`