X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c907f6a7426bee9c240cee16063ed29a6ba7c1ab..b0cb99b7c8081670af3c0e7f7a59f3cf0aa9c7d7:/res/values-fa/strings.xml?ds=inline

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 79e2fdae..0efba32c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -204,11 +204,7 @@
   <string name="instant_upload_on_wifi">ØªØµØ§ÙÛØ± Ø±Ø§ ÙÙØ· Ø§Ø² Ø·Ø±ÛÙ wifi Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±Û Ú©Ù</string>
   <string name="instant_video_upload_on_wifi">Ø¢Ù¾ÙÙØ¯ ÙÛØ¯ÛÙ ÙÙØ· Ø§Ø² Ø·Ø±ÛÙ WiFi</string>
   <string name="instant_upload_path">Ø¢Ù¾ÙÙØ¯ ÙÙØ±Û</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="share_link_file_error">Ø¯Ø± Ø­ÛÙ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±Û Ø§ÛÙ ÙØ§ÛÙ ÛØ§ Ù¾ÙØ´Ù Ø®Ø·Ø§ÛÛ Ø±Ø® Ø¯Ø§Ø¯Ù Ø§Ø³Øª</string>
