[tx-robot] updated from transifex

diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 6555325..469024b 100644 (file)
--- 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="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_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>
   <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-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index c85f6b6..4e68c85 100644 (file)
--- 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="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_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>
   <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-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 7310926..6fc1193 100644 (file)
--- 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_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>
   <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 443b0d3..599d5fa 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -255,6 +255,8 @@
   <string name="instant_video_upload_on_wifi">Carica i video solo tramite WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_keep_both">Mantieni entrambi</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_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>
   <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-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 771bec4..3a46950 100644 (file)
--- 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="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_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>
   <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>