From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Jul 2015 17:02:09 +0000 (+0200)
Subject: Partially revert 50819ce
X-Git-Tag: oc-android-1.8~48^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c907f6a7426bee9c240cee16063ed29a6ba7c1ab

Partially revert 50819ce
---

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 37f173f1..81375657 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -239,8 +239,8 @@
   <string name="conflict_title">تعارض في التحديث </string>
   <string name="conflict_message">الملف %s غير </string>
   <string name="conflict_keep_both">الاحتفاظ بالنسختين</string>
-  <string name="conflict_use_local_version">استبدال</string>
-  <string name="conflict_use_server_version">عدم الرفع</string>
+  <string name="conflict_overwrite">استبدال</string>
+  <string name="conflict_dont_upload">عدم الرفع</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>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 62aacc48..f309a7d0 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -241,8 +241,8 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş
   <string name="conflict_title">Yüklənmə konflikti</string>
   <string name="conflict_message">Uzaq fayl %s local faylla sinxronizasiya edilmədi. Faylın kontentinin serverdə dəyişdirilməsinə davam edirik.</string>
   <string name="conflict_keep_both">Birlikdə saxla</string>
-  <string name="conflict_use_local_version">Sil yenidən yaz</string>
-  <string name="conflict_use_server_version">Yükləmə</string>
+  <string name="conflict_overwrite">Sil yenidən yaz</string>
+  <string name="conflict_dont_upload">Yükləmə</string>
   <string name="preview_image_description">Şəkili göstər</string>
   <string name="preview_image_error_unknown_format">Bu şəkil göstərilə bilməz</string>
   <string name="error__upload__local_file_not_copied">%1$s nüsxələnə bilməz %2$s local qovluğa</string>
diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index b9667b15..2345520c 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -256,8 +256,8 @@
   <string name="conflict_title">Обновяване на конфликтите</string>
   <string name="conflict_message">Външния файл %s не е синхронизиран с локалния. Ако продължите, ще замените съдържанието на файла на сървъра.</string>
   <string name="conflict_keep_both">Запазване и на двата</string>
-  <string name="conflict_use_local_version">Презаписване</string>
-  <string name="conflict_use_server_version">Да не се качва</string>
+  <string name="conflict_overwrite">Презаписване</string>
+  <string name="conflict_dont_upload">Да не се качва</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>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index b1b6248c..4a2c9458 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -226,8 +226,8 @@
   <string name="conflict_title">নবায়নকরণে দ্বন্দ</string>
   <string name="conflict_message">স্থানীয় ফাইল আর দুরবর্তী ফাইল %s এক নয়। এগোতে চাইলে সার্ভারের ফাইলের কনটেন্ট প্রদিস্থাপিত হবে।</string>
   <string name="conflict_keep_both">উভয়কে রাখ</string>
-  <string name="conflict_use_local_version">উপরে লেখ</string>
-  <string name="conflict_use_server_version">আপলোড কোরোনা</string>
+  <string name="conflict_overwrite">উপরে লেখ</string>
+  <string name="conflict_dont_upload">আপলোড কোরোনা</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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 72e1748a..8bb9716f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -232,8 +232,8 @@
   <string name="conflict_title">Conflicte d\'actualització</string>
   <string name="conflict_message">El fitxer remot %s no està sincronitzat amb el fitxer local. Si continueu es substituirà el contingut del fitxer en el servidor.</string>
   <string name="conflict_keep_both">Mantén-los ambdós</string>
-  <string name="conflict_use_local_version">Sobrescriu</string>
-  <string name="conflict_use_server_version">No el pugis</string>
+  <string name="conflict_overwrite">Sobrescriu</string>
+  <string name="conflict_dont_upload">No el pugis</string>
   <string name="preview_image_description">Visualització prèvia d\'imatge</string>
   <string name="preview_image_error_unknown_format">Aquesta imatge no es pot mostrar</string>
   <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 751b4006..cbf7c380 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -256,8 +256,8 @@
   <string name="conflict_title">Konflikt při aktualizaci</string>
   <string name="conflict_message">Vzdálený soubor %s není synchronizován s místním souborem. Pokračování přepíše obsah souboru na serveru.</string>
   <string name="conflict_keep_both">Ponechat oba</string>
-  <string name="conflict_use_local_version">Přepsat</string>
-  <string name="conflict_use_server_version">Nenahrávat</string>
+  <string name="conflict_overwrite">Přepsat</string>
+  <string name="conflict_dont_upload">Nenahrávat</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>
diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml
index 9dcee7eb..46406023 100644
--- a/res/values-cy-rGB/strings.xml
+++ b/res/values-cy-rGB/strings.xml
@@ -131,8 +131,8 @@
   <string name="conflict_title">Gwrthdaro diweddaru</string>
   <string name="conflict_message">Nid yw ffeil bell %s wedi cydamseru â\'r ffeil leol. Bydd parhau yn amnewid cynnwys y ffeil ar y gweinydd.</string>
   <string name="conflict_keep_both">Cadw\'r ddau</string>
