about summary refs log tree commit diff
path: root/config/locales/simple_form.cy.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-09-03 14:33:06 +0200
committerThibaut Girka <thib@sitedethib.com>2018-09-03 14:33:06 +0200
commit6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch)
tree24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/locales/simple_form.cy.yml
parente915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff)
parentccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'config/locales/simple_form.cy.yml')
-rw-r--r--config/locales/simple_form.cy.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 7800fe637..4b1721b77 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -1,3 +1,11 @@
 ---
 cy:
-  simple_form: {}
+  simple_form:
+    labels:
+      defaults:
+        confirm_password: Cadarnhau cyfrinair
+        email: Cyfeiriad e-bost
+        header: Pennyn
+        new_password: Cyfrinair newydd
+        password: Cyfrinair
+        username: Enw defnyddiwr