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

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 599d5faa..c0e9d98e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -254,6 +254,8 @@
   <string name="instant_upload_on_wifi">Carica le immagini solo via WiFi</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_title">File in conflitto</string>
+  <string name="conflict_message">Quali file vuoi tenere? Se selezioni entrambi le versioni, il file locale avrà un numero aggiunto al suo nome.</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>
@@ -311,6 +313,7 @@
   <string name="shared_subject_header">condiviso</string>
   <string name="with_you_subject_header">con te</string>
   <string name="subject_token">%1$s ha condiviso \"%2$s\" con te</string>
+  <string name="saml_subject_token">\"%1$s\" è stato condiviso con te</string>
   <string name="auth_refresh_button">Aggiorna la connessione</string>
   <string name="auth_host_address">Indirizzo del server</string>
   <string name="common_error_out_memory">Memoria insufficiente</string>