-  <string name="conflict_use_local_version">Trosysgrifio</string>
-  <string name="conflict_use_server_version">Peidio llwytho i fyny</string>
+  <string name="conflict_overwrite">Trosysgrifio</string>
+  <string name="conflict_dont_upload">Peidio llwytho i fyny</string>
   <string name="activity_chooser_send_file_title">Anfon</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Cyfrifon</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b7d64ce5..2bbf37b0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -256,8 +256,8 @@
   <string name="conflict_title">Opdaterings konflikt</string>
   <string name="conflict_message">Ekstern fil %s er ikke synkroniseret med lokal fil. At fortsætte vil erstatte indholdet af filen på serveren.</string>
   <string name="conflict_keep_both">Behold begge</string>
-  <string name="conflict_use_local_version">Overskriv</string>
-  <string name="conflict_use_server_version">Upload ikke</string>
+  <string name="conflict_overwrite">Overskriv</string>
+  <string name="conflict_dont_upload">Upload ikke</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>
diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml
index c237a83d..20392974 100644
--- a/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@ -192,8 +192,8 @@
   <string name="conflict_title">Konflikt beim Update</string>
   <string name="conflict_message">Serverdatei %s ist nicht synchronisiert mit der lokalen Datei. Weitermachen bedeutet, dass der Inhalt der Datei auf dem Server ersetzt wird.</string>
   <string name="conflict_keep_both">Beide behalten</string>
-  <string name="conflict_use_local_version">Überschreiben</string>
-  <string name="conflict_use_server_version">Nicht hochladen</string>
+  <string name="conflict_overwrite">Überschreiben</string>
+  <string name="conflict_dont_upload">Nicht hochladen</string>
   <string name="preview_image_description">Bildvorschau</string>
   <string name="activity_chooser_send_file_title">Senden</string>
   <string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 02cfdfa1..f22872ea 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Konflikt beim Update</string>
   <string name="conflict_message">Serverdatei %s ist nicht synchronisiert mit der lokalen Datei. Weitermachen bedeutet, dass der Inhalt der Datei auf dem Server ersetzt wird.</string>
   <string name="conflict_keep_both">Beide behalten</string>
-  <string name="conflict_use_local_version">Überschreiben</string>
-  <string name="conflict_use_server_version">Nicht hochladen</string>
+  <string name="conflict_overwrite">Überschreiben</string>
+  <string name="conflict_dont_upload">Nicht hochladen</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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 326c5dd0..c9defa97 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Konflikt beim Update</string>
   <string name="conflict_message">Serverdatei %s ist nicht synchronisiert mit der lokalen Datei. Weitermachen bedeutet, dass der Inhalt der Datei auf dem Server ersetzt wird.</string>
   <string name="conflict_keep_both">Beide behalten</string>
-  <string name="conflict_use_local_version">Überschreiben</string>
-  <string name="conflict_use_server_version">Nicht hochladen</string>
+  <string name="conflict_overwrite">Überschreiben</string>
+  <string name="conflict_dont_upload">Nicht hochladen</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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 16a80df9..3888bf41 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Σύγκρουση ενημερώσεων</string>
   <string name="conflict_message">Το απομακρυσμένο αρχείο %s δεν είναι συγχρονισμένο με το τοπικό αρχείο. Αν συνεχίσετε θα αντικατασταθεί το περιεχόμενο του αρχείου στο διακομιστή. </string>
   <string name="conflict_keep_both">Διατήρηση και των δύο</string>
-  <string name="conflict_use_local_version">Αντικατάσταση</string>
-  <string name="conflict_use_server_version">Να μην μεταφορτωθεί</string>
+  <string name="conflict_overwrite">Αντικατάσταση</string>
+  <string name="conflict_dont_upload">Να μην μεταφορτωθεί</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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b42c38f4..3227e4ac 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -250,8 +250,8 @@
   <string name="conflict_title">Update conflict</string>
   <string name="conflict_message">Remote file %s is not synchronised with local file. Continuing will replace content of file on server.</string>
   <string name="conflict_keep_both">Keep both</string>
-  <string name="conflict_use_local_version">Overwrite</string>
-  <string name="conflict_use_server_version">Don\'t upload</string>
+  <string name="conflict_overwrite">Overwrite</string>
+  <string name="conflict_dont_upload">Don\'t upload</string>
   <string name="preview_image_description">Image preview</string>
   <string name="preview_image_error_unknown_format">This image cannot be shown</string>
   <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index edcf6b19..44511d59 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -170,8 +170,8 @@
   <string name="conflict_title">Alŝuta konflikto</string>
   <string name="conflict_message">La malloka dosiero %s estas ne sinkronigita kun loka dosiero. Se la ago daŭrus, enhavo de la dosiero en la servilo anstataŭiĝus.</string>
   <string name="conflict_keep_both">Konservi ambaÅ­</string>
