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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 65e6f1c5fde3154d8cc21395d65197aee85f3c6e..5f8712e7855decf165f6211d94912b7bf1755287 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -891,7 +891,7 @@ sco:
           mey distribute the result anly unner the same licence. The
           full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains yer richts an responsibilities.
           mey distribute the result anly unner the same licence. The
           full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains yer richts an responsibilities.

-        intro_3_html: |-
+        intro_3_1_html: |-

           The cairtografie in oor cairt tiles, an oor documentation, are
           licensed unner the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
           The cairtografie in oor cairt tiles, an oor documentation, are
           licensed unner the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).


@@ -899,7 +899,7 @@ sco:
         credit_1_html: |-
           We require that ye uise the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         credit_1_html: |-
           We require that ye uise the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.

-        credit_2_html: |-
+        credit_2_1_html: |-

           Ye must an aa mak it clear that the data is available unner the Open
           Database License, an if uisin oor cairt tiles, that the cairtografie is
           licensed as CC BY-SA. Ye mey dae this bi airtin tae
           Ye must an aa mak it clear that the data is available unner the Open
           Database License, an if uisin oor cairt tiles, that the cairtografie is
           licensed as CC BY-SA. Ye mey dae this bi airtin tae


@@ -910,7 +910,7 @@ sco:
           direct yer readers tae openstreetmap.org (perhaps bi expandin
           'OpenStreetMap' tae this full address), tae opendatacommons.org, an
           if relevant, to creativecommons.org.
           direct yer readers tae openstreetmap.org (perhaps bi expandin
           'OpenStreetMap' tae this full address), tae opendatacommons.org, an
           if relevant, to creativecommons.org.

-        credit_3_html: |-
+        credit_4_html: |-

           For a brousable electronic cairt, the credit should appear in the corner o the cairt.
           For example:
         attribution_example:
           For a brousable electronic cairt, the credit should appear in the corner o the cairt.
           For example:
         attribution_example: