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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 70c9a09cb4d11351e17e02915d1db5ad995624b5..ac968b36b5c00f2096f30e4a0c5e8f714a91492e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -104,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


@@ -115,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}'


@@ -217,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:


@@ -765,8 +765,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.


@@ -801,29 +799,6 @@ sco:
       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
     destroy:
       title: Logoot
       heading: Logoot frae OpenStreetMap


@@ -860,12 +835,7 @@ sco:
         infringement_title_html: Copyricht infringement
     export:
       title: Export
         infringement_title_html: Copyricht infringement
     export:
       title: Export

-      area_to_export: Area 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


@@ -887,17 +857,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:


@@ -940,6 +899,29 @@ 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
+      wordpress:
+        title: Login wi Wordpress
+        alt: Login wi a Wordpress OpenID
+      aol:
+        title: Login wi AOL
+        alt: Login wi an AOL OpenID

   users:
     show:
       edits: Eedits
   users:
     show:
       edits: Eedits