]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Merge remote-tracking branch 'upstream/pull/4584'
[rails.git] / config / locales / en-GB.yml
index 39f49ce275d15022e30fe0bb723efe9585a52dc1..55077fc483f401012faf841b7b27a58d42298108 100644 (file)
@@ -171,41 +171,41 @@ en-GB:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: about 1 hour ago
+        one: about %{count} hour ago
         other: about %{count} hours ago
       about_x_months:
-        one: about 1 month ago
+        one: about %{count} month ago
         other: about %{count} months ago
       about_x_years:
-        one: about 1 year ago
+        one: about %{count} year ago
         other: about %{count} years ago
       almost_x_years:
-        one: almost 1 year ago
+        one: almost %{count} year ago
         other: almost %{count} years ago
       half_a_minute: half a minute ago
       less_than_x_seconds:
-        one: less than 1 second ago
+        one: less than %{count} second ago
         other: less than %{count} seconds ago
       less_than_x_minutes:
-        one: less than a minute ago
+        one: less than %{count} minute ago
         other: less than %{count} minutes ago
       over_x_years:
-        one: over 1 year ago
+        one: over %{count} year ago
         other: over %{count} years ago
       x_seconds:
-        one: 1 second ago
+        one: '%{count} second ago'
         other: '%{count} seconds ago'
       x_minutes:
-        one: 1 minute ago
+        one: '%{count} minute ago'
         other: '%{count} minutes ago'
       x_days:
-        one: 1 day ago
+        one: '%{count} day ago'
         other: '%{count} days ago'
       x_months:
-        one: 1 month ago
+        one: '%{count} month ago'
         other: '%{count} months ago'
       x_years:
-        one: 1 year ago
+        one: '%{count} year ago'
         other: '%{count} years ago'
   editor:
     default: Default (currently %{name})
@@ -277,8 +277,6 @@ en-GB:
         for a note to confirm your new email address.
       success: User information updated successfully.
   browse:
-    created: Created
-    closed: Closed
     version: Version
     in_changeset: Changeset
     anonymous: anonymous
@@ -288,25 +286,6 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
-    changeset:
-      title: 'Changeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
-      join_discussion: Log in to join the discussion
-      discussion: Discussion
-      still_open: Changeset still open - discussion will open once the changeset is
-        closed.
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
@@ -403,6 +382,27 @@ en-GB:
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       load_more: Load more
+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
+        created: Created
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Changeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in to join the discussion
+      still_open: Changeset still open - discussion will open once the changeset is
+        closed.
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
   changeset_comments:
@@ -473,7 +473,6 @@ en-GB:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
-        zero: No comments
         one: '%{count} comment'
         other: '%{count} comments'
       edit_link: Edit this entry
@@ -1339,14 +1338,10 @@ en-GB:
     new:
       title: Lost password
       heading: Forgotten Password?
-      email address: E-mail address
+      email address: E-mail Address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
-    create:
-      notice email on way: Sorry you lost it :-( but an email is on its way so you
-        can reset it soon.
-      notice email cannot find: Could not find that email address, sorry.
     edit:
       title: Reset password
       heading: Reset Password for %{user}
@@ -1373,8 +1368,8 @@ en-GB:
     new:
       title: Login
       heading: Login
-      email or username: 'E-mail Address or Username:'
-      password: 'Password:'
+      email or username: E-mail Address or Username
+      password: Password
       remember: Remember me
       lost password link: Lost your password?
       login_button: Login
@@ -1394,8 +1389,8 @@ en-GB:
           title: Login with Facebook
           alt: Login with a Facebook Account
         microsoft:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+          title: Login with Microsoft
+          alt: Login with a Microsoft Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
@@ -1574,9 +1569,9 @@ en-GB:
           rail: Railway
           subway: Subway
           cable_car: Cable car
-          chair_lift: chairlift
+          chair_lift: Chair lift
           runway: Airport Runway
-          taxiway: taxiway
+          taxiway: Taxiway
           apron: Airport apron
           admin: Administrative boundary
           forest: Forest
@@ -1590,7 +1585,7 @@ en-GB:
           commercial: Commercial area
           heathland: Heathland
           lake: Lake
-          reservoir: reservoir
+          reservoir: Reservoir
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
@@ -1600,11 +1595,11 @@ en-GB:
           reserve: Nature reserve
           military: Military area
           school: School
-          university: university
+          university: University
           building: Significant building
           station: Railway station
           summit: Summit
-          peak: peak
+          peak: Peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
@@ -1685,7 +1680,7 @@ en-GB:
     trace:
       pending: PENDING
       count_points:
-        one: 1 point
+        one: '%{count} point'
         other: '%{count} points'
       more: more
       trace_details: View Trace Details
@@ -1983,7 +1978,7 @@ en-GB:
       time_past_html: Ended %{time}.
       block_duration:
         hours:
-          one: 1 hour
+          one: '%{count} hour'
           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
@@ -2024,7 +2019,7 @@ en-GB:
     index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
-      subheading_html: Notes submitted or commented on by %{user}
+      subheading_html: Notes %{submitted} or %{commented} by %{user}
       id: Id
       creator: Creator
       description: Description