From: masensio <masensio@solidgear.es>
Date: Mon, 15 Jun 2015 11:56:41 +0000 (+0200)
Subject: Merge pull request #1013 from owncloud/keep_permanent_redirections
X-Git-Tag: oc-android-1.7.2~1^2~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0b567b9713475d19fe586799a2e068f072c25da0?hp=d75cb8d6a0c9f0589d4a980935473e1594ad5126

Merge pull request #1013 from owncloud/keep_permanent_redirections

Keep permanent redirections
---

diff --git a/automationTest/.gitignore b/automationTest/.gitignore
index 6eb20948..487ae52f 100644
--- a/automationTest/.gitignore
+++ b/automationTest/.gitignore
@@ -2,3 +2,4 @@
 target/
 ScreenShots/
 .DS_Store
+Users/
\ No newline at end of file
diff --git a/automationTest/README.md b/automationTest/README.md
index 938e47a2..899bb8dc 100644
--- a/automationTest/README.md
+++ b/automationTest/README.md
@@ -5,11 +5,16 @@ This project contains a set of automatic tests operating in the UI level.
 Tests are to be run with the tool Appium. Check [here][0] to install it and all its dependencies (including Maven).
 
 You will need to modify the constants in automationTest/src/test/java/com/owncloud/android/test/ui/testSuites/Config.java to assign appropiate values for your test server and accounts.
+You will need to include the ownCloud.apk to test in automationTest/src/test/resources/.
 
 To run the tests from command line, plug a device to your computer or start and emulator. Then type 
 
 mvn clean tests
 
+To run only one category of the test
+
+mvn clean -Dtest=RunSmokeTests test
+
 The project may also be imported in Eclipse, with the appropiate plug-ins, and run from it.
 
 [0]: http://appium.io/slate/en/master/?java#about-appium
\ No newline at end of file
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 33ac4887..d80e6764 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Hent</string>
   <string name="filedetails_sync_file">Genopfrisk fil</string>
   <string name="filedetails_renamed_in_upload_msg">Filen blev omdøbt til %1$s under upload</string>
+  <string name="list_layout">Listevisning</string>
   <string name="action_share_file">Del link</string>
   <string name="action_unshare_file">Ophæv deling</string>
   <string name="common_yes">Ja</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3b810e60..a6ddb981 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Λήψη</string>
   <string name="filedetails_sync_file">Ανανέωση αρχείου</string>
   <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά τη μεταφόρτωση</string>
+  <string name="list_layout">Διάταξη Λίστας</string>
   <string name="action_share_file">Διαμοιρασμός συνδέσμου</string>
   <string name="action_unshare_file">Ακύρωση διαμοιρασμού συνδέσμου</string>
   <string name="common_yes">Ναι</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index de0703da..0b2d15bc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Descargar</string>
   <string name="filedetails_sync_file">Actualizar archivo</string>
   <string name="filedetails_renamed_in_upload_msg">El fichero fue renombrado como %1$s durante la subida</string>
+  <string name="list_layout">Diseño de lista</string>
   <string name="action_share_file">Compartir con enlace</string>
   <string name="action_unshare_file">Dejar de compartir</string>
   <string name="common_yes">Sí</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 91c83ea8..3f406659 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -76,6 +76,7 @@ Téléchargez-le ici : %2$s</string>
   <string name="filedetails_download">Télécharger</string>
   <string name="filedetails_sync_file">Actualiser le fichier</string>
   <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
+  <string name="list_layout">Disposition en liste</string>
   <string name="action_share_file">Partager le lien</string>
   <string name="action_unshare_file">Ne plus partager ce lien</string>
   <string name="common_yes">Oui</string>
@@ -134,7 +135,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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 les déplacer à la place ?</string>
   <string name="pass_code_enter_pass_code">Veuillez saisir votre code de sécurité</string>
   <string name="pass_code_configure_your_pass_code">Saisissez votre code de sécurité</string>
-  <string name="pass_code_configure_your_pass_code_explanation">Le code de sécurité sera demandé à chaque démarrage de l\'application</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Le code de sécurité sera demandé à chaque ouverture de l\'application</string>
   <string name="pass_code_reenter_your_pass_code">Veuillez à nouveau saisir votre code de sécurité</string>
   <string name="pass_code_remove_your_pass_code">Supprimer votre code de sécurité</string>
   <string name="pass_code_mismatch">Les codes de sécurité ne sont pas identiques</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index dc6b4c3a..4788d926 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -76,6 +76,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="filedetails_download">Descargar</string>
   <string name="filedetails_sync_file">Actualizar o ficheiro</string>
   <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado a %1$s durante o envío</string>
+  <string name="list_layout">Deseño da lista</string>
   <string name="action_share_file">Ligazón para compartir</string>
   <string name="action_unshare_file">Deixar de compartir a ligazón</string>
   <string name="common_yes">Si</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 51d8ef0f..574a16de 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Scarica</string>
   <string name="filedetails_sync_file">Aggiorna file</string>
   <string name="filedetails_renamed_in_upload_msg">Il file è stato rinominato in %1$s durante il caricamento</string>
+  <string name="list_layout">Struttura elenco</string>
   <string name="action_share_file">Condividi collegamento</string>
   <string name="action_unshare_file">Rimuovi condivisione collegamento</string>
   <string name="common_yes">Sì</string>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index b8144867..073d5eda 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Last ned</string>
   <string name="filedetails_sync_file">Oppdater fil</string>
   <string name="filedetails_renamed_in_upload_msg">Filnavnet ble endret til  %1$s under opplasting</string>
+  <string name="list_layout">Listeoppsett</string>
   <string name="action_share_file">Del lenke</string>
   <string name="action_unshare_file">Avslutt deling av lenke</string>
   <string name="common_yes">Ja</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0ab33ba1..c303b870 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -76,6 +76,7 @@ Download hier: %2$s</string>
   <string name="filedetails_download">Download</string>
   <string name="filedetails_sync_file">Bestand verversen</string>
   <string name="filedetails_renamed_in_upload_msg">Bestand is tijdens het uploaden hernoemd naar %1$s</string>
+  <string name="list_layout">Lijst layout</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>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 8db1c10a..3cb400cc 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -4,6 +4,7 @@
   <string name="actionbar_upload_files">Fichièrs</string>
   <string name="actionbar_mkdir">Novèl dorsièr</string>
   <string name="actionbar_settings">Configuracion</string>
+  <string name="actionbar_send_file">Mandar</string>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
   <string name="prefs_category_general">General</string>
@@ -33,6 +34,7 @@
   <string name="filedetails_created">Creat :</string>
   <string name="filedetails_modified">Modificat :</string>
   <string name="filedetails_download">Avalcarga</string>
+  <string name="action_share_file">Partiment per ligam</string>
   <string name="common_yes">Òc</string>
   <string name="common_no">Non</string>
   <string name="common_ok">D\'accòrdi</string>
@@ -45,12 +47,19 @@
   <string name="delete_account">Escafa lo compte</string>
   <string name="create_account">Crea un compte</string>
   <string name="upload_chooser_title">Avalcarga dempuèi ...</string>
+  <string name="uploader_info_dirname">Nom del dorsièr</string>
   <string name="uploader_upload_in_progress_ticker">Al avalcargar ...</string>
   <string name="uploader_upload_succeeded_ticker">Capitada d\'avalcargar</string>
   <string name="common_choose_account">Causís lo compte</string>
   <string name="common_rename">Torna nomenar</string>
   <string name="common_remove">Suprimir</string>
+  <string name="ssl_validator_label_C">País :</string>
+  <string name="activity_chooser_send_file_title">Mandar</string>
+  <string name="clipboard_text_copied">Copiat dins lo quichapapièrs</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Comptes</string>
+  <string name="saml_authentication_required_text">Autentificacion requesida</string>
+  <string name="saml_authentication_wrong_pass">Senhal incorrècte</string>
   <string name="folder_picker_choose_button_text">Causís</string>
+  <string name="auth_host_address">Adreça del servidor</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9777f58a..59723ade 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,6 +23,7 @@
   <string name="prefs_category_more">Więcej</string>
   <string name="prefs_accounts">Konta</string>
   <string name="prefs_manage_accounts">Zarządzaj kontami</string>