-  <string name="conflict_use_local_version">AnstataÅ­igi</string>
-  <string name="conflict_use_server_version">Ne alŝuti</string>
+  <string name="conflict_overwrite">AnstataÅ­igi</string>
+  <string name="conflict_dont_upload">Ne alŝuti</string>
   <string name="preview_image_description">AntaÅ­vido de bildo</string>
   <string name="preview_image_error_unknown_format">Ĉi tiu bildo ne povas montriĝi</string>
   <string name="error__upload__local_file_not_copied">%1$s ne povis kopiiĝi al la loka dosierujo %2$s</string>
diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index 558803b5..b8dbcb26 100644
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -234,8 +234,8 @@
   <string name="conflict_title">Conflicto en la actualización</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si seguís adelante, vas a reemplazar el contenido del archivo en el servidor.</string>
   <string name="conflict_keep_both">Mantener ambas</string>
-  <string name="conflict_use_local_version">Sobrescribir</string>
-  <string name="conflict_use_server_version">No subir</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
   <string name="preview_image_error_unknown_format">Esta imagen no puede ser mostrada</string>
   <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s </string>
diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
index 93cc5fb9..f80e9728 100644
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@@ -156,8 +156,8 @@
   <string name="conflict_title">Conflicto al actualizar</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con la copia local. Si continua, se reemplazará el archivo en el servidor.</string>
   <string name="conflict_keep_both">Mantener ambos</string>
-  <string name="conflict_use_local_version">Sobre-escribir</string>
-  <string name="conflict_use_server_version">No subir</string>
+  <string name="conflict_overwrite">Sobre-escribir</string>
+  <string name="conflict_dont_upload">No subir</string>
   <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>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 3c429997..6ee60a6f 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -202,8 +202,8 @@
   <string name="conflict_title">Conflicto en la actualización</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si continúa, se reemplazará el contenido del archivo en el servidor.</string>
   <string name="conflict_keep_both">Mantener ambas</string>
-  <string name="conflict_use_local_version">Sobrescribir</string>
-  <string name="conflict_use_server_version">No subir</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="clipboard_text_copied">Copiado al portapapeles</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d1f2fcfa..1e361c3b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Conflicto en la actualización</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si continúa, se reemplazará el contenido del archivo en el servidor.</string>
   <string name="conflict_keep_both">Mantener ambos</string>
-  <string name="conflict_use_local_version">Sobrescribir</string>
-  <string name="conflict_use_server_version">No subir</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">No subir</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>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 535cee62..24b42673 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -261,8 +261,8 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="conflict_title">Uuenduse konflikt</string>
   <string name="conflict_message">Serveris asuvat faili ei sünkroniseeritud kohaliku failiga. Jätkates kirjutatakse serveris asuva faili sisu üle.</string>
   <string name="conflict_keep_both">Säilita mõlemad</string>
-  <string name="conflict_use_local_version">Kirjuta üle</string>
-  <string name="conflict_use_server_version">Ära uuenda</string>
+  <string name="conflict_overwrite">Kirjuta üle</string>
+  <string name="conflict_dont_upload">Ära uuenda</string>
   <string name="preview_image_description">Pildi eelvaade</string>
   <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
   <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi %2$s</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 796ed70b..2f363ce0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -234,8 +234,8 @@ Mesedez, baimendu berriz</string>
   <string name="conflict_title">Igoera konfliktoa</string>
   <string name="conflict_message">Urruneko %s fitxategia ez dago bertako fitxategiarekin sinkronizatuta. Jarraituz gero zerbitzariko fitxategiaren edukia ordeztuko da.</string>
   <string name="conflict_keep_both">Mantendu biak</string>
-  <string name="conflict_use_local_version">Gainidatzi</string>
-  <string name="conflict_use_server_version">Ez igo</string>
+  <string name="conflict_overwrite">Gainidatzi</string>
+  <string name="conflict_dont_upload">Ez igo</string>
   <string name="preview_image_description">Irudi aurreikuspena</string>
   <string name="preview_image_error_unknown_format">Ezin da irudi hau erakutsi</string>
   <string name="error__upload__local_file_not_copied">%1$s ezin da %2$s karpeta lokalera kopiatu</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 58996c71..79e2fdae 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -207,8 +207,8 @@
   <string name="conflict_title">بارگذاری ناسازگار</string>
   <string name="conflict_message">فایل های دور از دسترس %s با فایل های محلی همگام نشده اند. ادامه کار، محتوا را بر روی فایل در سرور جایگزین خواهد کرد.</string>
   <string name="conflict_keep_both">نگهداشتن هر دو</string>
-  <string name="conflict_use_local_version">دوباره نویسی</string>
-  <string name="conflict_use_server_version">آپلود نکن</string>
+  <string name="conflict_overwrite">دوباره نویسی</string>
+  <string name="conflict_dont_upload">آپلود نکن</string>
   <string name="preview_image_description">پیش نمایش تصویر</string>
   <string name="preview_image_error_unknown_format">نمایش این عکس امکانپذیر نمی باشد</string>
   <string name="share_link_file_error">در حین اشتراک گذاری این فایل یا پوشه خطایی رخ داده است</string>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index f945e926..1a723721 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -245,8 +245,8 @@
   <string name="conflict_title">Päivitysristiriita</string>
   <string name="conflict_message">Etätiedostoa %s ei ole synkronoitu paikallisen tiedoston kanssa. Jatkaminen korvaa palvelimella olevan tiedoston sisällön.</string>
   <string name="conflict_keep_both">Säilytä molemmat</string>
-  <string name="conflict_use_local_version">Korvaa</string>
-  <string name="conflict_use_server_version">Älä lähetä</string>
+  <string name="conflict_overwrite">Korvaa</string>
+  <string name="conflict_dont_upload">Älä lähetä</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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ced720ba..52444048 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -34,7 +34,7 @@
   <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_use_local_version">Ylikirjoita</string>
+  <string name="conflict_overwrite">Ylikirjoita</string>
   <string name="copy_link">Kopioi linkki</string>
   <string name="empty"></string>
   <string name="actionbar_move">Siirrä</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fdb646ca..a2e23f45 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -262,8 +262,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <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 du fichier sur le serveur.</string>
   <string name="conflict_keep_both">Garder les deux versions</string>
-  <string name="conflict_use_local_version">Écraser</string>
-  <string name="conflict_use_server_version">Ne pas téléverser</string>
+  <string name="conflict_overwrite">Écraser</string>
+  <string name="conflict_dont_upload">Ne pas téléverser</string>
   <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>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 93a98098..4e2e97bf 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -258,8 +258,8 @@ Descárgueo de aquí: %2$s</string>
   <string name="conflict_title">Conflito de actualización</string>
   <string name="conflict_message">O ficheiro remoto %s non está sincronizado co ficheiro local. Continuando substituirase o contido do ficheiro no servidor.</string>
   <string name="conflict_keep_both">Manter ambos</string>
-  <string name="conflict_use_local_version">Sobrescribir</string>
-  <string name="conflict_use_server_version">Non enviar</string>
+  <string name="conflict_overwrite">Sobrescribir</string>
+  <string name="conflict_dont_upload">Non enviar</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>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 8400565d..7dda3d9e 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -227,8 +227,8 @@
   <string name="conflict_title">התנגשות עדכון</string>
   <string name="conflict_message">הקובץ המרוחק %s אינו מסונכרן עם הקובץ המקומי. בחירה בהמשך התהליך תחליף את תוכן הקובץ בשרת.</string>
   <string name="conflict_keep_both">להשאיר את שניהם</string>
-  <string name="conflict_use_local_version">לשכתב</string>
-  <string name="conflict_use_server_version">לא להעלות</string>
+  <string name="conflict_overwrite">לשכתב</string>
+  <string name="conflict_dont_upload">לא להעלות</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>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 3485e9ed..5be77c20 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -223,8 +223,8 @@
   <string name="conflict_title">Frissítési ütközés</string>
   <string name="conflict_message">%s távoli állományt nem szinkronizáltuk a helyi példánnyal. Ha folytatja, akkor a távoli állományt felülírjuk.</string>
   <string name="conflict_keep_both">Mindkettő megtartása</string>
-  <string name="conflict_use_local_version">Felülírás</string>
-  <string name="conflict_use_server_version">Ne töltsük föl</string>
+  <string name="conflict_overwrite">Felülírás</string>
+  <string name="conflict_dont_upload">Ne töltsük föl</string>
   <string name="preview_image_description">Előnézeti kép</string>
   <string name="preview_image_error_unknown_format">Ez a kép nem jeleníthető meg</string>
   <string name="error__upload__local_file_not_copied">%1$s nem lehet másolni a %2$s helyi könyvtárba</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index d3f8a236..2d2b171e 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Perbarui benturan</string>
   <string name="conflict_message">Berkas jauh %s tidak sinkron dengan berkas lokal. Melanjutkan akan menggantikan konten berkas di server.</string>
   <string name="conflict_keep_both">Biarkan keduannya</string>
-  <string name="conflict_use_local_version">Timpa</string>
-  <string name="conflict_use_server_version">Jangan mengunggah</string>
+  <string name="conflict_overwrite">Timpa</string>
+  <string name="conflict_dont_upload">Jangan mengunggah</string>
   <string name="preview_image_description">Pratilik gambar</string>
   <string name="preview_image_error_unknown_format">Gambar ini tidak dapat ditampilkan</string>
   <string name="error__upload__local_file_not_copied">%1$s tidak dapat disalin ke folder lokal %2$s</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8f879ec4..efee1eb6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Conflitto di aggiornamento</string>
   <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_use_local_version">Sovrascrivi</string>
