]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Localisation updates from https://translatewiki.net.
[rails.git] / config / locales / en-GB.yml
index cb17445fe3d7f70744d6b37db3a57f835023459f..722c4d1fcff54e38ec260d021db1b41cc629763d 100644 (file)
@@ -4,6 +4,7 @@
 # Author: Abijeet Patro
 # Author: Andibing
 # Author: BEANS
+# Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
@@ -49,7 +50,7 @@ en-GB:
         create: Send
       client_application:
         create: Register
-        update: Edit
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -99,6 +100,9 @@ en-GB:
       way_node: Way Node
       way_tag: Way Tag
     attributes:
+      client_application:
+        callback_url: Callback URL
+        support_url: Support URL
       diary_comment:
         body: Body
       diary_entry:
@@ -113,12 +117,15 @@ en-GB:
       trace:
         user: User
         visible: Visible
-        name: Name
+        name: Filename
         size: Size
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: Upload GPX File
+        visibility: Visibility
+        tagstring: Tags
       message:
         sender: Sender
         title: Subject
@@ -131,6 +138,9 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: comma delimited
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -415,7 +425,7 @@ en-GB:
     diary_entry:
       posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: '%{count} comment'
@@ -452,6 +462,18 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
+  friendships:
+    make_friend:
+      heading: Add %{user} as a friend?
+      button: Add as friend
+      success: '%{name} is now your friend!'
+      failed: Sorry, failed to add %{name} as a friend.
+      already_a_friend: You are already friends with %{name}.
+    remove_friend:
+      heading: Unfriend %{user}?
+      button: Unfriend
+      success: '%{name} was removed from your friends.'
+      not_a_friend: '%{name} is not one of your friends.'
   geocoder:
     search:
       title:
@@ -540,7 +562,6 @@ en-GB:
           motorcycle_parking: Motorcycle Parking
           nightclub: Night Club
           nursing_home: Nursing Home
-          office: Office
           parking: Parking
           parking_entrance: Parking Entrance
           parking_space: Parking Space
@@ -549,20 +570,15 @@ en-GB:
           police: Police
           post_box: Post Box
           post_office: Post Office
-          preschool: Pre-School
           prison: Prison
           pub: Pub
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
           school: School
           shelter: Shelter
-          shop: Shop
           shower: Shower
           social_centre: Social Centre
-          social_club: Social Club
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimming Pool
@@ -578,7 +594,6 @@ en-GB:
           waste_basket: Waste Bin
           waste_disposal: Waste Disposal
           water_point: Water Point
-          youth_centre: Youth Centre
         boundary:
           administrative: Administrative Boundary
           census: Census Boundary
@@ -653,7 +668,6 @@ en-GB:
           tertiary_link: Tertiary Road
           track: Track
           traffic_signals: Traffic Signals
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           turning_loop: Turning Loop
@@ -672,7 +686,6 @@ en-GB:
           fort: Fort
           heritage: Heritage Site
           house: House
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
@@ -717,7 +730,6 @@ en-GB:
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
           retail: Retail
-          road: Road Area
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
@@ -874,7 +886,6 @@ en-GB:
           subdivision: Subdivision
           suburb: Suburb
           town: Town
-          unincorporated_area: Unincorporated Area
           village: Village
           "yes": Place
         railway:
@@ -900,6 +911,7 @@ en-GB:
           switch: Railway Points
           tram: Tramway
           tram_stop: Tram Stop
+          yard: Railway Yard
         shop:
           alcohol: Off Licence
           antiques: Antiques
@@ -933,12 +945,10 @@ en-GB:
           estate_agent: Estate Agent
           farm: Farm Shop
           fashion: Fashion Shop
-          fish: Fishmonger
           florist: Florist
           food: Food Shop
           funeral_directors: Funeral Directors
           furniture: Furniture
-          gallery: Gallery
           garden_centre: Garden Centre
           general: General Store
           gift: Gift Shop
@@ -955,7 +965,6 @@ en-GB:
           laundry: Laundry
           lottery: Lottery
           mall: Mall
