X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c907f6a7426bee9c240cee16063ed29a6ba7c1ab..414f43f3264b76c8a8fe8a63fb1bbb2090dc97cd:/res/values-el/strings.xml

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3888bf41..0ccada8d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -254,11 +254,11 @@
   <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_title">ÎÎ¹Î­Î½ÎµÎ¾Î· Î±ÏÏÎµÎ¯ÏÎ½</string>
+  <string name="conflict_message">Î Î¿Î¹Î± Î±ÏÏÎµÎ¯Î± Î¸Î­Î»ÎµÏÎµ Î½Î± ÎºÏÎ±ÏÎ®ÏÎµÏÎµ; ÎÎ½ ÎµÏÎ¹Î»Î­Î¾ÎµÏÎµ ÎºÎ±Î¹ ÏÎ¹Ï Î´ÏÎ¿ ÎµÎºÎ´Î¿ÏÎ­Ï, ÏÏÎ¿ ÏÎ¿ÏÎ¹ÎºÏ Î±ÏÏÎµÎ¯Î¿ Î¸Î± ÏÏÎ¿ÏÏÎµÎ¸ÎµÎ¯ Î­Î½Î±Ï Î±ÏÎ¹Î¸Î¼ÏÏ ÏÏÎ¿ ÏÎ½Î¿Î¼Î¬ ÏÎ¿Ï.</string>
   <string name="conflict_keep_both">ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ· ÎºÎ±Î¹ ÏÏÎ½ Î´ÏÎ¿</string>
-  <string name="conflict_overwrite">ÎÎ½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·</string>
-  <string name="conflict_dont_upload">ÎÎ± Î¼Î·Î½ Î¼ÎµÏÎ±ÏÎ¿ÏÏÏÎ¸ÎµÎ¯</string>
+  <string name="conflict_use_local_version">Î§ÏÎ®ÏÎ· ÏÎ¿ÏÎ¹ÎºÎ®Ï ÎµÎºÎ´Î¿ÏÎ®Ï</string>
+  <string name="conflict_use_server_version">Î§ÏÎ®ÏÎ· ÎµÎºÎ´Î¿ÏÎ®Ï Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®</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>
@@ -313,6 +313,7 @@
   <string name="shared_subject_header">Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏÎ¼Î­Î½Î±</string>
   <string name="with_you_subject_header">Î¼Îµ ÎµÏÎ¬Ï</string>
   <string name="subject_token">Î %1$s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏÏÎ·ÎºÎµ ÏÎ¿ \"%2$s\" Î¼Îµ ÎµÏÎ¬Ï</string>
+  <string name="saml_subject_token">\"%1$s\" Î¼Î¿Î¹ÏÎ¬ÏÏÎ·ÎºÎµ Î¼Î±Î¶Î¯ ÏÎ±Ï</string>
   <string name="auth_refresh_button">ÎÎ½Î±Î½Î­ÏÏÎ· ÏÏÎ½Î´ÎµÏÎ·Ï</string>
   <string name="auth_host_address">ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®</string>
   <string name="common_error_out_memory">ÎÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î±ÏÎºÎµÏÎ® Î¼Î½Î®Î¼Î·</string>
