X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1327ce731589bb5454047ea4a71314c4f24ef322..be5dbcbb2e5afef17d47b4cbbf9e0eb08de69da4:/res/values-el/strings.xml

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 16a80df9..3888bf41 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -257,8 +257,8 @@
   <string name="conflict_title">Î£ÏÎ³ÎºÏÎ¿ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÏÎµÏÎ½</string>
   <string name="conflict_message">Î¤Î¿ Î±ÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿ Î±ÏÏÎµÎ¯Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏÏÎ³ÏÏÎ¿Î½Î¹ÏÎ¼Î­Î½Î¿ Î¼Îµ ÏÎ¿ ÏÎ¿ÏÎ¹ÎºÏ Î±ÏÏÎµÎ¯Î¿. ÎÎ½ ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ Î¸Î± Î±Î½ÏÎ¹ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ ÏÎ¿ ÏÎµÏÎ¹ÎµÏÏÎ¼ÎµÎ½Î¿ ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï ÏÏÎ¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®. </string>
   <string name="conflict_keep_both">ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ· ÎºÎ±Î¹ ÏÏÎ½ Î´ÏÎ¿</string>
-  <string name="conflict_use_local_version">ÎÎ½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·</string>
-  <string name="conflict_use_server_version">ÎÎ± Î¼Î·Î½ Î¼ÎµÏÎ±ÏÎ¿ÏÏÏÎ¸ÎµÎ¯</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>