-  <string name="conflict_use_server_version">Non caricare</string>
+  <string name="conflict_overwrite">Sovrascrivi</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>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index bed1ec02..ef640859 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -258,8 +258,8 @@
   <string name="conflict_title">更新が競合</string>
   <string name="conflict_message">リモートファイル %s はローカルファイルと同期していません。続行すると、サーバー上のファイルを置き換えます。</string>
   <string name="conflict_keep_both">両方を保持</string>
-  <string name="conflict_use_local_version">上書き</string>
-  <string name="conflict_use_server_version">アップロードしない</string>
+  <string name="conflict_overwrite">上書き</string>
+  <string name="conflict_dont_upload">アップロードしない</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>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 02991d22..d924b4e3 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -139,8 +139,8 @@
   <string name="conflict_title">კონფლიქტი განახლებისას</string>
   <string name="conflict_message">დაშორებული ფაილი %s არ არის სინქრონიზირებული ლოკალურ ფაილთან. ოპერაციის გაგრძელება გამოიწვევს სერვერზე ფაილის შეცვლას.</string>
   <string name="conflict_keep_both">დატოვე ორივე</string>
-  <string name="conflict_use_local_version">გადააწერე</string>
-  <string name="conflict_use_server_version">არ ატვირთო</string>
+  <string name="conflict_overwrite">გადააწერე</string>
+  <string name="conflict_dont_upload">არ ატვირთო</string>
   <string name="activity_chooser_send_file_title">გაგზავნა</string>
   <string name="clipboard_text_copied">კოპირებულია კლიპბორდში</string>
   <string name="empty"></string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a3b840e4..b7a24f7a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">업데이트 충돌</string>
   <string name="conflict_message">원격 파일 %s이(가) 로컬 파일과 동기화되지 않았습니다. 계속 진행하면 서버에 있는 파일을 덮어씁니다.</string>
   <string name="conflict_keep_both">모두 저장</string>
-  <string name="conflict_use_local_version">덮어쓰기</string>
-  <string name="conflict_use_server_version">업로드하지 않음</string>
+  <string name="conflict_overwrite">덮어쓰기</string>
+  <string name="conflict_dont_upload">업로드하지 않음</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>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 73bc798b..1491e191 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -187,8 +187,8 @@
   <string name="placeholder_timestamp">18.05.2012 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
   <string name="conflict_keep_both">Béid halen</string>
-  <string name="conflict_use_local_version">Iwwerschreiwen</string>
-  <string name="conflict_use_server_version">Net eroplueden</string>
+  <string name="conflict_overwrite">Iwwerschreiwen</string>
+  <string name="conflict_dont_upload">Net eroplueden</string>
   <string name="preview_image_description">Biller-Virschau</string>
   <string name="preview_image_error_unknown_format">Dëst Bild kann net ugewise ginn</string>
   <string name="error__upload__local_file_not_copied">%1$s konnt net an de lokalen Dossier %2$s kopéiert ginn</string>
diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml
index ccb5f18a..6332e54e 100644
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@ -225,8 +225,8 @@
   <string name="conflict_title">Atnaujinimo konfliktas</string>
   <string name="conflict_message">Nutolęs failas %s nėra sinchronizuotas su vietiniu failu. Jei tęsite, failas serveryje bus pakeistas.</string>
   <string name="conflict_keep_both">Palikti abu</string>
-  <string name="conflict_use_local_version">Perrašyti</string>
-  <string name="conflict_use_server_version">Nebesiųsti</string>
+  <string name="conflict_overwrite">Perrašyti</string>
+  <string name="conflict_dont_upload">Nebesiųsti</string>
   <string name="preview_image_description">Paveikslėlio peržiūra</string>
   <string name="preview_image_error_unknown_format">Neįmanoma parodyti šio paveikslėlio</string>
   <string name="share_link_file_error">Įvyko klaida bandant dalinti šį failą ar aplanką</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b60eab1e..e2099a31 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -157,8 +157,8 @@
   <string name="conflict_title">Atjaunināšanas konflikts</string>
   <string name="conflict_message">Attālinātā datne %s nav sinhronizēta ar lokālo datni. Turpināšana aizstās datņu servera saturu.</string>
   <string name="conflict_keep_both">Paturēt abas</string>
-  <string name="conflict_use_local_version">Pārrakstīt</string>
-  <string name="conflict_use_server_version">Neaugšupielādēt</string>
+  <string name="conflict_overwrite">Pārrakstīt</string>
+  <string name="conflict_dont_upload">Neaugšupielādēt</string>
   <string name="activity_chooser_send_file_title">Sūtīt</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Konti</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f46965d9..4bc0267b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -248,8 +248,8 @@
   <string name="conflict_title">Конфликт при ажурирање</string>
   <string name="conflict_message">Одалечената датотека %s не е синхронизирана со локалната датотека. Ако продолжите ќе се замени содржината на датотеката на серверот.</string>
   <string name="conflict_keep_both">Задржи ги и двете</string>