+  <string name="prefs_passcode">Blokowanie hasła</string>
   <string name="prefs_instant_upload">natychmiastowa wysyłka obrazków</string>
   <string name="prefs_instant_upload_summary">Wysyłaj od razu zdjęcia zrobione aparatem</string>
   <string name="prefs_instant_video_upload">Natychmiastowa wysyłka wideo</string>
@@ -74,6 +75,7 @@
   <string name="filedetails_download">Pobierz</string>
   <string name="filedetails_sync_file">Odśwież plik</string>
   <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania nazwa pliku została zmieniona na %1$s</string>
+  <string name="list_layout">Lista szablonów wyglądu</string>
   <string name="action_share_file">Udostępnij link</string>
   <string name="action_unshare_file">Anuluj udostępnianie</string>
   <string name="common_yes">Tak</string>
@@ -126,6 +128,15 @@
   <string name="foreign_files_local_text">Lokalnie: %1$s</string>
   <string name="foreign_files_remote_text">Zdalnie: %1$s</string>
   <string name="upload_query_move_foreign_files">Nie ma wystarczająco miejśca, aby skopiować zaznaczone pliki do folderu %1$s. Chciałbyś je przenieść?</string>
+  <string name="pass_code_enter_pass_code">Proszę podać swoje hasło</string>
+  <string name="pass_code_configure_your_pass_code">Wpisz swoje hasło</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Hasło będzie wymagane przy każdym uruchomieniu aplikacji</string>
+  <string name="pass_code_reenter_your_pass_code">Proszę powtórzyć hasło</string>
+  <string name="pass_code_remove_your_pass_code">Usuń swoje hasło</string>
+  <string name="pass_code_mismatch">Podane hasła nie są takie same</string>
+  <string name="pass_code_wrong">Nieprawidłowe hasło</string>
+  <string name="pass_code_removed">Hasło zostało usunięte</string>
+  <string name="pass_code_stored">Hasło zostało zapisane</string>
   <string name="media_notif_ticker">%1$s odtwarzacz muzyki</string>
   <string name="media_state_playing">%1$s (odtwarzany)</string>
   <string name="media_state_loading">%1$s (wczytywany)</string>
@@ -201,6 +212,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
   <string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
   <string name="activity_chooser_title">Wyślij link do ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Kopiowanie pliku z prywatnego zasobu</string>
   <string name="oauth_check_onoff">Loguj przez oAuth2</string>
   <string name="oauth_login_connection">Łączenie z serwerem oAuth2...</string>
   <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
@@ -295,4 +307,5 @@
   <string name="subject_token">%1$s wspólne \"%2$s\" z tobą</string>
   <string name="auth_refresh_button">Odśwież połączenie</string>
   <string name="auth_host_address">Adres Serwera</string>
+  <string name="common_error_out_memory">Brak wystarczającej pamięci</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7d7e96ba..a2fe6bc8 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Baixar</string>
   <string name="filedetails_sync_file">Atualizar arquivo</string>
   <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o envio</string>
+  <string name="list_layout">Lista de Layout</string>
   <string name="action_share_file">Compartilhar link</string>
   <string name="action_unshare_file">Descompartilhar o link</string>
   <string name="common_yes">Sim</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 04693af1..70d2e4b6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -202,6 +202,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Неизвестная ошибка; выберите этот файл из другого приложения</string>
   <string name="filedisplay_no_file_selected">Файлы не выбраны</string>
   <string name="activity_chooser_title">Отправить ссылку ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Копирование файла из частной хранилища</string>
   <string name="oauth_check_onoff">Войти через oAuth2</string>
   <string name="oauth_login_connection">Подключение к серверу oAuth2...</string>
   <string name="ssl_validator_header">Подлинность сайта не может быть проверена</string>
@@ -296,4 +297,5 @@
   <string name="subject_token">%1$s предоставил вам доступ к \"%2$s\"</string>
   <string name="auth_refresh_button">Обновить соединение</string>
   <string name="auth_host_address">Адрес сервера</string>
