From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 10 Aug 2015 11:01:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
X-Git-Tag: oc-android-1.8~42^2~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/275028a5e33e0ca7fd9901c4649939bad66311c4?hp=4a4296a07e0a632f83cfc306ddaa7f74b4ca6c7b

Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
---

diff --git a/.gitmodules b/.gitmodules
index 38f0f582..7ccbef03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
 [submodule "owncloud-android-library"]
 	path = owncloud-android-library
 	url = git://github.com/owncloud/android-library.git
-	branch = develop
+	branch = master
 [submodule "ocdoc"]
 	path = user_manual/ocdoc
 	url = https://github.com/owncloud/documentation
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 63bfd7ff..1dc53b42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,23 +27,23 @@ Thanks for wanting to contribute source code to ownCloud. That's great!
 Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement].
 
 ### Guidelines
-* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code.
-* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement].
+* Contribute your code in the branch 'master'. It will give us a better chance to test your code before merging it with stable code.
+* For your first contribution, start a pull request on master and send us the signed [Contributor Agreement][agreement].
 * Keep on using pull requests for your next contributions although you own write permissions.
 
 [agreement]: http://owncloud.org/about/contributor-agreement/
 
-### 1. Fork and download android/develop repository:
+### 1. Fork and download android/master repository:
 
 NOTE: You must have the git installation folder in your environment variable PATH to perform the next operations.
 
 * In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
 * In a command line prompt, clone your new repo: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
 * Move to the project folder with ```cd android```.
-* Checkout the remote branch 'develop' in your own local branch: ```git checkout -b develop remotes/origin/develop```.
-* Pull any changes from your remote branch 'develop': ```git pull origin develop```
+* Checkout the remote branch 'master' in your own local branch: ```git checkout -b master remotes/origin/master```.
+* Pull any changes from your remote branch 'master': ```git pull origin master```
 * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
-* Make sure to get the latest changes from official android/develop branch: ```git pull upstream develop```
+* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
 
 
 ### 7. Create pull request:
@@ -53,18 +53,16 @@ NOTE: You must sign the [Contributor Agreement][1] before your changes can be ac
 * Commit your changes locally: "git commit -a"
 * 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.
 
 ### 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.
+To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/master.
 
 * git fetch upstream
-* 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"
+* git checkout -b my_new_master_branch upstream/master
+* If you want to rename that branch later: "git checkout -b my_new_master_branch_with_new_name"
+* Push branch to server: "git push -u origin name_of_local_master_branch"
 * Use GitHub to issue PR
 
 
diff --git a/README.md b/README.md
index c8bd71c3..e3ff5353 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
 The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now.
 
 ## Build Status on
-Git master:  ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master)
+Git master: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master)
 
-Git develop: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=develop)
+Git stable:  ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=stable)
 
 ## Development
 