-  <string name="conflict_use_local_version">Препиши</string>
-  <string name="conflict_use_server_version">Не прикачувај</string>
+  <string name="conflict_overwrite">Препиши</string>
+  <string name="conflict_dont_upload">Не прикачувај</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>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index ee838d69..3af14603 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Oppdateringskonflikt</string>
   <string name="conflict_message">Ekstern fil %s er ikke synkronisert med lokal fil. Hvis du fortsetter vil det erstatte innhold på serveren.</string>
   <string name="conflict_keep_both">Behold begge</string>
-  <string name="conflict_use_local_version">Overskriv</string>
-  <string name="conflict_use_server_version">Ikke last opp</string>
+  <string name="conflict_overwrite">Overskriv</string>
+  <string name="conflict_dont_upload">Ikke last opp</string>
   <string name="preview_image_description">Bildeforhåndsvisning</string>
   <string name="preview_image_error_unknown_format">Dette bildet kan ikke vises</string>
   <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til lokal mappe %2$s</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9157a6a1..c82b84c7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -260,8 +260,8 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="conflict_title">Update conflict</string>
   <string name="conflict_message">Het remote bestand %s is niet gesynchroniseerd met het lokale bestand. Als je doorgaat wordt de inhoud van het bestand op de server vervangen.</string>
   <string name="conflict_keep_both">Beide bewaren</string>
-  <string name="conflict_use_local_version">Overschrijven</string>
-  <string name="conflict_use_server_version">Niet uploaden</string>
+  <string name="conflict_overwrite">Overschrijven</string>
+  <string name="conflict_dont_upload">Niet uploaden</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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9a0a0e74..10295f22 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -117,8 +117,8 @@
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">ਤਸਵੀਰਾਂ ਨੂੰ ਵਾਈ-ਫਾਈ ਰਾਹੀਂ ਹੀ ਅੱਪਲੋਡ ਕਰੋ</string>
   <string name="conflict_keep_both">ਦੋਵੇਂ ਰੱਖੋ</string>
-  <string name="conflict_use_local_version">ਉੱਤੇ ਲਿਖੋ</string>
-  <string name="conflict_use_server_version">ਅੱਪਲੋਡ ਨਾ ਕਰੋ</string>
+  <string name="conflict_overwrite">ਉੱਤੇ ਲਿਖੋ</string>
+  <string name="conflict_dont_upload">ਅੱਪਲੋਡ ਨਾ ਕਰੋ</string>
   <string name="preview_image_description">ਚਿੱਤਰ ਝਲਕ</string>
   <string name="activity_chooser_send_file_title">ਭੇਜੋ</string>
   <string name="empty"></string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 24c1e010..6e634af6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -251,8 +251,8 @@
   <string name="conflict_title">Konflikt aktualizacji</string>
   <string name="conflict_message">Zdalny plik %s nie jest zsynchronizowany z plikiem lokalnym. Kontynuując zastąpisz zawartość pliku na serwerze.</string>
   <string name="conflict_keep_both">Zatrzymaj oba</string>
-  <string name="conflict_use_local_version">Zastąp</string>
-  <string name="conflict_use_server_version">Nie wysyłaj</string>
+  <string name="conflict_overwrite">Zastąp</string>
+  <string name="conflict_dont_upload">Nie wysyłaj</string>
   <string name="preview_image_description">Podgląd</string>
   <string name="preview_image_error_unknown_format">Ten obrazek nie może zostać wyświetlony</string>
   <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego folderu %2$s</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0dbe123c..56a6bfdf 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Conflito de atualização</string>
   <string name="conflict_message">O arquivo remoto %s não está sincronizado com o arquivo local. Prosseguir irá substituir o arquivo no servidor.</string>
   <string name="conflict_keep_both">Manter ambos</string>
-  <string name="conflict_use_local_version">Sobrescrever</string>
-  <string name="conflict_use_server_version">Não enviar</string>
+  <string name="conflict_overwrite">Sobrescrever</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_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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 39d7dc35..dc327076 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -241,8 +241,8 @@
   <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 ambos</string>
-  <string name="conflict_use_local_version">Substituir</string>
-  <string name="conflict_use_server_version">Não enviar.</string>
+  <string name="conflict_overwrite">Substituir</string>
+  <string name="conflict_dont_upload">Não enviar.</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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bd461950..73d32aa9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -256,8 +256,8 @@
   <string name="conflict_title">Actualizați conflictul</string>
   <string name="conflict_message">Fișierul de la distanță %s nu este sincronizat cu fișierul local. Continuand, se va înlocui conținutul fișierului de pe server.</string>
   <string name="conflict_keep_both">Pastreaza amandoua</string>