+  <string name="common_error_out_memory">Недостаточно памяти</string>
 </resources>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index e51cb89b..0f51dcdb 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -150,6 +150,7 @@
   <string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
   <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
   <string name="auth_connection_established">Pripojenie vytvorené</string>
+  <string name="auth_testing_connection">Testuje sa pripojenie</string>
   <string name="auth_not_configured_title">Nesprávna konfigurácia servera</string>
   <string name="auth_account_not_new">Účet pre tohoto používateľa a tento server už v tomto zariadení existuje</string>
   <string name="auth_account_not_the_same">Zadané prihlasovacie údaje používateľa sú nesprávne</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 18e394d7..988723e1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,6 +23,7 @@
   <string name="prefs_category_more">Več</string>
   <string name="prefs_accounts">Računi</string>
   <string name="prefs_manage_accounts">Upravljanje z računi</string>
+  <string name="prefs_passcode">Zaklep s kodo PIN</string>
   <string name="prefs_instant_upload">Takojšnje pošiljanje slik</string>
   <string name="prefs_instant_upload_summary">Takojšnje pošiljanje slik, zajetih s fotoaparatom, na strežnik</string>
   <string name="prefs_instant_video_upload">Takojšnje pošiljanje posnetkov</string>
@@ -74,6 +75,7 @@
   <string name="filedetails_download">Prejmi</string>
   <string name="filedetails_sync_file">Osveži datoteko</string>
   <string name="filedetails_renamed_in_upload_msg">Datoteka je bila med nalaganjem preimenovana v %1$s</string>
+  <string name="list_layout">Postavitev seznama</string>
   <string name="action_share_file">Povezava za souporabo</string>
   <string name="action_unshare_file">Odstrani možnost souporabe</string>
   <string name="common_yes">Da</string>
@@ -126,6 +128,15 @@
   <string name="foreign_files_local_text">Krajevno: %1$s</string>
   <string name="foreign_files_remote_text">Oddaljeno: %1$s</string>
   <string name="upload_query_move_foreign_files">Ni dovolj prostora za kopiranje izbranih datotek v mapo %1$s. Ali jih želite premakniti?</string>
+  <string name="pass_code_enter_pass_code">Vnesite kodo PIN programa</string>
+  <string name="pass_code_configure_your_pass_code">Vnesite kodo PIN programa</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Koda bo zahtevana vsakič pred zagonom programa.</string>
+  <string name="pass_code_reenter_your_pass_code">Ponovno vnesite kodo</string>
+  <string name="pass_code_remove_your_pass_code">Odstrani kodo PIN programa</string>
+  <string name="pass_code_mismatch">Vpisani kodi PIN nista enaki</string>
+  <string name="pass_code_wrong">Napačna koda PIN</string>
+  <string name="pass_code_removed">Koda PIN je odstranjena</string>
+  <string name="pass_code_stored">Koda PIN je shranjena</string>
   <string name="media_notif_ticker">Predvajalnik glasbe %1$s</string>
   <string name="media_state_playing">%1$s (se predvaja)</string>
   <string name="media_state_loading">%1$s (se nalaga)</string>
@@ -201,6 +212,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Prišlo je do nepričakovane napake. Poskusite datoteko izbrati z drugim programom.</string>
   <string name="filedisplay_no_file_selected">Ni izbranih datotek</string>
   <string name="activity_chooser_title">Pošlji povezavo ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Kopiranje datoteke iz zasebne shrambe</string>
   <string name="oauth_check_onoff">Prijava  z oAuth2</string>
   <string name="oauth_login_connection">Poteka povezovanje s strežnikom oAuth2 ...</string>
   <string name="ssl_validator_header">Istovetnosti strani ni mogoče preveriti</string>
@@ -235,7 +247,7 @@
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Pošiljaj slike le preko povezav Wi-Fi</string>
   <string name="instant_video_upload_on_wifi">Pošlji posnetke le preko povezave Wi-Fi</string>
-  <string name="instant_upload_path">/TakojšnjePošiljanje</string>
+  <string name="instant_upload_path">/Poslano</string>
   <string name="conflict_title">Posodobi podatke spora</string>
   <string name="conflict_message">Oddaljena datoteka %s ni usklajena s krajevno. Z nadaljevanem bo datoteka na strežniku zamenjana s krajevno.</string>
   <string name="conflict_keep_both">Ohrani obe</string>
@@ -295,4 +307,5 @@
   <string name="subject_token">Uporabnik %1$s je omogočil souporabo \"%2$s\".</string>
   <string name="auth_refresh_button">Osveži povezavo</string>
   <string name="auth_host_address">Naslov strežnika</string>
+  <string name="common_error_out_memory">Ni dovolj pomnilnika</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0e10fdeb..72c39558 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -75,6 +75,7 @@
   <string name="filedetails_download">Преузми</string>
   <string name="filedetails_sync_file">Освежи фајл</string>
   <string name="filedetails_renamed_in_upload_msg">Фајл је преименован у %1$s током отпремања</string>
+  <string name="list_layout">Распоред листе</string>
   <string name="action_share_file">Веза дељења</string>
   <string name="action_unshare_file">Не дели везом</string>
   <string name="common_yes">Да</string>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 253a08b2..847179b1 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -192,14 +192,14 @@
   <string name="common_remove">ลบออก</string>
   <string name="confirmation_remove_alert">คุณต้องการที่จะลบ %1$s?</string>
   <string name="confirmation_remove_folder_alert">คุณต้องการที่จะลบ %1$s และเนื้อหาของมัน?</string>
-  <string name="confirmation_remove_local">เฉพาะต้นทางเซิร์ฟเวอร์เท่านั้น</string>
+  <string name="confirmation_remove_local">เฉพาะต้นทางเท่านั้น</string>
   <string name="confirmation_remove_folder_local">เนื้อหาต้นทางเท่านั้น</string>
   <string name="confirmation_remove_remote">ลบออกจากเซิร์ฟเวอร์</string>
-  <string name="confirmation_remove_remote_and_local">ทั้งเซิร์ฟเวอร์ระยะไกลและเซิร์ฟเวอร์ภายใน</string>
+  <string name="confirmation_remove_remote_and_local">ต้นทางและปลายทาง</string>
   <string name="remove_success_msg">ลบเรียบร้อยแล้ว</string>
   <string name="remove_fail_msg">ไม่สามารถลบได้</string>
   <string name="rename_dialog_title">กรอกชื่อใหม่</string>
-  <string name="rename_local_fail_msg">ไฟล์คัดลอกภายในไม่สามารถเปลี่ยนชื่อได้, กรุณาเปลี่ยนเป็นชื่อใหม่</string>
+  <string name="rename_local_fail_msg">ไฟล์ต้นทางที่คัดลอกไม่สามารถเปลี่ยนชื่อได้, กรุณาเปลี่ยนเป็นชื่อใหม่</string>
   <string name="rename_server_fail_msg">ไม่สามารถเปลี่ยนชื่อได้</string>
   <string name="sync_file_fail_msg">ไม่สามารถตรวจสอบไฟล์ระยะไกลได้</string>
   <string name="sync_file_nothing_to_do_msg">เนื้อหาของไฟล์มีข้อมูลอยู่แล้ว</string>
@@ -247,7 +247,7 @@
   <string name="instant_video_upload_on_wifi">อัพโหลดวีดีโอผ่านทาง WiFi เท่านั้น</string>
   <string name="instant_upload_path">/อัพโหลดทันที</string>
   <string name="conflict_title">ปรับปรุงข้อผิดพลาด</string>
-  <string name="conflict_message">ไฟล์ระยะไกล %s ยังไม่ได้ถูกผสานข้อมูลกับไฟล์ในเครื่อง การดำเนินการต่อไปจะเป็นการแทนที่เนื้อหาของไฟล์ที่มีอยู่บนเซิร์ฟเวอร์</string>
+  <string name="conflict_message">ไฟล์ระยะไกล %s ยังไม่ได้ผสานข้อมูลกับไฟล์ต้นทาง การดำเนินการต่อไปจะเป็นการแทนที่เนื้อหาของไฟล์ที่มีอยู่บนเซิร์ฟเวอร์</string>
   <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
   <string name="conflict_overwrite">เขียนทับ</string>
   <string name="conflict_dont_upload">ไม่ต้องอัพโหลด</string>