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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 491206ff9bdc279fac36bdfe27d4291de5381531..b3eccec90dee3997729539263bfdfbf1ec91bcc6 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -57,7 +57,7 @@ sco:
         title: Subject
         latitude: Latitude
         longitude: Longitude
         title: Subject
         latitude: Latitude
         longitude: Longitude

-        language: Leid
+        language_code: Leid

       friend:
         user: Uiser
         friend: Friend
       friend:
         user: Uiser
         friend: Friend


@@ -190,28 +190,6 @@ sco:
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}

-    note:
-      title: 'Note: %{id}'
-      new_note: New Note
-      description: Descreeption
-      open_title: 'Unresolved note #%{note_name}'
-      closed_title: 'Resolved note #%{note_name}'
-      hidden_title: 'Hidden note #%{note_name}'
-      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>

   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}


@@ -315,13 +293,10 @@ sco:
     search:
       title:
         latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -494,7 +469,6 @@ sco:
           commercial: Commercial Aurie
           conservation: Conservation
           construction: Construction
           commercial: Commercial Aurie
           conservation: Conservation
           construction: Construction

-          farm: Ferm

           farmland: Fermlaund
           farmyard: Fermyard
           forest: Forest
           farmland: Fermlaund
           farmyard: Fermyard
           forest: Forest


@@ -1069,12 +1043,34 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location

+  notes:
+    show:
+      title: 'Note: %{id}'
+      description: Descreeption
+      open_title: 'Unresolved note #%{note_name}'
+      closed_title: 'Resolved note #%{note_name}'
+      hidden_title: 'Hidden note #%{note_name}'
+      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+    new:
+      title: New Note
+      intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that we
+        can fix it. Muiv the maurker til the richt poseetion n type ae few wairds
+        tae explain the proablem. (Please dinna enter personal information here.)

   javascripts:
   javascripts:

-    notes:
-      new:
-        intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that
-          we can fix it. Muiv the maurker til the richt poseetion n type ae few wairds
-          tae explain the proablem. (Please dinna enter personal information here.)

     directions:
       errors:
         no_place: Sairy - couldna find that place.
     directions:
       errors:
         no_place: Sairy - couldna find that place.