Merge remote-tracking branch 'upstream/pull/2999'

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

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 5cbf71b458680a69f4bd454f0f1bc62f46f95e23..cc0159f3c89ed8ec99a940791e670c022dcb6842 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -765,13 +765,9 @@ ce:
   user_mailer:
     signup_confirm:
       greeting: Маршалла!
   user_mailer:
     signup_confirm:
       greeting: Маршалла!

-    email_confirm_plain:
+    email_confirm:

       greeting: Маршалла,
       greeting: Маршалла,

-    email_confirm_html:
-      greeting: Маршалла,
-    lost_password_plain:
-      greeting: Маршалла,
-    lost_password_html:
+    lost_password:

       greeting: Маршалла,
     note_comment_notification:
       greeting: Маршалла,
       greeting: Маршалла,
     note_comment_notification:
       greeting: Маршалла,