]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/sco.yml
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #2969 from tuckerrc/diary-updated-date
[rails.git] / config / locales / sco.yml
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 65e6f1c5fde3154d8cc21395d65197aee85f3c6e..5f4394413f418fa4cc825b939c21e584e5ac9edd 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -124,9 +124,10 @@ sco:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
       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>
         ago</abbr>
-      commented_by: Comment frae %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
@@ -199,19 +200,21 @@ sco:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
       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>
         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>
         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>
         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>
         ago</abbr>
-      hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      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}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
@@ -387,27 +390,21 @@ sco:
           marketplace: Mercatplace
           nightclub: Nicht Club
           nursing_home: Nursin Home
           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
           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
           prison: Prison
           pub: Pub
           public_building: Public Biggin
           recycling: Recyclin Pynt
           restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
           school: Schuil
           shelter: Shelter
           school: Schuil
           shelter: Shelter
-          shop: Shop
           shower: Shower
           social_centre: Social Centre
           shower: Shower
           social_centre: Social Centre
-          social_club: Social Club
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimmin Puil
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimmin Puil
@@ -421,7 +418,6 @@ sco:
           veterinary: Veterinary Surgery
           village_hall: Veelage Haw
           waste_basket: Waste Basket
           veterinary: Veterinary Surgery
           village_hall: Veelage Haw
           waste_basket: Waste Basket
-          youth_centre: Youth Centre
         boundary:
           administrative: Admeenistrative Boondary
           census: Census Boondary
         boundary:
           administrative: Admeenistrative Boondary
           census: Census Boondary
@@ -474,7 +470,6 @@ sco:
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
@@ -489,7 +484,6 @@ sco:
           fort: Fort
           heritage: Heritage Steid
           house: Hoose
           fort: Fort
           heritage: Heritage Steid
           house: Hoose
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
           manor: Manor
           memorial: Memorial
           mine: Mine
@@ -529,7 +523,6 @@ sco:
           reservoir_watershed: Reservoir Wattershed
           residential: Residential Aurie
           retail: Retail
           reservoir_watershed: Reservoir Wattershed
           residential: Residential Aurie
           retail: Retail
-          road: Road Aurie
           village_green: Village Green
           vineyard: Vineyard
           "yes": Launduise
           village_green: Village Green
           vineyard: Vineyard
           "yes": Launduise
@@ -642,7 +635,6 @@ sco:
           subdivision: Subdiveesion
           suburb: Suburb
           town: Toun
           subdivision: Subdiveesion
           suburb: Suburb
           town: Toun
-          unincorporated_area: Unincorporatit Aurie
           village: Veelage
         railway:
           abandoned: Abandoned Railway
           village: Veelage
         railway:
           abandoned: Abandoned Railway
@@ -667,6 +659,7 @@ sco:
           switch: Railway Pynts
           tram: Tramway
           tram_stop: Tram Stap
           switch: Railway Pynts
           tram: Tramway
           tram_stop: Tram Stap
+          yard: Railway Yard
         shop:
           alcohol: Off License
           antiques: Antiques
         shop:
           alcohol: Off License
           antiques: Antiques
@@ -699,12 +692,10 @@ sco:
           estate_agent: Estate Agent
           farm: Ferm Shop
           fashion: Fashion Shop
           estate_agent: Estate Agent
           farm: Ferm Shop
           fashion: Fashion Shop
-          fish: Fish Shop
           florist: Florist
           food: Fuid Shop
           funeral_directors: Funeral Directors
           furniture: Furnitur
           florist: Florist
           food: Fuid Shop
           funeral_directors: Funeral Directors
           furniture: Furnitur
-          gallery: Gallery
           garden_centre: Gairden Centre
           general: General Store
           gift: Gift Shop
           garden_centre: Gairden Centre
           general: General Store
           gift: Gift Shop
@@ -717,7 +708,6 @@ sco:
           kiosk: Kiosk Shop
           laundry: Laundry
           mall: Maw
           kiosk: Kiosk Shop
           laundry: Laundry
           mall: Maw
-          market: Mercat
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Muisic Shop
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Muisic Shop
@@ -726,7 +716,6 @@ sco:
           organic: Organic Fuid Shop
           outdoor: Ootduir Shop
           pet: Pet Shop
           organic: Organic Fuid Shop
           outdoor: Ootduir Shop
           pet: Pet Shop
-          pharmacy: Pharmacy
           photo: Photo Shop
           second_hand: Seicont-haund Shop
           shoes: Shoe Shop
           photo: Photo Shop
           second_hand: Seicont-haund Shop
           shoes: Shoe Shop
@@ -788,11 +777,6 @@ sco:
         level8: Ceety Boondary
         level9: Veelage Boondary
         level10: Suburb Boondary
         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
       types:
         cities: Ceeties
         towns: Touns
@@ -846,7 +830,7 @@ sco:
       text: Make a Donation
     learn_more: Learn Mair
     more: Mair
       text: Make a Donation
     learn_more: Learn Mair
     more: Mair
-  notifier:
+  user_mailer:
     lost_password_plain:
       hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset
         on this email address's openstreetmap.org accoont.
     lost_password_plain:
       hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset
         on this email address's openstreetmap.org accoont.
@@ -891,7 +875,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.
           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).
           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 +883,7 @@ sco:
         credit_1_html: |-
           We require that ye uise the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         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
           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 +894,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.
           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:
           For a brousable electronic cairt, the credit should appear in the corner o the cairt.
           For example:
         attribution_example:
The OpenStreetMap web site