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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 9ce428fb50aad5905afce61b6d0f5bad57a2f1d5..5f8712e7855decf165f6211d94912b7bf1755287 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1,13 +1,19 @@
 # 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: John Reid
 # Author: AmaryllisGardener
 # Author: John Reid

+# Author: MJL

 ---
 sco:
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'
 ---
 sco:
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'

+  helpers:
+    submit:
+      diary_comment:
+        create: Hain

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


@@ -63,7 +69,7 @@ sco:
         latitude: Latitude
         longitude: Longitude
         public: Public
         latitude: Latitude
         longitude: Longitude
         public: Public

-        description: Description
+        description: Descreeption

       message:
         sender: Sender
         title: Subject
       message:
         sender: Sender
         title: Subject


@@ -73,7 +79,7 @@ sco:
         email: Email
         active: Active
         display_name: Display Name
         email: Email
         active: Active
         display_name: Display Name

-        description: Description
+        description: Descreeption

         languages: Leids
         pass_crypt: Passwird
   editor:
         languages: Leids
         pass_crypt: Passwird
   editor:


@@ -129,28 +135,28 @@ sco:
       join_discussion: Log in tae jyn the discussion
       discussion: Discussion
     node:
       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:
     way:

-      title: 'Way: %{name}'
-      history_title: 'Way History: %{name}'
+      title_html: 'Way: %{name}'
+      history_title_html: 'Way History: %{name}'

       nodes: Nodes
       nodes: Nodes

-      also_part_of:
+      also_part_of_html:

         one: paurt o way %{related_ways}
         other: pairt o ways %{related_ways}
     relation:
         one: paurt o way %{related_ways}
         other: pairt o ways %{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:
       members: Members
     relation_member:

-      entry_role: '%{type} %{name} as %{role}'
+      entry_role_html: '%{type} %{name} as %{role}'

       type:
         node: Node
         way: Way
         relation: Relation
     containing_relation:
       type:
         node: Node
         way: Way
         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:
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'
       type:


@@ -193,8 +199,8 @@ 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}'

-      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: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      opened_by_anonymous: Creatit bi 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}
         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}


@@ -206,7 +212,7 @@ sco:
       reopened_by_anonymous: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       reopened_by_anonymous: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>

-  changeset:
+  changesets:

     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »


@@ -235,13 +241,21 @@ sco:
       load_more: Load mair
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
       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}
       commented_at_by_html: Updatit %{when} ago bi %{user}

-  diary_entry:
+  diary_entries:

     new:
       title: New Diary Entry
     new:
       title: New Diary Entry

-    list:
+    form:
+      subject: 'Subject:'
+      body: 'Body:'
+      language: 'Leid:'
+      location: 'Location:'
+      latitude: 'Latitude:'
+      longitude: 'Longitude:'
+      use_map_link: uise map
+    index:

       title: Uisers' diaries
       title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries
       title: Uisers' diaries
       title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries


@@ -255,29 +269,20 @@ sco:
       newer_entries: Newer Entries
     edit:
       title: Eedit diary entry
       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
       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
       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:
     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:
       comment_link: Comment on this entry
       reply_link: Reply tae this entry
       comment_count:


@@ -288,7 +293,7 @@ sco:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
       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:
       hide_link: Hide this comment
       confirm: Confirm
     location:


@@ -310,20 +315,19 @@ sco:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      ago: '%{ago} ago'

       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
     search:
       title:
       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>
           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>
           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:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -821,9 +825,7 @@ sco:
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.
     intro_2_create_account: Create a uiser accoont
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.
     intro_2_create_account: Create a uiser accoont

-    partners_html: Hostin is supportit bi %{ucl}, %{ic} an %{bytemark}, an ither %{partners}.

     partners_ucl: the UCL VR Centre
     partners_ucl: the UCL VR Centre

-    partners_ic: Imperial College London

     partners_bytemark: Bytemark Hosting
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
     partners_bytemark: Bytemark Hosting
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database


@@ -865,12 +867,12 @@ sco:
     copyright:
       foreign:
         title: Aboot this translation
     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
           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
           tae the %{native_link} o this page or ye can stap readin aboot copyricht
           an %{mapping_link}.
         native_link: Scots version


@@ -889,7 +891,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).


@@ -897,7 +899,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


@@ -908,7 +910,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:


@@ -967,7 +969,7 @@ sco:
       map_image: Cairt Image (shaws staundart layer)
       embeddable_html: Embeddable HTML
       licence: Licence
       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
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'If the abuin export fails, please consider uisin ane o the soorces


@@ -1064,7 +1066,7 @@ sco:
   traces:
     create:
       upload_trace: Uplaid GPS Trace
   traces:
     create:
       upload_trace: Uplaid GPS Trace

-  user:
+  users:

     login:
       auth_providers:
         google:
     login:
       auth_providers:
         google:


@@ -1163,6 +1165,6 @@ sco:
       centre_map: Centre cairt here
   redactions:
     edit:
       centre_map: Centre cairt here
   redactions:
     edit:

-      description: Description
+      description: Descreeption

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