Merge remote-tracking branch 'upstream/pull/2997' into master

[rails.git] / config / locales / km.yml

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 0de3cad375f87669e2abac95d78b27e30f16ae40..5c58f7ddba5ffa6be4c5b897d780f5ad72e4acf4 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -637,13 +637,8 @@ km:
       subject: '[OpenStreetMap] សូមស្វាគមន៍មកកាន់ OpenStreetMap'
     email_confirm:
       subject: '[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីមែលរបស់អ្នក​'
-    email_confirm_plain:
       greeting: សួស្ដី,
-    email_confirm_html:
-      greeting: សួស្ដី​,
-    lost_password_plain:
-      greeting: សួស្ដី,
-    lost_password_html:
+    lost_password:
       greeting: សួស្ដី​,
   messages:
     inbox: