Merge remote-tracking branch 'upstream/pull/3397'

[rails.git] / config / locales / sco.yml

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 69b94bda80c1d3f442223e9fec6177ccc09839b8..c9d52bed91a8396ba74233f545c3e7fb351e52cd 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1,8 +1,8 @@
 # Messages for Scots (Scots)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Scots (Scots)
 # Exported from translatewiki.net
 # Export driver: phpyaml

-# Author: Abijeet Patro

 # Author: AmaryllisGardener
 # Author: AmaryllisGardener

+# Author: ChrisFleming

 # Author: John Reid
 # Author: MJL
 ---
 # Author: John Reid
 # Author: MJL
 ---


@@ -13,7 +13,7 @@ sco:
   helpers:
     submit:
       diary_comment:
   helpers:
     submit:
       diary_comment:

-        create: Hain
+        create: Save

   activerecord:
     models:
       acl: Access Control Leet
   activerecord:
     models:
       acl: Access Control Leet


@@ -84,15 +84,9 @@ sco:
         pass_crypt: Passwird
   editor:
     default: Default (currently %{name})
         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)
     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)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)


@@ -124,9 +118,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:


@@ -142,8 +137,8 @@ sco:
       history_title_html: 'Way History: %{name}'
       nodes: Nodes
       also_part_of_html:
       history_title_html: 'Way History: %{name}'
       nodes: Nodes
       also_part_of_html:

-        one: paurt o way %{related_ways}
-        other: pairt o ways %{related_ways}
+        one: pairt o wey %{related_ways}
+        other: pairt o weys %{related_ways}

     relation:
       title_html: 'Relation: %{name}'
       history_title_html: 'Relation History: %{name}'
     relation:
       title_html: 'Relation: %{name}'
       history_title_html: 'Relation History: %{name}'


@@ -152,7 +147,7 @@ sco:
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node

-        way: Way
+        way: Wey

         relation: Relation
     containing_relation:
       entry_html: Relation %{relation_name}
         relation: Relation
     containing_relation:
       entry_html: Relation %{relation_name}


@@ -199,19 +194,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>
+      commented_by_anonymous_html: Comment frae anonymous <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}
+      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>

-      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>
         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>
         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}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}


@@ -248,12 +245,7 @@ sco:
     new:
       title: New Diary Entry
     form:
     new:
       title: New Diary Entry
     form:

-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Leid:'

       location: 'Location:'
       location: 'Location:'

-      latitude: 'Latitude:'
-      longitude: 'Longitude:'

       use_map_link: uise map
     index:
       title: Uisers' diaries
       use_map_link: uise map
     index:
       title: Uisers' diaries


@@ -311,7 +303,6 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
     comments:
         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
       post: Post
       when: When
       comment: Comment


@@ -774,11 +765,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


@@ -833,15 +819,10 @@ sco:
     learn_more: Learn Mair
     more: Mair
   user_mailer:
     learn_more: Learn Mair
     more: Mair
   user_mailer:

-    lost_password_plain:
+    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.
       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,
     note_comment_notification:
       anonymous: An anonymous uiser
       greeting: Hi,


@@ -849,6 +830,38 @@ 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'
         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:
   site:
     copyright:
       foreign:


@@ -1029,10 +1042,6 @@ sco:
           - Schuil
           - varsity
           building: Signeeficant biggin
           - Schuil
           - varsity
           building: Signeeficant biggin

-    richtext_area:
-      edit: Eedit
-    markdown_help:
-      headings: Heidins

     welcome:
       title: Walcome!
       introduction_html: |-
     welcome:
       title: Walcome!
       introduction_html: |-


@@ -1053,39 +1062,6 @@ sco:
     create:
       upload_trace: Uplaid GPS Trace
   users:
     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:'
     show:
       edits: Eedits
       created from: 'Creautit frae:'


@@ -1093,8 +1069,6 @@ sco:
     account:
       title: Eedit accoont
   javascripts:
     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
     notes:
       new:
         intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that


@@ -1151,6 +1125,5 @@ sco:
       centre_map: Centre cairt here
   redactions:
     edit:
       centre_map: Centre cairt here
   redactions:
     edit:

-      description: Descreeption

       heading: Eedit redaction
 ...
       heading: Eedit redaction
 ...