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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 0bf3f379672a02cbbafe7ea21a8d7a2e53a9cbf2..a4a52aeba2c7d69816315e3a31659da8cdecf5df 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -53,9 +53,6 @@ en-GB:
         create: Add Comment
       message:
         create: Send
         create: Add Comment
       message:
         create: Send

-      client_application:
-        create: Register
-        update: Update

       redaction:
         create: Create redaction
         update: Save redaction
       redaction:
         create: Create redaction
         update: Save redaction


@@ -265,6 +262,23 @@ en-GB:
       make_edits_public_button: Make all my edits public
     update:
       success: User information updated successfully.
       make_edits_public_button: Make all my edits public
     update:
       success: User information updated successfully.

+    terms:
+      show:
+        title: Terms
+        heading: Terms
+        consider_pd: In addition to the above, I consider my contributions to be in
+          the Public Domain
+        consider_pd_why: what's this?
+        you need to accept or decline: Please read and then either accept or decline
+          the new Contributor Terms to continue.
+        legale_select: 'Country of residence:'
+        legale_names:
+          france: France
+          italy: Italy
+          rest_of_world: Rest of the world
+      terms_declined_flash:
+        terms_declined_html: We are sorry that you have decided to not accept the
+          new Contributor Terms. For more information, please see %{terms_declined_link}.

   browse:
     version: Version
     in_changeset: Changeset
   browse:
     version: Version
     in_changeset: Changeset


@@ -277,17 +291,14 @@ en-GB:
     location: 'Location:'
     node:
       title_html: 'Node: %{name}'
     location: 'Location:'
     node:
       title_html: 'Node: %{name}'

-      history_title_html: 'Node History: %{name}'

     way:
       title_html: 'Way: %{name}'
     way:
       title_html: 'Way: %{name}'

-      history_title_html: 'Way History: %{name}'

       nodes: Nodes
       also_part_of_html:
         one: part of way %{related_ways}
         other: part of ways %{related_ways}
     relation:
       title_html: 'Relation: %{name}'
       nodes: Nodes
       also_part_of_html:
         one: part of way %{related_ways}
         other: part of ways %{related_ways}
     relation:
       title_html: 'Relation: %{name}'

-      history_title_html: 'Relation History: %{name}'

       members: Members
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'
       members: Members
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'


@@ -299,13 +310,6 @@ en-GB:
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found

-      sorry: 'Sorry, %{type} #%{id} could not be found.'
-      type:
-        node: node
-        way: way
-        relation: relation
-        changeset: changeset
-        note: note

     timeout:
       title: Timeout Error
       type:
     timeout:
       title: Timeout Error
       type:


@@ -340,6 +344,14 @@ en-GB:
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features

+  old_elements:
+    index:
+      node:
+        title_html: 'Node History: %{name}'
+      way:
+        title_html: 'Way History: %{name}'
+      relation:
+        title_html: 'Relation History: %{name}'

   changeset_comments:
     feeds:
       comment:
   changeset_comments:
     feeds:
       comment:


@@ -1623,22 +1635,6 @@ en-GB:
         later in the preferences.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
         later in the preferences.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!

-    terms:
-      title: Terms
-      heading: Terms
-      consider_pd: In addition to the above, I consider my contributions to be in
-        the Public Domain
-      consider_pd_why: what's this?
-      you need to accept or decline: Please read and then either accept or decline
-        the new Contributor Terms to continue.
-      legale_select: 'Country of residence:'
-      legale_names:
-        france: France
-        italy: Italy
-        rest_of_world: Rest of the world
-    terms_declined_flash:
-      terms_declined_html: We are sorry that you have decided to not accept the new
-        Contributor Terms. For more information, please see %{terms_declined_link}.

     no_such_user:
       title: No such user
       heading: The user %{user} does not exist
     no_such_user:
       title: No such user
       heading: The user %{user} does not exist