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

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d1e14440..74f0bf04 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -27,6 +27,7 @@
   <string name="drawer_item_settings">ÐÐ¾ÑÑÐ°Ð²ÐºÐµ</string>
   <string name="drawer_item_logs">ÐÐ°Ð¿Ð¸ÑÐ½Ð¸ÑÐ¸</string>
   <string name="drawer_close">ÐÐ°ÑÐ²Ð¾ÑÐ¸</string>
+  <string name="drawer_open">ÐÑÐ²Ð¾ÑÐ¸</string>
   <string name="prefs_category_general">ÐÐ¿ÑÑÐµ</string>
   <string name="prefs_category_more">ÐÑÑÐ°Ð»Ð¾</string>
   <string name="prefs_accounts">ÐÐ°Ð»Ð¾Ð·Ð¸</string>
@@ -69,6 +70,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>
@@ -76,7 +78,6 @@
   <string name="filedetails_created">ÐÐ°Ð¿ÑÐ°Ð²ÑÐµÐ½:</string>
   <string name="filedetails_modified">ÐÐ·Ð¼ÐµÑÐµÐ½:</string>
   <string name="filedetails_download">ÐÑÐµÑÐ·Ð¼Ð¸</string>
-  <string name="filedetails_sync_file">ÐÑÐ²ÐµÐ¶Ð¸ ÑÐ°ÑÐ»</string>
   <string name="filedetails_renamed_in_upload_msg">Ð¤Ð°ÑÐ» ÑÐµ Ð¿ÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½ Ñ %1$s ÑÐ¾ÐºÐ¾Ð¼ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ°</string>
   <string name="list_layout">Ð Ð°ÑÐ¿Ð¾ÑÐµÐ´ Ð»Ð¸ÑÑÐµ</string>
   <string name="action_share_file">ÐÐµÐ·Ð° Ð´ÐµÑÐµÑÐ°</string>
@@ -84,8 +85,6 @@
   <string name="common_yes">ÐÐ°</string>
   <string name="common_no">ÐÐµ</string>
   <string name="common_ok">Ð£ ÑÐµÐ´Ñ</string>
-  <string name="common_cancel_download">ÐÑÐºÐ°Ð¶Ð¸ Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ</string>
-  <string name="common_cancel_upload">ÐÑÐºÐ°Ð¶Ð¸ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ</string>
   <string name="common_cancel">ÐÑÐºÐ°Ð¶Ð¸</string>
   <string name="common_save_exit">Ð¡Ð°ÑÑÐ²Ð°Ñ Ð¸ Ð¸Ð·Ð°ÑÐ¸</string>
   <string name="common_error">ÐÑÐµÑÐºÐ°</string>
@@ -199,9 +198,7 @@
   <string name="confirmation_remove_alert">ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s?</string>
   <string name="confirmation_remove_folder_alert">ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s Ð¸ ÑÐµÐ½ ÑÐ°Ð´ÑÐ¶Ð°Ñ?</string>
   <string name="confirmation_remove_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
-  <string name="confirmation_remove_folder_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸ ÑÐ°Ð´ÑÐ¶Ð°Ñ</string>
-  <string name="confirmation_remove_remote">Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÐ° ÑÐµÑÐ²ÐµÑÐ°</string>
-  <string name="confirmation_remove_remote_and_local">Ð£Ð´Ð°ÑÐµÐ½Ð¾ Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
+  <string name="confirmation_remove_folder_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
   <string name="remove_success_msg">Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾</string>
   <string name="remove_fail_msg">Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾</string>
   <string name="rename_dialog_title">Ð£Ð½ÐµÑÐ¸ÑÐµ Ð½Ð¾Ð² Ð½Ð°Ð·Ð¸Ð²</string>
@@ -253,11 +250,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>
@@ -289,7 +282,6 @@
   <string name="downloader_download_file_not_found">Ð¤Ð°ÑÐ» Ð½Ð¸ÑÐµ Ð²Ð¸ÑÐµ Ð´Ð¾ÑÑÑÐ¿Ð°Ð½ Ð½Ð° ÑÐµÑÐ²ÐµÑÑ</string>
   <string name="prefs_category_accounts">ÐÐ°Ð»Ð¾Ð·Ð¸</string>
   <string name="prefs_add_account">ÐÐ¾Ð´Ð°Ñ Ð½Ð°Ð»Ð¾Ð³</string>
-  <string name="auth_redirect_non_secure_connection_title">ÐÐµÐ·Ð±ÐµÐ´Ð½Ð° Ð²ÐµÐ·Ð° ÑÐµ Ð¿ÑÐµÑÑÐ¼ÐµÑÐµÐ½Ð° Ð½Ð° Ð½ÐµÐ±ÐµÐ·Ð±ÐµÐ´Ð½Ñ ÑÑÑÑ</string>
   <string name="actionbar_logger">ÐÐ°Ð¿Ð¸ÑÐ½Ð¸ÑÐ¸</string>
   <string name="log_send_history_button">ÐÑÑÐ¾ÑÐ¸ÑÐ°Ñ ÑÐ»Ð°ÑÐ°</string>
   <string name="log_send_no_mail_app">ÐÐµÐ¼Ð° Ð½Ð°ÑÐ¸Ð½Ð° Ð·Ð° ÑÐ»Ð°ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ½Ð¸ÐºÐ°. ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÑÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÑ Ðµ-Ð¿Ð¾ÑÑÐµ!</string>
@@ -305,15 +297,26 @@
   <string name="move_file_invalid_overwrite">Ð¤Ð°ÑÐ» Ð²ÐµÑ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÐ½Ð¾Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸</string>
   <string name="move_file_error">ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ Ð¿ÑÐµÐ¼ÐµÑÑÐ°ÑÑ ÑÐ°ÑÐ»Ð° Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ</string>
   <string name="forbidden_permissions_move">Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ»</string>
+  <string name="copy_file_invalid_overwrite">Ð¤Ð°ÑÐ» Ð²ÐµÑ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÐ½Ð¾Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸</string>
+  <string name="forbidden_permissions_copy">Ð´Ð° ÐºÐ¾Ð¿Ð¸ÑÐ°ÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ»</string>
   <string name="prefs_category_instant_uploading">Ð¢ÑÐµÐ½ÑÑÐ½Ð° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ°</string>
   <string name="prefs_category_security">ÐÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ</string>
   <string name="prefs_instant_video_upload_path_title">ÐÑÑÐ°ÑÐ° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° Ð²Ð¸Ð´ÐµÐ°</string>
-  <string name="download_folder_failed_content">ÐÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ÑÐ¸ Ð´Ð¾Ð²ÑÑÐµÐ½Ð¾</string>
   <string name="shared_subject_header">Ð´ÐµÑÐµÐ½Ð¾</string>
   <string name="with_you_subject_header">ÑÐ° Ð²Ð°Ð¼Ð°</string>
-  <string name="subject_token">%1$s Ð¿Ð¾Ð´ÐµÐ»Ð¸ â%2$sâ ÑÐ° Ð²Ð°Ð¼Ð°</string>
+  <string name="subject_user_shared_with_you">%1$s Ð¿Ð¾Ð´ÐµÐ»Ð¸ â%2$sâ ÑÐ° Ð²Ð°Ð¼Ð°</string>
   <string name="auth_refresh_button">ÐÑÐ²ÐµÐ¶Ð¸ Ð²ÐµÐ·Ñ</string>
   <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>
+  <string name="share_dialog_title">ÐÐµÑÐµÑÐµ</string>
+  <string name="share_search">Ð¢ÑÐ°Ð¶Ð¸</string>
 </resources>
