X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/629cff2d3f8e7641f86f02452851cc0194f7c830..c19bb85a24437eb90f5ebf493fb35e0c954da1e5:/res/values-sl/strings.xml

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b157e40c..e13d17dd 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -71,10 +71,6 @@
   <string name="file_list_empty">Tukaj še ni ničesar. Najprej je treba datoteke poslati v oblak!</string>
   <string name="file_list_loading">Poteka nalaganje ...</string>
   <string name="local_file_list_empty">V tej mapi ni datotek.</string>
-  <string name="file_list_folder">mapa</string>
-  <string name="file_list_folders">mape</string>
-  <string name="file_list_file">datoteka</string>
-  <string name="file_list_files">datoteke</string>
   <string name="filedetails_select_file">Pritisnite na datoteko za prikaz dodatnih podrobnosti.</string>
   <string name="filedetails_size">Velikost:</string>
   <string name="filedetails_type">Vrsta:</string>
@@ -197,7 +193,8 @@
 	</string>
   <string name="auth_can_not_auth_against_server">Ni mogoče preveriti pristnosti strežnika</string>
   <string name="auth_account_does_not_exist">Račun na napravi še ne obstaja.</string>
-  <string name="fd_keep_in_sync">Datoteka naj bo posodobljena</string>
+  <string name="favorite">Priljubljene</string>
+  <string name="unfavorite">Odstrani priljubljeno</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
   <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s?</string>
@@ -257,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_overwrite">Prepiši</string>
-  <string name="conflict_dont_upload">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>
@@ -315,9 +308,17 @@
   <string name="download_folder_failed_content">Imenika %1$s  ni mogoče prejeti v celoti</string>
   <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="subject_token">Uporabnik %1$s je omogočil souporabo \"%2$s\" 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>
   <string name="username">Uporabniško ime</string>
+  <string name="file_list__footer__folder">1 mapa</string>
+  <string name="file_list__footer__folders">%1$d map</string>
+  <string name="file_list__footer__file">1 datoteka</string>
+  <string name="file_list__footer__file_and_folder">1 datoteka, 1 mapa</string>
+  <string name="file_list__footer__file_and_folders">1 datoteka, %1$d map</string>
+  <string name="file_list__footer__files">%1$d datotek</string>
+  <string name="file_list__footer__files_and_folder">%1$d datotek, 1 mapa</string>
+  <string name="file_list__footer__files_and_folders">%1$d datotek, %2$d map</string>
 </resources>