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

diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index 2345520c..3edf84eb 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -253,11 +253,7 @@
   <string name="instant_upload_on_wifi">ÐÐ°ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ½Ð¸Ð¼ÐºÐ¸ ÑÐ°Ð¼Ð¾ Ð¿ÑÐµÐ· WiFi</string>
   <string name="instant_video_upload_on_wifi">ÐÐ°ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ ÑÐ°Ð¼Ð¾ Ð¿ÑÐµÐ· 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>
