X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/460b8c1de243b518ee2ef9481292ec690213e623..f816482778fad28424a4b2a151e0ba8ede2dcd97:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e07c9aaab..6d3be7da8 100644 --- 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 @@ -298,12 +297,8 @@ en-GB: 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 @@ -404,6 +399,9 @@ 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} timeout: sorry: Sorry, the list of changesets you requested took too long to retrieve. changeset_comments: @@ -474,7 +472,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 +1337,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 +1371,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 +1392,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 @@ -1482,12 +1478,7 @@ en-GB: for this feature. export: title: Export - area_to_export: Area to Export manually_select: Manually select a different area - format_to_export: Format to Export - osm_xml_data: OpenStreetMap XML Data - map_image: Map Image (shows standard layer) - embeddable_html: Embeddable HTML licence: Licence too_large: advice: 'If the above export fails, please consider using one of the sources @@ -1509,17 +1500,6 @@ en-GB: other: title: Other Sources description: Additional sources listed on the OpenStreetMap wiki - options: Options - format: Format - scale: Scale - max: max - image_size: Image Size - zoom: Zoom - add_marker: Add a marker to the map - latitude: 'Lat:' - longitude: 'Lon:' - output: Output - paste_html: Paste HTML to embed in website export_button: Export fixthemap: title: Report a problem/Fix the map @@ -1544,10 +1524,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 @@ -1596,23 +1572,23 @@ en-GB: rail: Railway subway: Subway cable_car: Cable car - chair_lift: chairlift - runway_only: Airport Runway - taxiway: taxiway - apron_only: Airport apron + chair_lift: Chair lift + runway: Airport Runway + taxiway: Taxiway + apron: Airport apron admin: Administrative boundary - forest_only: Forest + forest: Forest wood: Wood golf: Golf course park: Park - common_only: Common + common: Common resident: Residential area retail: Retail area industrial: Industrial area commercial: Commercial area heathland: Heathland - lake_only: Lake - reservoir: reservoir + lake: Lake + reservoir: Reservoir farm: Farm brownfield: Brownfield site cemetery: Cemetery @@ -1621,12 +1597,12 @@ en-GB: centre: Sports centre reserve: Nature reserve military: Military area - school_only: School - university: university + school: School + university: University building: Significant building station: Railway station - summit_only: Summit - peak: peak + summit: Summit + peak: Peak tunnel: Dashed casing = tunnel bridge: Black casing = bridge private: Private access @@ -1707,7 +1683,7 @@ en-GB: trace: pending: PENDING count_points: - one: 1 point + one: '%{count} point' other: '%{count} points' more: more trace_details: View Trace Details @@ -2005,7 +1981,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} @@ -2046,7 +2022,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