X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/efd50cd529990069dc1ca95f66ec6f61471fe29d..e66253afbe45d7f4f3feae36869522ab092975bd:/config/locales/sco.yml

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 162960a02..491206ff9 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -2,12 +2,18 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AmaryllisGardener
+# Author: ChrisFleming
 # Author: John Reid
+# Author: MJL
 ---
 sco:
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'
+  helpers:
+    submit:
+      diary_comment:
+        create: Save
   activerecord:
     models:
       acl: Access Control Leet
@@ -63,7 +69,7 @@ sco:
         latitude: Latitude
         longitude: Longitude
         public: Public
-        description: Description
+        description: Descreeption
       message:
         sender: Sender
         title: Subject
@@ -73,23 +79,20 @@ sco:
         email: Email
         active: Active
         display_name: Display Name
-        description: Description
+        description: Descreeption
         languages: Leids
         pass_crypt: Passwird
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-brouser eeditor)
     id:
       name: iD
       description: iD (in-brouser eeditor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-brouser eeditor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  accounts:
+    edit:
+      title: Eedit accoont
   browse:
     created: Creatit
     closed: Closed
@@ -118,9 +121,10 @@ sco:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      hidden_commented_by: Hidden comment frae %{user} <abbr title='%{exact_time}'>%{when}
+      hidden_commented_by_html: Hidden comment frae %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      commented_by: Comment frae %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
@@ -129,28 +133,28 @@ sco:
       join_discussion: Log in tae jyn the discussion
       discussion: Discussion
     node:
-      title: 'Node: %{name}'
-      history_title: 'Node History: %{name}'
+      title_html: 'Node: %{name}'
+      history_title_html: 'Node History: %{name}'
     way:
-      title: 'Way: %{name}'
-      history_title: 'Way History: %{name}'
+      title_html: 'Way: %{name}'
+      history_title_html: 'Way History: %{name}'
       nodes: Nodes
-      also_part_of:
-        one: paurt o way %{related_ways}
-        other: pairt o ways %{related_ways}
+      also_part_of_html:
+        one: pairt o wey %{related_ways}
+        other: pairt o weys %{related_ways}
     relation:
-      title: 'Relation: %{name}'
-      history_title: 'Relation History: %{name}'
+      title_html: 'Relation: %{name}'
+      history_title_html: 'Relation History: %{name}'
       members: Members
     relation_member:
-      entry_role: '%{type} %{name} as %{role}'
+      entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
-        way: Way
+        way: Wey
         relation: Relation
     containing_relation:
-      entry: Relation %{relation_name}
-      entry_role: Relation %{relation_name} (as %{relation_role})
+      entry_html: Relation %{relation_name}
+      entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'
       type:
@@ -193,20 +197,22 @@ sco:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      open_by: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      open_by_anonymous: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      commented_by: Comment frae %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      commented_by_anonymous: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
+      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      closed_by: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
+      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      reopened_by: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      reopened_by_anonymous: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
+      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-  changeset:
+      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+  changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »
@@ -235,12 +241,15 @@ sco:
       load_more: Load mair
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
-    rss:
-      commented_at_html: Updatit %{when} ago
+  changeset_comments:
+    comment:
       commented_at_by_html: Updatit %{when} ago bi %{user}
-  diary_entry:
+  diary_entries:
     new:
       title: New Diary Entry
+    form:
+      location: 'Location:'
+      use_map_link: uise map
     index:
       title: Uisers' diaries
       title_friends: Friends' diaries
@@ -255,29 +264,20 @@ sco:
       newer_entries: Newer Entries
     edit:
       title: Eedit diary entry
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Leid:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: uise map
-      save_button: Hain
       marker_text: Diary entry location
     show:
       title: '%{user}''s diary | %{title}'
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
-      login_to_leave_a_comment: '%{login_link} tae leave a comment'
+      login_to_leave_a_comment_html: '%{login_link} tae leave a comment'
       login: Login
-      save_button: Hain
     no_such_entry:
       title: No such diary entry
       heading: 'No entry wi the id: %{id}'
       body: Sorry, thare is no diary entry or comment wi the id %{id}. Please check
         yer spellin, or meybe the airtin ye clicked is wrang.
     diary_entry:
-      posted_by: Postit bi %{link_user} on %{created} in %{language_link}
+      posted_by_html: Postit bi %{link_user} on %{created} in %{language_link}
       comment_link: Comment on this entry
       reply_link: Reply tae this entry
       comment_count:
@@ -288,7 +288,7 @@ sco:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
-      comment_from: Comment frae %{link_user} on %{comment_created_at}
+      comment_from_html: Comment frae %{link_user} on %{comment_created_at}
       hide_link: Hide this comment
       confirm: Confirm
     location:
@@ -306,24 +306,22 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
     comments:
-      has_commented_on: '%{display_name} haes commentit on the follaein diary entries'
       post: Post
       when: When
       comment: Comment
-      ago: '%{ago} ago'
       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
     search:
       title:
-        latlon: Results frae <a href="http://openstreetmap.org/">Internal</a>
-        ca_postcode: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>
+        ca_postcode_html: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames: Results frae <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_reverse: Results frae <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -383,27 +381,21 @@ sco:
           marketplace: Mercatplace
           nightclub: Nicht Club
           nursing_home: Nursin Home
-          office: Office
           parking: Pairkin
           pharmacy: Pharmacy
           place_of_worship: Place o Worship
           police: Polis
           post_box: Post Box
           post_office: Post Office
-          preschool: Pre-Schuil
           prison: Prison
           pub: Pub
           public_building: Public Biggin
           recycling: Recyclin Pynt
           restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
           school: Schuil
           shelter: Shelter
-          shop: Shop
           shower: Shower
           social_centre: Social Centre
-          social_club: Social Club
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimmin Puil
@@ -417,7 +409,6 @@ sco:
           veterinary: Veterinary Surgery
           village_hall: Veelage Haw
           waste_basket: Waste Basket
-          youth_centre: Youth Centre
         boundary:
           administrative: Admeenistrative Boondary
           census: Census Boondary
@@ -470,7 +461,6 @@ sco:
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
@@ -485,7 +475,6 @@ sco:
           fort: Fort
           heritage: Heritage Steid
           house: Hoose
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
@@ -525,7 +514,6 @@ sco:
           reservoir_watershed: Reservoir Wattershed
           residential: Residential Aurie
           retail: Retail
-          road: Road Aurie
           village_green: Village Green
           vineyard: Vineyard
           "yes": Launduise
@@ -638,7 +626,6 @@ sco:
           subdivision: Subdiveesion
           suburb: Suburb
           town: Toun
-          unincorporated_area: Unincorporatit Aurie
           village: Veelage
         railway:
           abandoned: Abandoned Railway
@@ -663,6 +650,7 @@ sco:
           switch: Railway Pynts
           tram: Tramway
           tram_stop: Tram Stap
+          yard: Railway Yard
         shop:
           alcohol: Off License
           antiques: Antiques
@@ -695,12 +683,10 @@ sco:
           estate_agent: Estate Agent
           farm: Ferm Shop
           fashion: Fashion Shop
-          fish: Fish Shop
           florist: Florist
           food: Fuid Shop
           funeral_directors: Funeral Directors
           furniture: Furnitur
-          gallery: Gallery
           garden_centre: Gairden Centre
           general: General Store
           gift: Gift Shop
@@ -713,7 +699,6 @@ sco:
           kiosk: Kiosk Shop
           laundry: Laundry
           mall: Maw
-          market: Mercat
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Muisic Shop
@@ -722,7 +707,6 @@ sco:
           organic: Organic Fuid Shop
           outdoor: Ootduir Shop
           pet: Pet Shop
-          pharmacy: Pharmacy
           photo: Photo Shop
           second_hand: Seicont-haund Shop
           shoes: Shoe Shop
@@ -784,11 +768,6 @@ sco:
         level8: Ceety Boondary
         level9: Veelage Boondary
         level10: Suburb Boondary
-    description:
-      title:
-        osm_nominatim: Location frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Location frae <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Ceeties
         towns: Touns
@@ -842,16 +821,11 @@ sco:
       text: Make a Donation
     learn_more: Learn Mair
     more: Mair
-  notifier:
-    lost_password_plain:
+  user_mailer:
+    lost_password:
       hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset
         on this email address's openstreetmap.org accoont.
       click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird.
-    lost_password_html:
-      greeting: Hi,
-      hopefully_you: Someane (possibly ye) has asked for the passwird tae be reset
-        on this email address's openstreetmap.org accoont.
-      click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird.
     note_comment_notification:
       anonymous: An anonymous uiser
       greeting: Hi,
@@ -859,16 +833,48 @@ sco:
         subject_own: '[OpenStreetMap] %{commenter} haes commentit on ane o yer notes'
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
+  passwords:
+    lost_password:
+      title: Lost password
+      heading: Forgotten Passwird?
+  sessions:
+    new:
+      auth_providers:
+        google:
+          title: Login wi Google
+          alt: Login wi a Google OpenID
+        facebook:
+          title: Login wi Facebook
+          alt: Login wi a Facebook Accoont
+        windowslive:
+          title: Login wi Windows Live
+          alt: Login wi a Windows Live Accoont
+        github:
+          title: Login wi GitHub
+          alt: Login wi a GitHub Account
+        wikipedia:
+          title: Login wi Wikipedia
+          alt: Login wi a Wikipedia Accoont
+        wordpress:
+          title: Login wi Wordpress
+          alt: Login wi a Wordpress OpenID
+        aol:
+          title: Login wi AOL
+          alt: Login wi an AOL OpenID
+    destroy:
+      title: Logoot
+      heading: Logoot frae OpenStreetMap
+      logout_button: Logoot
   site:
     copyright:
       foreign:
         title: Aboot this translation
-        text: In the event of a conflict atween this translatit page an %{english_original_link},
+        html: In the event of a conflict atween this translatit page an %{english_original_link},
           the Inglis page shall tak precedence
         english_link: the Inglis oreeginal
       native:
         title: Aboot this page
-        text: Ye are viewin the Inglis version o the copyricht page. Ye can gang back
+        html: Ye are viewin the Inglis version o the copyricht page. Ye can gang back
           tae the %{native_link} o this page or ye can stap readin aboot copyricht
           an %{mapping_link}.
         native_link: Scots version
@@ -887,7 +893,7 @@ sco:
           mey distribute the result anly unner the same licence. The
           full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains yer richts an responsibilities.
-        intro_3_html: |-
+        intro_3_1_html: |-
           The cairtografie in oor cairt tiles, an oor documentation, are
           licensed unner the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
@@ -895,7 +901,7 @@ sco:
         credit_1_html: |-
           We require that ye uise the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
+        credit_2_1_html: |-
           Ye must an aa mak it clear that the data is available unner the Open
           Database License, an if uisin oor cairt tiles, that the cairtografie is
           licensed as CC BY-SA. Ye mey dae this bi airtin tae
@@ -906,7 +912,7 @@ sco:
           direct yer readers tae openstreetmap.org (perhaps bi expandin
           'OpenStreetMap' tae this full address), tae opendatacommons.org, an
           if relevant, to creativecommons.org.
-        credit_3_html: |-
+        credit_4_html: |-
           For a brousable electronic cairt, the credit should appear in the corner o the cairt.
           For example:
         attribution_example:
@@ -965,7 +971,7 @@ sco:
       map_image: Cairt Image (shaws staundart layer)
       embeddable_html: Embeddable HTML
       licence: Licence
-      export_details: OpenStreetMap data is licensed unner the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details_html: OpenStreetMap data is licensed unner the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'If the abuin export fails, please consider uisin ane o the soorces
@@ -1039,10 +1045,6 @@ sco:
           - Schuil
           - varsity
           building: Signeeficant biggin
-    richtext_area:
-      edit: Eedit
-    markdown_help:
-      headings: Heidins
     welcome:
       title: Walcome!
       introduction_html: |-
@@ -1063,48 +1065,11 @@ sco:
     create:
       upload_trace: Uplaid GPS Trace
   users:
-    login:
-      auth_providers:
-        google:
-          title: Login wi Google
-          alt: Login wi a Google OpenID
-        facebook:
-          title: Login wi Facebook
-          alt: Login wi a Facebook Accoont
-        windowslive:
-          title: Login wi Windows Live
-          alt: Login wi a Windows Live Accoont
-        github:
-          title: Login wi GitHub
-          alt: Login wi a GitHub Account
-        wikipedia:
-          title: Login wi Wikipedia
-          alt: Login wi a Wikipedia Accoont
-        yahoo:
-          title: Login wi Yahoo
-          alt: Login wi a Yahoo OpenID
-        wordpress:
-          title: Login wi Wordpress
-          alt: Login wi a Wordpress OpenID
-        aol:
-          title: Login wi AOL
-          alt: Login wi an AOL OpenID
-    logout:
-      title: Logoot
-      heading: Logoot frae OpenStreetMap
-      logout_button: Logoot
-    lost_password:
-      title: Lost password
-      heading: Forgotten Passwird?
     show:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-    account:
-      title: Eedit accoont
   javascripts:
-    share:
-      image_size: Eemage will shaw the staundairt layer at
     notes:
       new:
         intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that
@@ -1161,6 +1126,5 @@ sco:
       centre_map: Centre cairt here
   redactions:
     edit:
-      description: Description
       heading: Eedit redaction
 ...