X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1327ce731589bb5454047ea4a71314c4f24ef322..d1257b34c035ccbe7971ddde3cea2a1bf7d66410:/res/values-gl/strings.xml

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>