X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fcf4f1238da1b084aafdb88753eed511b948b54b..a3ccc6a559dfbe2d8cb5ccc2ab82c08de7d9aef5:/res/values-sr/strings.xml

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d1e14440..7ced0476 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">ÐÑÐ¿ÑÐµÐ¼Ð°ÑÐµ</string>
   <string name="file_list_seconds_ago">Ð¿ÑÐµ Ð¿Ð°Ñ ÑÐµÐºÑÐ½Ð´Ð¸</string>
   <string name="file_list_empty">ÐÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑÐµÐ³. ÐÑÐ¿ÑÐµÐ¼Ð¸ÑÐµ Ð½ÐµÑÑÐ¾!</string>
+  <string name="file_list_loading">Ð£ÑÐ¸ÑÐ°Ð²Ð°Ð¼â¦</string>
   <string name="local_file_list_empty">ÐÐµÐ¼Ð° ÑÐ°ÑÐ»Ð¾Ð²Ð° Ñ Ð¾Ð²Ð¾Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸.</string>
   <string name="filedetails_select_file">Ð¢Ð°Ð¿Ð½Ð¸ÑÐµ Ð½Ð° ÑÐ°ÑÐ» ÑÐ°Ð´Ð¸ Ð¿ÑÐ¸ÐºÐ°Ð·Ð° Ð´Ð¾Ð´Ð°ÑÐ½Ð¸Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ°.</string>
   <string name="filedetails_size">ÐÐµÐ»Ð¸ÑÐ¸Ð½Ð°:</string>
@@ -253,11 +254,7 @@
   <string name="instant_upload_on_wifi">ÐÑÐ¿ÑÐµÐ¼Ð°Ñ ÑÐ»Ð¸ÐºÐµ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ</string>
   <string name="instant_video_upload_on_wifi">ÐÑÐ¿ÑÐµÐ¼Ð°Ñ Ð²Ð¸Ð´ÐµÐ¾ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ</string>
   <string name="instant_upload_path">/InstantUpload</string>
-  <string name="conflict_title">ÐÐ¶ÑÑÐ¸ÑÐ°Ñ ÑÑÐºÐ¾Ð±</string>
-  <string name="conflict_message">Ð£Ð´Ð°ÑÐµÐ½Ð¸ ÑÐ°ÑÐ» %s Ð½Ð¸ÑÐµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°Ð½ ÑÐ° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ð¼. ÐÐºÐ¾ Ð½Ð°ÑÑÐ°Ð²Ð¸ÑÐµ, Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÐµÑÐµ ÑÐ°ÑÐ» Ð½Ð° ÑÐµÑÐ²ÐµÑÑ.</string>
   <string name="conflict_keep_both">ÐÐ°Ð´ÑÐ¶Ð¸ Ð¾Ð±Ð°</string>
-  <string name="conflict_overwrite">ÐÑÐµÐ±ÑÐ¸ÑÐ¸</string>
-  <string name="conflict_dont_upload">ÐÐµ Ð¾ÑÐ¿ÑÐµÐ¼Ð°Ñ</string>
   <string name="preview_image_description">ÐÑÐµÐ³Ð»ÐµÐ´ ÑÐ»Ð¸ÐºÐµ</string>
   <string name="preview_image_error_unknown_format">Ð¡Ð»Ð¸ÐºÐ° ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸ÐºÐ°Ð·Ð°ÑÐ¸</string>
   <string name="error__upload__local_file_not_copied">%1$s ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ ÐºÐ¾Ð¿Ð¸ÑÐ°ÑÐ¸ Ñ Ð»Ð¾ÐºÐ°Ð»Ð½Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %2$s</string>
@@ -316,4 +313,12 @@
   <string name="auth_host_address">ÐÐ´ÑÐµÑÐ° ÑÐµÑÐ²ÐµÑÐ°</string>
   <string name="common_error_out_memory">ÐÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾ÑÐ½Ð¾ Ð¼ÐµÐ¼Ð¾ÑÐ¸ÑÐµ</string>
   <string name="username">ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ</string>
+  <string name="file_list__footer__folder">1 ÑÐ°ÑÑÐ¸ÐºÐ»Ð°</string>
+  <string name="file_list__footer__folders">%1$d ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸</string>
+  <string name="file_list__footer__file">1 ÑÐ°ÑÐ»</string>
+  <string name="file_list__footer__file_and_folder">1 ÑÐ°ÑÐ», 1 ÑÐ°ÑÑÐ¸ÐºÐ»Ð°</string>
+  <string name="file_list__footer__file_and_folders">1 ÑÐ°ÑÐ», %1$d ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸</string>
+  <string name="file_list__footer__files">%1$d ÑÐ°ÑÐ»Ð¾Ð²Ð°</string>
+  <string name="file_list__footer__files_and_folder">%1$d ÑÐ°ÑÐ»Ð¾Ð²Ð°, 1 ÑÐ°ÑÑÐ¸ÐºÐ»Ð°</string>
+  <string name="file_list__footer__files_and_folders">%1$d ÑÐ°ÑÐ»Ð¾Ð²Ð°, %2$d ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸</string>
 </resources>
