renamed string values

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

diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml
index 4640602..9dcee7e 100644 (file)
--- a/res/values-cy-rGB/strings.xml
+++ b/res/values-cy-rGB/strings.xml
@@ -131,8 +131,8 @@
   <string name="conflict_title">Gwrthdaro diweddaru</string>
   <string name="conflict_message">Nid yw ffeil bell %s wedi cydamseru â\'r ffeil leol. Bydd parhau yn amnewid cynnwys y ffeil ar y gweinydd.</string>
   <string name="conflict_keep_both">Cadw\'r ddau</string>
-  <string name="conflict_overwrite">Trosysgrifio</string>
-  <string name="conflict_dont_upload">Peidio llwytho i fyny</string>
+  <string name="conflict_use_local_version">Trosysgrifio</string>
+  <string name="conflict_use_server_version">Peidio llwytho i fyny</string>
   <string name="activity_chooser_send_file_title">Anfon</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">Cyfrifon</string>