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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index b3eccec90dee3997729539263bfdfbf1ec91bcc6..e2141c97bbfe1426d24f67aa053ec8717ff72a2f 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -945,8 +945,6 @@ sco:
       map_image: Cairt Image (shaws staundart layer)
       embeddable_html: Embeddable HTML
       licence: Licence
-      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
           leetit ablo:'
@@ -1021,20 +1019,12 @@ sco:
           building: Signeeficant biggin
     welcome:
       title: Walcome!
-      introduction_html: |-
+      introduction: |-
         Walcome tae OpenStreetMap, the free an eeditable cairt o the warld. Nou that ye're signed
         up, ye're aw set tae get stairtit cairttin. Here's a quick guide wi the maist important
         things ye need tae ken.
       whats_on_the_map:
         title: Whit's on the Cairt
-        on_html: |-
-          OpenStreetMap is a place for cairttin things that are baith <em>real an current</em> -
-          it includes millions o biggins, roads, an ither details aboot places. Ye can cairt
-          whitever real-warld featurs are interestin tae ye.
-        off_html: |-
-          Whit it <em>disna</em> include is opinionatit data lik ratins, historical or
-          hypothetical featurs, an data frae copyrichtit soorces. Unless ye hae special
-          permission, dinna copy frae online or paper cairts.
   traces:
     create:
       upload_trace: Uplaid GPS Trace