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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index ed5d1e5cc7cd8819052acd70b5f127c7ddeb0083..474d1f4c7e0d1a5d4e4d3a6a33fcb76ded1bf03f 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -104,8 +104,6 @@ sco:
     edit:
       title: Eedit accoont
   browse:
-    created: Creatit
-    closed: Closed
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
@@ -115,23 +113,6 @@ sco:
     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}'
@@ -204,7 +185,7 @@ sco:
       saved_at: Saved at
       user: Uiser
       comment: Comment
-      area: Aurie
+      area: Area
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
@@ -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
+      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:
@@ -797,7 +797,7 @@ sco:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:
-    lost_password:
+    new:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:
@@ -860,12 +860,7 @@ sco:
         infringement_title_html: Copyricht infringement
     export:
       title: Export
-      area_to_export: Aurie tae Export
       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
@@ -887,17 +882,6 @@ sco:
         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:
@@ -923,13 +907,11 @@ sco:
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
-          lake:
-          - Loch
+          lake: Loch
           farm: Ferm
           military: Militar aurie
-          school:
-          - Schuil
-          - varsity
+          school: Schuil
+          university: varsity
           building: Signeeficant biggin
     welcome:
       title: Walcome!
@@ -945,7 +927,7 @@ sco:
   users:
     show:
       edits: Eedits
-      created from: 'Creautit frae:'
+      created from: 'Made frae:'
   notes:
     show:
       title: 'Note: %{id}'
@@ -988,7 +970,7 @@ sco:
         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