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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index df567ee3475e2520df8984333947184d83f57a05..e3192c9e94e5312056d4360353baeff6ecb36fd1 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -741,13 +741,9 @@ diq:
       hi: Merheba %{to_user},
     message_notification:
       hi: Merheba %{to_user},
       hi: Merheba %{to_user},
     message_notification:
       hi: Merheba %{to_user},

-    email_confirm_plain:
+    email_confirm:

       greeting: Merheba,
       greeting: Merheba,

-    email_confirm_html:
-      greeting: Merheba,
-    lost_password_plain:
-      greeting: Merheba,
-    lost_password_html:
+    lost_password:

       greeting: Merheba,
     note_comment_notification:
       greeting: Merheba,
       greeting: Merheba,
     note_comment_notification:
       greeting: Merheba,