-  <string name="conflict_use_local_version">Scrie peste</string>
-  <string name="conflict_use_server_version">Nu încarcă</string>
+  <string name="conflict_overwrite">Scrie peste</string>
+  <string name="conflict_dont_upload">Nu încarcă</string>
   <string name="preview_image_description">Previzualizare imagine</string>
   <string name="preview_image_error_unknown_format">Aceasta imagine nu poate fi arătată</string>
   <string name="error__upload__local_file_not_copied">%1$s nu a putut fi copiat in dosarul local %2$s </string>
diff --git a/res/values-ru-rRU/strings.xml b/res/values-ru-rRU/strings.xml
index 45bdb09a..6675918b 100644
--- a/res/values-ru-rRU/strings.xml
+++ b/res/values-ru-rRU/strings.xml
@@ -143,6 +143,6 @@
   <string name="conflict_title">Конфликт обновления</string>
   <string name="conflict_message">Удаленный файл %s не синхронизирован с локальным файлом. Продолжение повлечет замену содержимого файла на сервере.</string>
   <string name="conflict_keep_both">Сохранить оба</string>
-  <string name="conflict_use_local_version">Перезаписать</string>
-  <string name="conflict_use_server_version">Не загружать</string>
+  <string name="conflict_overwrite">Перезаписать</string>
+  <string name="conflict_dont_upload">Не загружать</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44fc8b32..e9aa20c4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -258,8 +258,8 @@
   <string name="conflict_title">Конфликт обновления</string>
   <string name="conflict_message">Удаленный файл %s не синхронизирован с локальным. Продолжение приведет к замене содержимого файла на сервере.</string>
   <string name="conflict_keep_both">Сохранить оба</string>
-  <string name="conflict_use_local_version">Перезаписать</string>
-  <string name="conflict_use_server_version">Не загружать</string>
+  <string name="conflict_overwrite">Перезаписать</string>
+  <string name="conflict_dont_upload">Не загружать</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>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index 065ce925..d8c652d4 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -249,8 +249,8 @@
   <string name="conflict_title">Konflikt pri aktualizácii</string>
   <string name="conflict_message">Vzdialený súbor %s nie je zosynchronizovaný s lokálnym. Pokračovanie prepíše obsah súboru na serveri.</string>
   <string name="conflict_keep_both">Ponechať oba</string>
-  <string name="conflict_use_local_version">Prepísať</string>
-  <string name="conflict_use_server_version">Nenahrávajte</string>
+  <string name="conflict_overwrite">Prepísať</string>
+  <string name="conflict_dont_upload">Nenahrávajte</string>
   <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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f915c070..1547f2a0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -257,8 +257,8 @@
   <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>
-  <string name="conflict_use_local_version">Prepiši</string>
-  <string name="conflict_use_server_version">Ne pošlji</string>
+  <string name="conflict_overwrite">Prepiši</string>
+  <string name="conflict_dont_upload">Ne pošlji</string>
   <string name="preview_image_description">Predogled slike</string>
   <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
   <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9adae738..56508240 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Ажурирај сукоб</string>
   <string name="conflict_message">Удаљени фајл %s није синхронизован са локалним. Ако наставите, заменићете фајл на серверу.</string>
   <string name="conflict_keep_both">Задржи оба</string>
-  <string name="conflict_use_local_version">Пребриши</string>
-  <string name="conflict_use_server_version">Не отпремај</string>
+  <string name="conflict_overwrite">Пребриши</string>
+  <string name="conflict_dont_upload">Не отпремај</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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9a75eb16..58cf5e13 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -237,8 +237,8 @@
   <string name="conflict_title">Uppdateringskonflikt</string>
   <string name="conflict_message">Serverns fil %s är inte synkroniserad med den lokala filen. Fortsätt för att skriva över filen på servern.</string>
   <string name="conflict_keep_both">Behåll båda</string>
-  <string name="conflict_use_local_version">Skriv över</string>
-  <string name="conflict_use_server_version">Ladda inte upp</string>
+  <string name="conflict_overwrite">Skriv över</string>
+  <string name="conflict_dont_upload">Ladda inte upp</string>
   <string name="preview_image_description">Förhandsvisa bild</string>
   <string name="preview_image_error_unknown_format">Denna bild kan inte visas</string>
   <string name="error__upload__local_file_not_copied">%1$s kunde inte kopieras till %2$s lokal mapp</string>
diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml
index ba8ebccd..1893380d 100644
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@@ -127,8 +127,8 @@
   <string name="conflict_title">இற்றைப்படுத்தலில் முரண்பாடு</string>
   <string name="conflict_message">இடத்துரி கோப்புடன் தொலைவு கோப்பு %s ஒத்திசைவாக்கப்படவில்லை. தொடர்ந்து மேற்கொண்டால் சேவையகத்தில் உள்ள கோப்பின் உள்ளடக்கம் மாற்றப்படும்.</string>
   <string name="conflict_keep_both">இரண்டையும் வைக்க </string>
