X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1327ce731589bb5454047ea4a71314c4f24ef322..97625170fa20dc0c470f97bfbaf1030264012018:/res/values-sl/strings.xml?ds=inline

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f915c070..e13d17dd 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -254,11 +254,7 @@
   <string name="instant_upload_on_wifi">Pošiljaj slike le preko povezav Wi-Fi</string>
   <string name="instant_video_upload_on_wifi">Pošlji posnetke le preko povezave Wi-Fi</string>
   <string name="instant_upload_path">/Poslano</string>
-  <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="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>