X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..d66ad4a4555c6ae9cb7257f53e2df375e5c4c73f:/config/locales/sco.yml?ds=inline

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 65e6f1c5f..9c5178113 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1,7 +1,6 @@
 # Messages for Scots (Scots)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: AmaryllisGardener
 # Author: John Reid
 # Author: MJL
@@ -84,15 +83,9 @@ sco:
         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)
@@ -124,9 +117,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:
@@ -199,19 +193,21 @@ sco:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      opened_by: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      opened_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_anonymous_html: Comment frae anonymous <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}
+      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>
-      closed_by: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
+      reopened_by_html: Reactivatit bi %{user} <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_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      hidden_by: Hidden bi %{user} <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}
@@ -248,12 +244,7 @@ sco:
     new:
       title: New Diary Entry
     form:
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Leid:'
       location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
       use_map_link: uise map
     index:
       title: Uisers' diaries
@@ -387,27 +378,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
@@ -421,7 +406,6 @@ sco:
           veterinary: Veterinary Surgery
           village_hall: Veelage Haw
           waste_basket: Waste Basket
-          youth_centre: Youth Centre
         boundary:
           administrative: Admeenistrative Boondary
           census: Census Boondary
@@ -474,7 +458,6 @@ sco:
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
@@ -489,7 +472,6 @@ sco:
           fort: Fort
           heritage: Heritage Steid
           house: Hoose
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
@@ -529,7 +511,6 @@ sco:
           reservoir_watershed: Reservoir Wattershed
           residential: Residential Aurie
           retail: Retail
-          road: Road Aurie
           village_green: Village Green
           vineyard: Vineyard
           "yes": Launduise
@@ -642,7 +623,6 @@ sco:
           subdivision: Subdiveesion
           suburb: Suburb
           town: Toun
-          unincorporated_area: Unincorporatit Aurie
           village: Veelage
         railway:
           abandoned: Abandoned Railway
@@ -667,6 +647,7 @@ sco:
           switch: Railway Pynts
           tram: Tramway
           tram_stop: Tram Stap
+          yard: Railway Yard
         shop:
           alcohol: Off License
           antiques: Antiques
@@ -699,12 +680,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
@@ -717,7 +696,6 @@ sco:
           kiosk: Kiosk Shop
           laundry: Laundry
           mall: Maw
-          market: Mercat
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Muisic Shop
@@ -726,7 +704,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
@@ -788,11 +765,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
@@ -846,16 +818,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,
@@ -891,7 +858,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).
@@ -899,7 +866,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
@@ -910,7 +877,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:
@@ -1107,8 +1074,6 @@ sco:
     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
@@ -1165,6 +1130,5 @@ sco:
       centre_map: Centre cairt here
   redactions:
     edit:
-      description: Descreeption
       heading: Eedit redaction
 ...