From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 31 Aug 2015 05:13:46 +0000 (-0400)
Subject: [tx-robot] updated from transifex
X-Git-Tag: oc-android-1.8~28
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ef7cf6edb0c4f9914b37ce30cc7468d24ca368bf?ds=sidebyside;hp=-c

[tx-robot] updated from transifex
---

ef7cf6edb0c4f9914b37ce30cc7468d24ca368bf
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b601b68a..2351338b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -202,6 +202,8 @@
   <string name="confirmation_remove_folder_alert">Ali res želite odstraniti %1$s skupaj s celotno vsebino?</string>
   <string name="confirmation_remove_local">Le krajevno</string>
   <string name="confirmation_remove_folder_local">Le krajevno</string>
+  <string name="confirmation_remove_remote">S strežnika</string>
+  <string name="confirmation_remove_remote_and_local">Oddaljeno &amp; krajevno</string>
   <string name="remove_success_msg">Odstranitev je uspešno končana</string>
   <string name="remove_fail_msg">Odstranjevanje je spodletelo</string>
   <string name="rename_dialog_title">Vnesite novo ime</string>
@@ -253,7 +255,11 @@
   <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">Neskladje datotek</string>
+  <string name="conflict_message">Katere datoteke želite ohraniti? Če izberete obe različici, bo krajevni datoteki dodatna k imenu še številka.</string>
   <string name="conflict_keep_both">Ohrani obe</string>
+  <string name="conflict_use_local_version">krajevna različica</string>
+  <string name="conflict_use_server_version">različica strežnika</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>
@@ -308,6 +314,7 @@
   <string name="shared_subject_header">v souporabi</string>
   <string name="with_you_subject_header">z vami</string>
   <string name="subject_token">Uporabnik %1$s je omogočil souporabo \"%2$s\" z vami</string>
+  <string name="saml_subject_token">\"%1$s\" je oddan v souporabo z vami</string>
   <string name="auth_refresh_button">Osveži povezavo</string>
   <string name="auth_host_address">Naslov strežnika</string>
   <string name="common_error_out_memory">Ni dovolj pomnilnika</string>