-  <string name="conflict_use_local_version">மேலெழுதல்</string>
-  <string name="conflict_use_server_version">பதிவேற்ற வேண்டாம்</string>
+  <string name="conflict_overwrite">மேலெழுதல்</string>
+  <string name="conflict_dont_upload">பதிவேற்ற வேண்டாம்</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">கணக்குகள்</string>
   <string name="folder_picker_choose_button_text">தெரிவுசெய்க </string>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index f92be877..2efcd3ac 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -256,8 +256,8 @@
   <string name="conflict_title">ปรับปรุงข้อผิดพลาด</string>
   <string name="conflict_message">ไฟล์ระยะไกล %s ยังไม่ได้ผสานข้อมูลกับไฟล์ต้นทาง การดำเนินการต่อไปจะเป็นการแทนที่เนื้อหาของไฟล์ที่มีอยู่บนเซิร์ฟเวอร์</string>
   <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
-  <string name="conflict_use_local_version">เขียนทับ</string>
-  <string name="conflict_use_server_version">ไม่ต้องอัพโหลด</string>
+  <string name="conflict_overwrite">เขียนทับ</string>
+  <string name="conflict_dont_upload">ไม่ต้องอัพโหลด</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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0594067d..d950230f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Çakışmayı güncelle</string>
   <string name="conflict_message">Uzaktaki %s dosyası, yerel dosya ile eşitlenemedi. İşleme devam etmek sunucudaki dosyanın içeriğini değiştirecektir.</string>
   <string name="conflict_keep_both">Ä°kisini de koru</string>
-  <string name="conflict_use_local_version">Üzerine yaz</string>
-  <string name="conflict_use_server_version">Yükleme</string>
+  <string name="conflict_overwrite">Üzerine yaz</string>
+  <string name="conflict_dont_upload">Yükleme</string>
   <string name="preview_image_description">Resim önizleme</string>
   <string name="preview_image_error_unknown_format">Bu resim gösterilemiyor</string>
   <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel klasörüne kopyalanamadı</string>
diff --git a/res/values-tzl/strings.xml b/res/values-tzl/strings.xml
deleted file mode 100644
index 37e61524..00000000
--- a/res/values-tzl/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--TODO re-enable when server-side folder size calculation is available   
-    	<item>Biggest - Smallest</item>-->
-  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-  <!--<string name="drawer_item_accounts">Accounts</string>-->
-  <!--TODO re-enable when "On Device" is available
-    <string name="drawer_item_on_device">On device</string>-->
-  <string name="empty"></string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8bc19971..390b4e3b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -245,8 +245,8 @@
   <string name="conflict_title">Конфлікт оновлення</string>
   <string name="conflict_message">Віддалений файл %s не синхронізовано з локальним. Продовження процедури замінить вміст файлу на сервері.</string>
   <string name="conflict_keep_both">Залишити обидва</string>
-  <string name="conflict_use_local_version">Замінити</string>
-  <string name="conflict_use_server_version">Не завантажувати</string>
+  <string name="conflict_overwrite">Замінити</string>
+  <string name="conflict_dont_upload">Не завантажувати</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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9895acc9..e4536eb5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -204,8 +204,8 @@
   <string name="conflict_title">Cập nhật xung đột</string>
   <string name="conflict_message">%s là tập tin từ xa nó không đồng bộ với tập tin máy bạn . Nếu bạn tiếp tục sẽ thay đổi nội dung của tập tin trên máy chủ.</string>
   <string name="conflict_keep_both">Giữ cho cả hai</string>
-  <string name="conflict_use_local_version">Ghi đè lên</string>
-  <string name="conflict_use_server_version">Không tải lên</string>
+  <string name="conflict_overwrite">Ghi đè lên</string>
+  <string name="conflict_dont_upload">Không tải lên</string>
   <string name="preview_image_description">Xem trước hình ảnh</string>
   <string name="share_link_file_error">Một lỗi đã xảy ra khi thử chia sẻ file hoặc thư mục này</string>
   <string name="unshare_link_file_error">Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 56b6d6fe..6f3f84c7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -254,8 +254,8 @@
   <string name="conflict_title">上传冲突</string>
   <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
   <string name="conflict_keep_both">保留两者</string>
-  <string name="conflict_use_local_version">覆盖</string>
-  <string name="conflict_use_server_version">不上传</string>
+  <string name="conflict_overwrite">覆盖</string>
+  <string name="conflict_dont_upload">不上传</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 75d7e2c9..581c684e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -242,8 +242,8 @@
   <string name="conflict_title">更新衝突</string>
   <string name="conflict_message">遠端檔案 %s 未同步到本地. 繼續將取代伺服器上的文件.</string>
   <string name="conflict_keep_both">都保留</string>
-  <string name="conflict_use_local_version">覆寫</string>
-  <string name="conflict_use_server_version">不要上載</string>
+  <string name="conflict_overwrite">覆寫</string>
+  <string name="conflict_dont_upload">不要上載</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>