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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 3da8d38ab6ed607a9de27463dbfbf9c994077ac4..67dce974e4ab467b92ab6464d18b6341aed9ea2a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -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})
@@ -218,7 +218,6 @@ en-GB:
   auth:
     providers:
       none: None
-      openid: OpenID
       google: Google
       facebook: Facebook
       github: GitHub
@@ -474,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
@@ -1340,7 +1338,7 @@ 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.
@@ -1374,9 +1372,8 @@ en-GB:
     new:
       title: Login
       heading: Login
-      email or username: 'E-mail Address or Username:'
-      password: 'Password:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-mail Address or Username
+      password: Password
       remember: Remember me
       lost password link: Lost your password?
       login_button: Login
@@ -1396,8 +1393,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
@@ -1528,10 +1525,6 @@ en-GB:
       beginners_guide:
         title: Beginners' Guide
         description: Community maintained guide for beginners.
-      help:
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer
-          site.
       mailing_lists:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
@@ -1580,9 +1573,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
@@ -1596,7 +1589,7 @@ en-GB:
           commercial: Commercial area
           heathland: Heathland
           lake: Lake
-          reservoir: reservoir
+          reservoir: Reservoir
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
@@ -1606,11 +1599,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
@@ -1691,7 +1684,7 @@ en-GB:
     trace:
       pending: PENDING
       count_points:
-        one: 1 point
+        one: '%{count} point'
         other: '%{count} points'
       more: more
       trace_details: View Trace Details
@@ -1989,7 +1982,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}
@@ -2030,7 +2023,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