Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5dbdabe23fdc420b3694dc4b9c1a50714fbaad8c..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:


@@ -1195,27 +1207,6 @@ en-GB:
       failure: An e-mail address has already been confirmed with this token.
       unknown_token: That confirmation code has expired or does not exist.
   messages:
       failure: An e-mail address has already been confirmed with this token.
       unknown_token: That confirmation code has expired or does not exist.
   messages:

-    inbox:
-      title: Inbox
-      messages: You have %{new_messages} and %{old_messages}
-      new_messages:
-        one: '%{count} new message'
-        other: '%{count} new messages'
-      old_messages:
-        one: '%{count} old message'
-        other: '%{count} old messages'
-      no_messages_yet_html: You have no messages yet. Why not get in touch with some
-        of the %{people_mapping_nearby_link}?
-      people_mapping_nearby: people mapping nearby
-    messages_table:
-      from: From
-      to: To
-      subject: Subject
-      date: Date
-    message_summary:
-      unread_button: Mark as unread
-      read_button: Mark as read
-      destroy_button: Delete

     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}


@@ -1228,29 +1219,53 @@ en-GB:
       title: No such message
       heading: No such message
       body: Sorry, there is no message with that id.
       title: No such message
       heading: No such message
       body: Sorry, there is no message with that id.

-    outbox:
-      title: Outbox
-      messages:
-        one: You have %{count} sent message
-        other: You have %{count} sent messages
-      no_sent_messages_html: You have no sent messages yet. Why not get in touch with
-        some of the %{people_mapping_nearby_link}?
-      people_mapping_nearby: people mapping nearby

     show:
       title: Read message
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
     show:
       title: Read message
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back

-    sent_message_summary:
-      destroy_button: Delete
-    heading:
-      my_inbox: My Inbox

     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted

+    mailboxes:
+      heading:
+        my_inbox: My Inbox
+      messages_table:
+        from: From
+        to: To
+        subject: Subject
+        date: Date
+      message:
+        unread_button: Mark as unread
+        read_button: Mark as read
+        destroy_button: Delete
+    inboxes:
+      show:
+        title: Inbox
+        messages: You have %{new_messages} and %{old_messages}
+        new_messages:
+          one: '%{count} new message'
+          other: '%{count} new messages'
+        old_messages:
+          one: '%{count} old message'
+          other: '%{count} old messages'
+        no_messages_yet_html: You have no messages yet. Why not get in touch with
+          some of the %{people_mapping_nearby_link}?
+        people_mapping_nearby: people mapping nearby
+    outboxes:
+      show:
+        title: Outbox
+        messages:
+          one: You have %{count} sent message
+          other: You have %{count} sent messages
+        no_sent_messages_html: You have no sent messages yet. Why not get in touch
+          with some of the %{people_mapping_nearby_link}?
+        people_mapping_nearby: people mapping nearby
+      message:
+        destroy_button: Delete

   passwords:
     new:
       title: Lost password
   passwords:
     new:
       title: Lost password


@@ -1620,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


@@ -1688,15 +1687,25 @@ en-GB:
       confirm: Confirm
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
       confirm: Confirm
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.

-    index:
-      title: Users
-      heading: Users
-      summary_html: '%{name} created from %{ip_address} on %{date}'
-      summary_no_ip_html: '%{name} created on %{date}'
-      empty: No matching users found
-    page:
-      confirm: Confirm Selected Users
-      hide: Hide Selected Users
+    issued_blocks:
+      show:
+        title: Blocks by %{name}
+        empty: '%{name} has not made any blocks yet.'
+    received_blocks:
+      show:
+        title: Blocks on %{name}
+        empty: '%{name} has not been blocked yet.'
+    lists:
+      show:
+        title: Users
+        heading: Users
+        empty: No matching users found
+      page:
+        confirm: Confirm Selected Users
+        hide: Hide Selected Users
+      user:
+        summary_html: '%{name} created from %{ip_address} on %{date}'
+        summary_no_ip_html: '%{name} created on %{date}'

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -1752,12 +1761,6 @@ en-GB:
         hours:
           one: '%{count} hour'
           other: '%{count} hours'
         hours:
           one: '%{count} hour'
           other: '%{count} hours'

-    blocks_on:
-      title: Blocks on %{name}
-      empty: '%{name} has not been blocked yet.'
-    blocks_by:
-      title: Blocks by %{name}
-      empty: '%{name} has not made any blocks yet.'

     show:
       title: '%{block_on} blocked by %{block_by}'
       heading_html: '%{block_on} blocked by %{block_by}'
     show:
       title: '%{block_on} blocked by %{block_by}'
       heading_html: '%{block_on} blocked by %{block_by}'