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

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9a0a0e74..10295f22 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -117,8 +117,8 @@
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">ਤਸਵੀਰਾਂ ਨੂੰ ਵਾਈ-ਫਾਈ ਰਾਹੀਂ ਹੀ ਅੱਪਲੋਡ ਕਰੋ</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="activity_chooser_send_file_title">ਭੇਜੋ</string>
   <string name="empty"></string>