-          market: Market
           massage: Massage
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
@@ -967,7 +976,6 @@ en-GB:
           paint: Paint Shop
           pawnbroker: Pawnbroker
           pet: Pet Shop
-          pharmacy: Pharmacy
           photo: Photo Shop
           seafood: Seafood
           second_hand: Second-hand Shop
@@ -1102,15 +1110,15 @@ en-GB:
       header: '%{from_user} has commented on the OpenStreetMap diary entry with the
         subject %{subject}:'
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
-        or reply at %{replyurl}
+        or send a message to the author at %{replyurl}
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hi %{to_user},
       header: '%{from_user} has sent you a message through OpenStreetMap with the
         subject %{subject}:'
-      footer_html: You can also read the message at %{readurl} and you can reply at
-        %{replyurl}
-    friend_notification:
+      footer_html: You can also read the message at %{readurl} and you can send a
+        message to the author at %{replyurl}
+    friendship_notification:
       hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
@@ -1130,8 +1138,10 @@ en-GB:
         import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[OpenStreetMap] GPX Import success'
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible
-          %{possible_points} points.
+        loaded_successfully:
+          one: loaded successfully with %{trace_points} out of a possible 1 point.
+          other: loaded successfully with %{trace_points} out of a possible %{possible_points}
+            points.
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       greeting: Hi there!
@@ -1284,8 +1294,8 @@ en-GB:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: '%{name} powers map data on thousands of web sites, mobile apps,
-        and hardware devices'
+      used_by_html: '%{name} provides map data for thousands of web sites, mobile
+        apps, and hardware devices'
       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.
@@ -1339,18 +1349,16 @@ en-GB:
           build upon our data, you may distribute the result only under the same licence.
           The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
-        intro_3_html: |-
-          The cartography in our map tiles, and our documentation, are
-          licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
+        intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+          Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |-
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
+        credit_2_1_html: |-
           You must also make it clear that the data is available under the Open
           Database Licence, and if using our map tiles, that the cartography is
-          licenced as CC BY-SA. You may do this by linking to
+          licensed as CC BY-SA. You may do this by linking to
           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the licence(s). In media
@@ -1358,7 +1366,7 @@ en-GB:
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address), to opendatacommons.org, and
           if relevant, to creativecommons.org.
-        credit_3_html: |-
+        credit_4_html: |-
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
@@ -1726,11 +1734,6 @@ en-GB:
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
     new:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Help
@@ -1750,18 +1753,6 @@ en-GB:
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
-      filename: 'Filename:'
-      download: download
-      uploaded_at: 'Uploaded:'
-      points: 'Points:'
-      start_coord: 'Start coordinate:'
-      map: map
-      edit: edit
-      owner: 'Owner:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
@@ -1888,13 +1879,6 @@ en-GB:
       delete: Delete Client
       confirm: Are you sure?
       requests: 'Requesting the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     index:
       title: My OAuth Details
       my_tokens: My Authorised Applications
@@ -1910,19 +1894,7 @@ en-GB:
       registered_apps: 'You have the following client applications registered:'
       register_new: Register your application
     form:
-      name: Name
-      required: Required
-      url: Main Application URL
-      callback_url: Callback URL
-      support_url: Support URL
       requests: 'Request the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     not_found:
       sorry: Sorry, that %{type} could not be found.
     create:
@@ -2225,17 +2197,6 @@ en-GB:
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
-    make_friend:
-      heading: Add %{user} as a friend?
-      button: Add as friend
-      success: '%{name} is now your friend!'
-      failed: Sorry, failed to add %{name} as a friend.
-      already_a_friend: You are already friends with %{name}.
-    remove_friend:
-      heading: Unfriend %{user}?
-      button: Unfriend
-      success: '%{name} was removed from your friends.'
-      not_a_friend: '%{name} is not one of your friends.'
     index:
       title: Users
       heading: Users
@@ -2395,7 +2356,7 @@ en-GB:
       next: Next »
       previous: « Previous
   notes:
-    mine:
+    index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
       subheading_html: Notes submitted or commented on by %{user}