]> 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 remote-tracking branch 'upstream/pull/4387'
[rails.git] / config / locales / sco.yml
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 46c8b8bcc1a354ae0dc434e2970f0fb6e7eb4343..a3b2fda1e1f6541c60d310dd08eba8b226c3f6ce 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -4,6 +4,7 @@
 # Author: AmaryllisGardener
 # Author: C1614
 # Author: ChrisFleming
 # Author: AmaryllisGardener
 # Author: C1614
 # Author: ChrisFleming
+# Author: CiphriusKane
 # Author: John Reid
 # Author: MJL
 ---
 # Author: John Reid
 # Author: MJL
 ---
@@ -105,12 +106,6 @@ sco:
   browse:
     created: Creatit
     closed: Closed
   browse:
     created: Creatit
     closed: Closed
-    created_html: Creatit <abbr title='%{title}'>%{time} ago</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time} ago</abbr>
-    created_by_html: Creatit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    deleted_by_html: Deletit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    edited_by_html: Eeditit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
@@ -130,10 +125,6 @@ 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_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>
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
@@ -213,7 +204,7 @@ sco:
       saved_at: Saved at
       user: Uiser
       comment: Comment
       saved_at: Saved at
       user: Uiser
       comment: Comment
-      area: Aurie
+      area: Area
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
@@ -299,13 +290,6 @@ sco:
       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
-    search:
-      title:
-        latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>
-        osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -813,7 +797,7 @@ sco:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:
-    lost_password:
+    new:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:
@@ -825,7 +809,7 @@ sco:
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
-        windowslive:
+        microsoft:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:
@@ -870,13 +854,13 @@ sco:
         more_title_html: Findin oot mair
         contributors_title_html: Oor contreibutors
         contributors_intro_html: |-
         more_title_html: Findin oot mair
         contributors_title_html: Oor contreibutors
         contributors_intro_html: |-
-          Oor contreibutors are thoosands o individuals. We an aa include
-          openly-licensed data frae naitional mappin agencies
-          an ither soorces, amang them:
+          Oor contreibutors are thoosands o individuals. We forbye include
+          apenly-licensed data fae naitional mappin agencies
+          an ither soorces, amang thaim:
         infringement_title_html: Copyricht infringement
     export:
       title: Export
         infringement_title_html: Copyricht infringement
     export:
       title: Export
-      area_to_export: Aurie tae Export
+      area_to_export: Area tae Export
       manually_select: Manually select a different aurie
       format_to_export: Format tae Export
       osm_xml_data: OpenStreetMap XML Data
       manually_select: Manually select a different aurie
       format_to_export: Format tae Export
       osm_xml_data: OpenStreetMap XML Data
@@ -932,7 +916,8 @@ sco:
     key:
       table:
         entry:
     key:
       table:
         entry:
-          wood: Wid
+          forest:
+            1: Wid
           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
@@ -961,7 +946,7 @@ sco:
   users:
     show:
       edits: Eedits
   users:
     show:
       edits: Eedits
-      created from: 'Creautit frae:'
+      created from: 'Made frae:'
   notes:
     show:
       title: 'Note: %{id}'
   notes:
     show:
       title: 'Note: %{id}'
@@ -969,21 +954,6 @@ 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_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>
-      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_html: Reactivatit 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>
     new:
       title: New Note
       intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that we
     new:
       title: New Note
       intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that we
@@ -1019,7 +989,7 @@ sco:
         stay_roundabout_without_exit: Stay on roondaboot - %{name}
         start_without_exit: Stairt at end o %{name}
         destination_without_exit: Reak destination
         stay_roundabout_without_exit: Stay on roondaboot - %{name}
         start_without_exit: Stairt at end o %{name}
         destination_without_exit: Reak destination
-        against_oneway_without_exit: Gae against ane-wey on %{name}
+        against_oneway_without_exit: Gae agin ane-wey on %{name}
         end_oneway_without_exit: End o ane-wey on %{name}
         roundabout_with_exit: At roondaboot tak exit %{exit} ontae %{name}
         unnamed: unnamed road
         end_oneway_without_exit: End o ane-wey on %{name}
         roundabout_with_exit: At roondaboot tak exit %{exit} ontae %{name}
         unnamed: unnamed road
The OpenStreetMap web site