X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9d9efd1c1ded9c225c16be80f4b648018839f3ef..f4445284d07f6d26f902f9bf890b1172385e4187:/res/values-it/strings.xml

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 443b0d3b..599d5faa 100644
--- 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="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>