@@ -17,4 +17,4 @@ Make sure you read [SETUP.md][1] when you start working on this project.
 
 ### Contributing
 Please see [Contribution Guidelines](https://owncloud.org/contribute/). Fork this repository and contribute back using
-[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['develop'](https://github.com/owncloud/android/tree/develop) branch.
+[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['master'](https://github.com/owncloud/android/tree/master) branch.
diff --git a/SETUP.md b/SETUP.md
index e1148167..4f9cef9d 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -36,10 +36,10 @@ Next steps will assume you have a Github account and that you will get the code
 * Open a terminal and go on with the next steps in it.
 * Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
 * Move to the project folder with ```cd android```.
-* Checkout the remote branch 'develop' in your own local branch 'develop': ```git checkout -b develop remotes/origin/develop```.
-* Pull any changes from your remote branch 'develop': ```git pull origin develop```
+* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```.
+* Pull any changes from your remote branch 'master': ```git pull origin master```
 * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
-* Make sure to get the latest changes from official android/develop branch: ```git pull upstream develop```
+* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
 
 At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe the existing alternatives.
 
diff --git a/owncloud-android-library b/owncloud-android-library
index c8f6e5ad..dbc8c325 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit c8f6e5ad57ee27fdac39c7b14eb6ab1942a92d49
+Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 65553255..0d5ed858 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -253,7 +253,11 @@
   <string name="instant_upload_on_wifi">Odesílat obrázky pouze přes WiFi</string>
   <string name="instant_video_upload_on_wifi">Nahrávat videa pouze přes WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Konflikt souboru</string>
+  <string name="conflict_message">Které soubory chcete ponechat? Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.</string>
   <string name="conflict_keep_both">Ponechat oba</string>
+  <string name="conflict_use_local_version">Použít lokální verzi</string>
+  <string name="conflict_use_server_version">Použít serverovou verzi</string>
   <string name="preview_image_description">Náhled obrázku</string>
   <string name="preview_image_error_unknown_format">Obrázek nelze zobrazit</string>
   <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
@@ -308,6 +312,7 @@ správce systému.</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 s vámi sdílí \"%2$s\"</string>
+  <string name="saml_subject_token">\"%1$s\" ti byl nasdílen</string>
   <string name="auth_refresh_button">Obnovit připojení</string>
   <string name="auth_host_address">Adresa serveru</string>
   <string name="common_error_out_memory">Nedostatek paměti</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3bf41709..1c744d97 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -253,7 +253,11 @@
   <string name="instant_upload_on_wifi">Upload kun billeder via WiFi </string>
   <string name="instant_video_upload_on_wifi">Upload kun videoer via WiFi</string>
   <string name="instant_upload_path">/Øjeblikkelig upload</string>
+  <string name="conflict_title">Filkonflikt</string>
+  <string name="conflict_message">Hvilke filer ønsker du at beholde? Hvis du vælger begge versioner, så vil den lokale fil få et tal tilføjet til sit navn.</string>
   <string name="conflict_keep_both">Behold begge</string>
+  <string name="conflict_use_local_version">Benyt lokal version</string>
+  <string name="conflict_use_server_version">Benyt serverversionen</string>
   <string name="preview_image_description">Forhåndsvisning af billede</string>
   <string name="preview_image_error_unknown_format">Dette billede kan ikke vises</string>
   <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til %2$s lokale mappe</string>
@@ -308,6 +312,7 @@
   <string name="shared_subject_header">delt</string>
   <string name="with_you_subject_header">med dig</string>
   <string name="subject_token">%1$s delte \"%2$s\" med dig</string>
+  <string name="saml_subject_token">\"%1$s\" er blevet delt med dig</string>
   <string name="auth_refresh_button">Genopfrisk forbindelsen</string>
   <string name="auth_host_address">Serveradresse</string>
   <string name="common_error_out_memory">Ikke tilstrækkelig hukommelse</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index b529426e..42c41036 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
   <string name="instant_video_upload_on_wifi">Videos nur über WiFi hochladen</string>
   <string name="instant_upload_path">/SofortUpload</string>
+  <string name="conflict_title">Dateikonflikt</string>
+  <string name="conflict_message">Welche Datei möchtest du behalten? Wenn du beide Versionen auswählst, wird der lokalen Datei eine Zahl am Ende Ihres Dateiname angehangen.</string>
   <string name="conflict_keep_both">Beide behalten</string>
+  <string name="conflict_use_local_version">Benutze lokale Version</string>
+  <string name="conflict_use_server_version">Benutze Version auf dem Server</string>
   <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>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">geteilt</string>
   <string name="with_you_subject_header">Mit Ihnen</string>
   <string name="subject_token">%1$s hat \"%2$s\" mit Ihnen geteilt</string>
+  <string name="saml_subject_token">\"%1$s\" wurde mit dir geteilt</string>
   <string name="auth_refresh_button">Verbindung aktualisieren</string>
   <string name="auth_host_address">Serveradresse</string>
   <string name="common_error_out_memory">Nicht genügend Speicher</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8c39ba5f..4d0b86e6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
   <string name="instant_video_upload_on_wifi">Videos nur über WiFi hochladen</string>
   <string name="instant_upload_path">/SofortUpload</string>
+  <string name="conflict_title">Dateikonfilikt</string>
+  <string name="conflict_message">Welche Datei möchtest du behalten? Wenn du beide Versionen auswählst, wird der lokalen Datei eine Zahl am Ende Ihres Dateiname angehangen.</string>
   <string name="conflict_keep_both">Beide behalten</string>
+  <string name="conflict_use_local_version">Benutze lokale Version</string>
+  <string name="conflict_use_server_version">Benutze Version auf dem Server</string>
   <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>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">geteilt</string>
   <string name="with_you_subject_header">Mit Dir</string>
   <string name="subject_token">%1$s hat \"%2$s\" mit Dir geteilt</string>
+  <string name="saml_subject_token">\"%1$s\" wurde mit dir geteilt</string>
   <string name="auth_refresh_button">Verbindung aktualisieren</string>
   <string name="auth_host_address">Serveradresse</string>
   <string name="common_error_out_memory">Nicht genügend Speicher</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d48871ed..0ccada8d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Μεταφόρτωση εικόνων μόνο μέσω WiFi</string>
   <string name="instant_video_upload_on_wifi">Μεταφόρτωση βίντεο μόνο μέσω WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Διένεξη αρχείων</string>
+  <string name="conflict_message">Ποια αρχεία θέλετε να κρατήσετε; Αν επιλέξετε και τις δύο εκδοχές, στο τοπικό αρχείο θα προστεθεί ένας αριθμός στο όνομά του.</string>
   <string name="conflict_keep_both">Διατήρηση και των δύο</string>
+  <string name="conflict_use_local_version">Χρήση τοπικής εκδοχής</string>
+  <string name="conflict_use_server_version">Χρήση εκδοχής διακομιστή</string>
   <string name="preview_image_description">Προεπισκόπηση εικόνας</string>
   <string name="preview_image_error_unknown_format">Αυτή η εικόνα δεν μπορεί να προβληθεί</string>
   <string name="error__upload__local_file_not_copied">Το %1$s δεν μπόρεσε να αντιγραφεί στον τοπικό φάκελο %2$s</string>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">διαμοιρασμένα</string>
   <string name="with_you_subject_header">με εσάς</string>
   <string name="subject_token">Ο %1$s διαμοιράστηκε το \"%2$s\" με εσάς</string>
+  <string name="saml_subject_token">\"%1$s\" μοιράστηκε μαζί σας</string>
   <string name="auth_refresh_button">Ανανέωση σύνδεσης</string>
   <string name="auth_host_address">Διεύθυνση διακομιστή</string>
   <string name="common_error_out_memory">Δεν υπάρχει αρκετή μνήμη</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 73d61c55..a7c87e14 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Subir imágenes sólo cuando hay WiFi</string>
   <string name="instant_video_upload_on_wifi">Subir vídeos sólo por WiFi</string>
   <string name="instant_upload_path">/SubidasInstantáneas</string>
+  <string name="conflict_title">Conflicto con archivo</string>
+  <string name="conflict_message">¿Qué archivos desea mantener? Si selecciona ambas versiones, el archivo local tendrá un número añadido a su nombre.</string>
   <string name="conflict_keep_both">Mantener ambos</string>
+  <string name="conflict_use_local_version">Usar versión local</string>
+  <string name="conflict_use_server_version">Usar versión del servidor</string>
   <string name="preview_image_description">Previsualización de imagen</string>
   <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
   <string name="error__upload__local_file_not_copied">%1$s se pudo copiar a la carpeta local %2$s</string>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">compartido</string>
   <string name="with_you_subject_header">con usted</string>
   <string name="subject_token">%1$s compartió \"%2$s\" conmigo</string>
+  <string name="saml_subject_token">\"%1$s\" ha sido compartido con usted.</string>
   <string name="auth_refresh_button">Refrescar la conexión</string>
   <string name="auth_host_address">Dirección del servidor</string>
   <string name="common_error_out_memory">No hay suficiente memoria</string>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index c85f6b6a..554b6c8e 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -242,7 +242,11 @@
   <string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
   <string name="instant_video_upload_on_wifi">Lähetä videot vain wifi-yhteydellä</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Tiedoston ristiriita</string>
+  <string name="conflict_message">Mitkä tiedostot haluat säilyttää? Jos valitset kummatkin versiot, paikallisen version tiedoston nimeen lisätään numero.</string>
   <string name="conflict_keep_both">Säilytä molemmat</string>
+  <string name="conflict_use_local_version">Käytä paikallista versiota</string>
+  <string name="conflict_use_server_version">Käytä palvelimen versiota</string>
   <string name="preview_image_description">Kuvan esikatselu</string>
   <string name="preview_image_error_unknown_format">Tätä kuvaa ei voi näyttää</string>
   <string name="prefs_instant_upload_path_title">Lähetyspolku</string>
@@ -290,6 +294,7 @@
   <string name="shared_subject_header">jaettu</string>
   <string name="with_you_subject_header">kanssasi</string>
   <string name="subject_token">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
+  <string name="saml_subject_token">\"%1$s\" on jaettu kanssasi</string>
   <string name="auth_refresh_button">Päivitä yhteys</string>
   <string name="auth_host_address">Palvelimen osoite</string>
   <string name="common_error_out_memory">Muistia ei ole riittävästi</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0ec46b69..84962f2a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -255,7 +255,11 @@ Descárgueo de aquí: %2$s</string>
   <string name="instant_upload_on_wifi">Enviar imaxes só medinte WiFi</string>
   <string name="instant_video_upload_on_wifi">Enviar os vídeos só a través de WiFi</string>
   <string name="instant_upload_path">/EnvíoInstantáneo</string>
+  <string name="conflict_title">Conflito de ficheiro</string>
+  <string name="conflict_message">Que ficheiros quere conservar? Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.</string>
   <string name="conflict_keep_both">Manter ambos</string>
+  <string name="conflict_use_local_version">Usar a versión local</string>
+  <string name="conflict_use_server_version">Usar a versión do servidor</string>
   <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>
@@ -310,6 +314,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="shared_subject_header">compartido</string>
   <string name="with_you_subject_header">con vostede</string>
   <string name="subject_token">%1$s compartiu «%2$s» con vostede</string>
+  <string name="saml_subject_token">«%1$s» foi compartido con vostede</string>
   <string name="auth_refresh_button">Actualizar a conexión</string>
   <string name="auth_host_address">Enderezo do servidor</string>
   <string name="common_error_out_memory">Non hai memoria abondo</string>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 73109266..6fc11933 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -30,7 +30,7 @@
   <string name="prefs_log_summary">Ez használható a problémák naplózásához</string>
   <string name="prefs_log_title_history">Naplózás előzménye</string>
   <string name="prefs_log_summary_history">Ez megjeleníti a rögzitett eseményeket</string>
-  <string name="prefs_log_delete_history_button">Elözmények törlése</string>
+  <string name="prefs_log_delete_history_button">Előzmények törlése</string>
   <string name="prefs_help">Súgó</string>
   <string name="prefs_recommend">Ajánlja egy barátjának</string>
   <string name="prefs_feedback">Visszajelzés</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 443b0d3b..c0e9d98e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Carica le immagini solo via WiFi</string>
   <string name="instant_video_upload_on_wifi">Carica i video solo tramite WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">File in conflitto</string>
+  <string name="conflict_message">Quali file vuoi tenere? Se selezioni entrambi le versioni, il file locale avrà un numero aggiunto al suo nome.</string>
   <string name="conflict_keep_both">Mantieni entrambi</string>
+  <string name="conflict_use_local_version">Usa la versione locale</string>
+  <string name="conflict_use_server_version">Usa la versione del server</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>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">condiviso</string>
   <string name="with_you_subject_header">con te</string>
   <string name="subject_token">%1$s ha condiviso \"%2$s\" con te</string>
+  <string name="saml_subject_token">\"%1$s\" è stato condiviso con te</string>
   <string name="auth_refresh_button">Aggiorna la connessione</string>
   <string name="auth_host_address">Indirizzo del server</string>
   <string name="common_error_out_memory">Memoria insufficiente</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e7e6a62c..1e05442d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -257,7 +257,11 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="instant_upload_on_wifi">Upload afbeeldingen alleen via WiFi</string>
   <string name="instant_video_upload_on_wifi">Upload video\'s alleen over wifi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Bestandsconflict</string>
+  <string name="conflict_message">Welke bestanden wilt u bewaren? Als u beide versies selecteert zal het lokale bestand een nummer aan de naam toegevoegd krijgen.</string>
   <string name="conflict_keep_both">Beide bewaren</string>
+  <string name="conflict_use_local_version">Gebruik de lokale versie</string>
+  <string name="conflict_use_server_version">Gebruik de server-versie</string>
   <string name="preview_image_description">Afbeelding voorbeeld</string>
   <string name="preview_image_error_unknown_format">Deze afbeelding kan niet worden getoond</string>
   <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de %2$s lokale map</string>
@@ -312,6 +316,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="shared_subject_header">gedeeld</string>
   <string name="with_you_subject_header">met u</string>
   <string name="subject_token">%1$s deelde \"%2$s\" met u</string>
+  <string name="saml_subject_token">\"%1$s\" is gedeeld met u</string>
   <string name="auth_refresh_button">Verversen verbinding</string>
   <string name="auth_host_address">Serveradres</string>
   <string name="common_error_out_memory">Niet voldoende geheugen</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 771bec45..56f898d9 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -254,7 +254,11 @@
   <string name="instant_upload_on_wifi">Fazer envio de fotos somente via WiFi</string>
   <string name="instant_video_upload_on_wifi">Enviar vídeos somente via WiFi</string>
   <string name="instant_upload_path">/Upload instantâneo</string>
+  <string name="conflict_title">Conflito de arquivo</string>
+  <string name="conflict_message">Quais arquivos você deseja manter? Se você selecionar ambas as versões, o arquivo local terá um número adicionado ao seu nome.</string>
   <string name="conflict_keep_both">Manter ambos</string>
+  <string name="conflict_use_local_version">Usar a versão local</string>
+  <string name="conflict_use_server_version">Usar a versão servidor</string>
   <string name="preview_image_description">Pré-visualização da 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">%1$s não pôde ser copiado para pasta local %2$s</string>
@@ -309,6 +313,7 @@
   <string name="shared_subject_header">compartilhado</string>
   <string name="with_you_subject_header">com você</string>
   <string name="subject_token">%1$s compartilhado \"%2$s\" com você</string>
+  <string name="saml_subject_token">\"%1$s\" foi compartilhado com você</string>
   <string name="auth_refresh_button">Reinicializar conexão</string>
   <string name="auth_host_address">Endereço do servidor</string>
   <string name="common_error_out_memory">Não há memoria suficiente</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 862f8224..ce9565be 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,11 +25,13 @@
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_item_settings">Definições</string>
+  <string name="drawer_item_logs">Registos de Alterações</string>
   <string name="drawer_close">Fechar</string>
   <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_passcode">Bloquear código</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>
@@ -128,6 +130,15 @@
   <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="pass_code_enter_pass_code">Por favor, insira o seu código</string>
+  <string name="pass_code_configure_your_pass_code">Insira o seu código</string>
+  <string name="pass_code_configure_your_pass_code_explanation">O código será solicitado sempre que a aplicação for iniciada</string>
+  <string name="pass_code_reenter_your_pass_code">Por favor, reinsira o seu código</string>
+  <string name="pass_code_remove_your_pass_code">Remova o seu código</string>
+  <string name="pass_code_mismatch">Os códigos não coincidem</string>
+  <string name="pass_code_wrong">Código Incorreto</string>
+  <string name="pass_code_removed">Código removido</string>
+  <string name="pass_code_stored">Código guardado</string>
   <string name="media_notif_ticker">%1$s reprodutor de música</string>
   <string name="media_state_playing">%1$s (a reproduzir)</string>
   <string name="media_state_loading">%1$s (a carregar)</string>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 0f9218a4..50d6fc25 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -63,12 +63,12 @@
   <string name="uploader_wrn_no_account_text">ไม่มีบัญชี %1$s บนอุปกรณ์ของคุณ กรุณาตั้งค่าบัญชีของคุณก่อน</string>
   <string name="uploader_wrn_no_account_setup_btn_text">ตั้งค่า</string>
   <string name="uploader_wrn_no_account_quit_btn_text">ออก</string>
-  <string name="uploader_wrn_no_content_title">ยังไม่มีเนื้อหาที่ถูกอัปโหลด</string>
+  <string name="uploader_wrn_no_content_title">ยังไม่มีเนื้อหาที่ถูกอัพโหลด</string>
   <string name="uploader_wrn_no_content_text">ยังไม่ได้รับเนื้อหา ยังไม่มีการอัพโหลดใดๆ</string>
   <string name="uploader_error_forbidden_content">%1$s ไม่ได้รับอนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้</string>
   <string name="uploader_info_uploading">กำลังอัพโหลด</string>
   <string name="file_list_seconds_ago">วินาที ก่อนหน้านี้</string>
-  <string name="file_list_empty">ยังไม่มีไฟล์ใดๆเลย ลองอัปโหลดดูสิ!</string>
+  <string name="file_list_empty">ยังไม่มีไฟล์ใดๆเลย ลองอัพโหลดดูสิ!</string>
   <string name="file_list_loading">กำลังโหลด...</string>
   <string name="local_file_list_empty">ยังไม่มีไฟล์ในโฟลเดอร์นี้</string>
   <string name="filedetails_select_file">แตะที่ไฟล์ เพื่อแสดงข้อมูลเพิ่มเติม</string>
@@ -114,14 +114,14 @@
   <string name="downloader_not_downloaded_yet">ยังดาวน์โหลดไม่ได้</string>
   <string name="downloader_download_failed_credentials_error">การดาวน์โหลดล้มเหลวคุณจะต้องเข้าสู่ระบบใหม่</string>
   <string name="common_choose_account">เลือกบัญชี</string>
-  <string name="sync_fail_ticker">การเชื่อมผสานข้อมูลล้มเหลว</string>
-  <string name="sync_fail_ticker_unauthorized">การเชื่อมผสานข้อมูลล้มเหลว คุณจะต้องเข้าสู่ระบบใหม่</string>
-  <string name="sync_fail_content">การเชื่อมผสานข้อมูลของ %1$s ไม่สามารถดำเนินการให้เสร็จสมบูรณ์ได้</string>
+  <string name="sync_fail_ticker">การเชื่อมประสานข้อมูลล้มเหลว</string>
+  <string name="sync_fail_ticker_unauthorized">การประสานข้อมูลล้มเหลว คุณจะต้องเข้าสู่ระบบใหม่</string>
+  <string name="sync_fail_content">การประสานข้อมูลของ %1$s ไม่สามารถดำเนินการให้เสร็จสมบูรณ์ได้</string>
   <string name="sync_fail_content_unauthorized">รหัสผ่านไม่ถูกต้องสำหรับ %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">ตรวจพบความขัดแย้ง</string>
-  <string name="sync_conflicts_in_favourites_content">%1$d ไฟล์ kept-in-sync ไม่สามารถเชื่อมผสานข้อมูลได้</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d ไฟล์ kept-in-sync ไม่สามารถประสานข้อมูลได้</string>
   <string name="sync_fail_in_favourites_ticker">ไฟล์ Kept-in-sync ล้มเหลว</string>
-  <string name="sync_fail_in_favourites_content">เนื้อหาของไฟล์ %1$d ไม่สามารถผสานเชื่อมข้อมูลได้ (ความขัดแย้ง %2$d รายการ)</string>
+  <string name="sync_fail_in_favourites_content">เนื้อหาของไฟล์ %1$d ไม่สามารถประสานเชื่อมข้อมูลได้ (ความขัดแย้ง %2$d รายการ)</string>
   <string name="sync_foreign_files_forgotten_ticker">มีแฟ้มข้อมูลต้นทางบางแฟ้มถูกลืม</string>
   <string name="sync_foreign_files_forgotten_content">ไม่สามารถคัดลอกไฟล์ %1$d ไปยังโฟลเดอร์ %2$s</string>
   <string name="sync_foreign_files_forgotten_explanation">ขณะที่รุ่น 1.3.16 ไฟล์ที่อัปโหลดจากเครื่องของคุณจะถูกคัดลอกไปสำรองไว้ที่ต้นทาง %1$s เพื่อป้องกันการสูญเสียข้อมูลเมื่อไฟล์เดียวถูกซิงค์กับบัญชีหลายบัญชี \n\n การเปลี่ยนแปลงนี้ไฟล์ทั้งหมดที่อัปโหลดในรุ่นก่อนหน้า ของ app นี้ถูกคัดลอกลงในโฟลเดอร์ %2$s แต่ก็อาจมีข้อผิดพลาดในการดำเนินการนี้ช่วงระหว่างการประสานบัญชี คุณอาจจะสูญเสียข้อมูล  เช่นเดียวกับการลบ หรือย้ายไฟล์และเชื่อมโยงไปยัง %3$s ส่วนโฟลเดอร์ %1$s จะถูกเชื่อมโยงไปยัง %4$s \n\n รายชื่อด้านล่าง เป็นแฟ้มต้นทาง และแฟ้มปลายทาง ใน %5$s มันจะถูกนำมาเชื่อมโยงกัน</string>
@@ -208,7 +208,7 @@
   <string name="rename_local_fail_msg">ไฟล์ต้นทางที่คัดลอกไม่สามารถเปลี่ยนชื่อได้, กรุณาเปลี่ยนเป็นชื่อใหม่</string>
   <string name="rename_server_fail_msg">ไม่สามารถเปลี่ยนชื่อได้</string>
   <string name="sync_file_fail_msg">ไม่สามารถตรวจสอบไฟล์ระยะไกลได้</string>
-  <string name="sync_file_nothing_to_do_msg">เนื้อหาของไฟล์มีข้อมูลอยู่แล้ว</string>
+  <string name="sync_file_nothing_to_do_msg">เนื้อหาของไฟล์ถูกประสานข้อมูลอยู่แล้ว</string>
   <string name="create_dir_fail_msg">ไม่สามารถสร้างโฟลเดอร์</string>
   <string name="filename_forbidden_characters">ห้ามใช้ตัวอักษรดังนี้: / \\ &lt; &gt; : \" | ? *</string>
   <string name="filename_forbidden_charaters_from_server">มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</string>
@@ -253,7 +253,11 @@
   <string name="instant_upload_on_wifi">อัพโหลดรูปภาพผ่านทาง WiFi เท่านั้น</string>
   <string name="instant_video_upload_on_wifi">อัพโหลดวีดีโอผ่านทาง WiFi เท่านั้น</string>
   <string name="instant_upload_path">/อัพโหลดทันที</string>
+  <string name="conflict_title">ไฟล์ที่ขัดแย้ง</string>
+  <string name="conflict_message">ไฟล์ใดที่คุณต้องการที่จะเก็บ? หากคุณเลือกทั้งสองรุ่น ไฟล์ต้นทางจะมีจำนวนชื่อเพิ่ม</string>
   <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
+  <string name="conflict_use_local_version">ใช้รุ่นทั่วไป</string>
+  <string name="conflict_use_server_version">ใช้รุ่นของเซิร์ฟเวอร์</string>
   <string name="preview_image_description">แสดงรูปภาพตัวอย่าง</string>
   <string name="preview_image_error_unknown_format">ไม่สามารถแสดงรูปภาพนี้ได้</string>
   <string name="error__upload__local_file_not_copied">%1$s ไม่สามารถคัดลอกไปยังโฟลเดอร์ %2$s ในเครื่อง</string>
@@ -307,6 +311,7 @@
   <string name="shared_subject_header">ถูกแชร์</string>
   <string name="with_you_subject_header">กับคุณ</string>
   <string name="subject_token">%1$s ได้แชร์ \"%2$s\" กับคุณ</string>
+  <string name="saml_subject_token">\"%1$s\" ได้ถูกแชร์กับคุณ</string>
   <string name="auth_refresh_button">ฟื้นฟูการเชื่อมต่อ</string>
   <string name="auth_host_address">ที่อยู่เซิร์ฟเวอร์</string>
   <string name="common_error_out_memory">หน่วยความจำไม่พอ</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fe4a99c2..5551587c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="about_android">%1$s 安卓应用</string>
+  <string name="about_android">%1$s Android 应用</string>
   <string name="about_version">版本：%1$s</string>
   <string name="actionbar_sync">刷新帐户</string>
   <string name="actionbar_upload">上传</string>
@@ -69,6 +69,7 @@
   <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="filedetails_select_file">点击一个文件可以显示额外的信息。</string>
   <string name="filedetails_size">大小：</string>
@@ -210,6 +211,7 @@
   <string name="sync_file_nothing_to_do_msg">文件内容已同步</string>
   <string name="create_dir_fail_msg">文件夹无法创建</string>
   <string name="filename_forbidden_characters">禁用字符: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">文件名中存在至少一个非法字符</string>
   <string name="filename_empty">文件名不能为空</string>
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
@@ -251,7 +253,11 @@
   <string name="instant_upload_on_wifi">仅通过 WIFI 上传图片。</string>
   <string name="instant_video_upload_on_wifi">仅通过 WIFI 上传视频</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">文件冲突</string>
+  <string name="conflict_message">您想要保留哪个文件？如果您同时选中了两个版本，本地的文件的文件名将被加上一个数字</string>
   <string name="conflict_keep_both">保留两者</string>
+  <string name="conflict_use_local_version">使用本地版本</string>
+  <string name="conflict_use_server_version">使用服务器版本</string>
   <string name="preview_image_description">图片预览</string>
   <string name="preview_image_error_unknown_format">无法显示图片</string>
   <string name="error__upload__local_file_not_copied">无法复制 %1$s 到本地目录 %2$s</string>
@@ -308,4 +314,12 @@
   <string name="auth_host_address">服务器地址</string>
   <string name="common_error_out_memory">内存不足</string>
   <string name="username">用户名</string>
+  <string name="file_list__footer__folder">1 个文件夹</string>
+  <string name="file_list__footer__folders">%1$d 个文件夹</string>
+  <string name="file_list__footer__file">1 个文件</string>
+  <string name="file_list__footer__file_and_folder">1 个文件，1 个文件夹</string>
+  <string name="file_list__footer__file_and_folders">1 个文件，%1$d 个文件夹</string>
+  <string name="file_list__footer__files">%1$d 个文件</string>
+  <string name="file_list__footer__files_and_folder">%1$d 个文件，1 个文件夹</string>
+  <string name="file_list__footer__files_and_folders">%1$d 个文件，%2$d 个文件夹</string>
 </resources>