renamed string values

[pub/Android/ownCloud.git] / res / values-pa / strings.xml

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 10295f2..9a0a0e7 100644 (file)
--- 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_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="activity_chooser_send_file_title">ਭੇਜੋ</string>
   <string name="empty"></string>