Merge branch 'pull/5196'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9a383569ee3ce97241b24b4dcdf5c612e3a6c5f4..faf9a89852325c8643c866371f36327501338e9e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,8 +38,6 @@ en:
   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:

-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable

         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:
         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:


@@ -2375,6 +2373,9 @@ en:
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"

           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"


@@ -2383,7 +2384,6 @@ en:
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"

-          stop: "Stop"

           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"
           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"


@@ -2833,15 +2833,9 @@ en:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:

-      title: Confirm role granting
-      heading: Confirm role granting

       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"

-      confirm: "Confirm"

     revoke:
     revoke:

-      title: Confirm role revoking
-      heading: Confirm role revoking

       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"

-      confirm: "Confirm"

   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."


@@ -2927,7 +2921,7 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-    blocks:
+    page:

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"


@@ -3204,6 +3198,7 @@ en:
       empty: "No redactions to show."
       heading: "List of Redactions"
       title: "List of Redactions"
       empty: "No redactions to show."
       heading: "List of Redactions"
       title: "List of Redactions"

+      new: "New Redaction"

     new:
       heading: "Enter Information for New Redaction"
       title: "Creating New Redaction"
     new:
       heading: "Enter Information for New Redaction"
       title: "Creating New Redaction"