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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index cc0b3b486342fb86804f3074737368a43809866a..08a460be78bc0eebef9465d04bf7c573907788c3 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -4,6 +4,7 @@
 # Author: AmaryllisGardener
 # Author: C1614
 # Author: ChrisFleming
+# Author: CiphriusKane
 # Author: John Reid
 # Author: MJL
 ---
@@ -123,7 +124,6 @@ sco:
       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:
@@ -203,7 +203,7 @@ sco:
       saved_at: Saved at
       user: Uiser
       comment: Comment
-      area: Aurie
+      area: Area
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
@@ -796,7 +796,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:
@@ -808,7 +808,7 @@ sco:
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
-        windowslive:
+        microsoft:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:
@@ -853,18 +853,13 @@ sco:
         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
-      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
@@ -886,17 +881,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:
@@ -922,13 +906,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!
@@ -944,7 +926,7 @@ sco:
   users:
     show:
       edits: Eedits
-      created from: 'Creautit frae:'
+      created from: 'Made frae:'
   notes:
     show:
       title: 'Note: %{id}'
@@ -987,7 +969,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