Merge branch 'pull/5035'

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 4e3fa8fa7f2f411534f60e6c7bca59402d97571c..486844fc480aa4e430f3a9f95d0a299cdf5e006f 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
 ---


@@ -103,8 +104,6 @@ sco:
     edit:
       title: Eedit accoont
   browse:
     edit:
       title: Eedit accoont
   browse:

-    created: Creatit
-    closed: Closed

     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous


@@ -114,23 +113,6 @@ sco:
     view_history: View History
     view_details: View Details
     location: 'Location:'
     view_history: View History
     view_details: View Details
     location: 'Location:'

-    changeset:
-      title: 'Chyngeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
-      changesetxml: Chyngeset XML
-      osmchangexml: osmChange XML
-      feed:
-        title: Chyngeset %{id}
-        title_comment: Chyngeset %{id} - %{comment}
-      join_discussion: Log in tae jyn the discussion
-      discussion: Discussion

     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'


@@ -203,7 +185,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}


@@ -216,6 +198,25 @@ sco:
       no_more_area: No mair chyngesets in this aurie.
       no_more_user: No mair chyngesets bi this uiser.
       load_more: Load mair
       no_more_area: No mair chyngesets in this aurie.
       no_more_user: No mair chyngesets bi this uiser.
       load_more: Load mair

+      feed:
+        title: Chyngeset %{id}
+        title_comment: Chyngeset %{id} - %{comment}
+        created: Creatit
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Chyngeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in tae jyn the discussion
+      changesetxml: Chyngeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})

     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
   changeset_comments:
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
   changeset_comments:


@@ -282,7 +283,8 @@ sco:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap

-    comments:
+  diary_comments:
+    index:

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -764,8 +766,6 @@ 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_ucl: the UCL VR Centre
-    partners_bytemark: Bytemark Hosting

     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance wirk is carried oot.
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance wirk is carried oot.


@@ -796,39 +796,17 @@ 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:

-    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
-        microsoft:
-          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:
     destroy:
       title: Logoot
       heading: Logoot frae OpenStreetMap
       logout_button: Logoot
   site:
     copyright:

+      title: Copyricht an License

       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},
       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},


@@ -842,7 +820,6 @@ sco:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:

-        title_html: Copyricht an License

         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap
         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap


@@ -853,18 +830,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

       manually_select: Manually select a different aurie
       manually_select: Manually select a different aurie

-      format_to_export: Format tae Export
-      osm_xml_data: OpenStreetMap XML Data
-      map_image: Cairt Image (shaws staundart layer)
-      embeddable_html: Embeddable HTML

       licence: Licence
       too_large:
         advice: 'If the abuin export fails, please consider uisin ane o the soorces
       licence: Licence
       too_large:
         advice: 'If the abuin export fails, please consider uisin ane o the soorces


@@ -886,17 +858,6 @@ sco:
         other:
           title: Ither Soorces
           description: Addeetional soorces leetit on the OpenStreetMap wiki
         other:
           title: Ither Soorces
           description: Addeetional soorces leetit on the OpenStreetMap wiki

-      options: Options
-      format: Format
-      scale: Scale
-      max: max
-      image_size: Image Size
-      zoom: Zuim
-      add_marker: Add a marker tae the cairt
-      latitude: 'Lat:'
-      longitude: 'Lon:'
-      output: Ootput
-      paste_html: Paste HTML tae embed in wabsteid

       export_button: Export
     fixthemap:
       how_to_help:
       export_button: Export
     fixthemap:
       how_to_help:


@@ -922,13 +883,11 @@ sco:
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie

-          lake:
-          - Loch
+          lake: Loch

           farm: Ferm
           military: Militar aurie
           farm: Ferm
           military: Militar aurie

-          school:
-          - Schuil
-          - varsity
+          school: Schuil
+          university: varsity

           building: Signeeficant biggin
     welcome:
       title: Walcome!
           building: Signeeficant biggin
     welcome:
       title: Walcome!


@@ -941,10 +900,27 @@ sco:
   traces:
     create:
       upload_trace: Uplaid GPS Trace
   traces:
     create:
       upload_trace: Uplaid GPS Trace

+  application:
+    auth_providers:
+      google:
+        title: Login wi Google
+        alt: Login wi a Google OpenID
+      facebook:
+        title: Login wi Facebook
+        alt: Login wi a Facebook Accoont
+      microsoft:
+        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

   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}'


@@ -987,7 +963,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