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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index a6702ca4480f8bc2f74123851c6a35351d1aa201..449acfa11f24cfb1aee9631d56c44a600e2edab8 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -171,6 +171,10 @@ 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}

+  changeset_comments:
+    feeds:
+      comment:
+        commented_at_by_html: Updatit %{when} ago bi %{user}

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


@@ -180,12 +184,6 @@ sco:
       anonymous: Anonymous
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
       anonymous: Anonymous
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details

-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: Uiser
-      comment: Comment
-      area: Area

     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}


@@ -219,9 +217,6 @@ sco:
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.

-  changeset_comments:
-    comment:
-      commented_at_by_html: Updatit %{when} ago bi %{user}

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -755,33 +750,20 @@ sco:
     edit: Eedit
     history: History
     export: Export
     edit: Eedit
     history: History
     export: Export

-    data: Data
-    export_data: Export Data

     gps_traces: GPS Traces
     gps_traces: GPS Traces

-    gps_traces_tooltip: Manage GPS traces

     user_diaries: Uiser Diaries
     user_diaries: Uiser Diaries

-    user_diaries_tooltip: View uiser diaries

     edit_with: Eedit wi %{editor}
     edit_with: Eedit wi %{editor}

-    tag_line: The Free Wiki Warld Cairt

     intro_header: Walcome tae OpenStreetMap!
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.
     intro_header: Walcome tae OpenStreetMap!
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.

-    intro_2_create_account: Create a uiser accoont

     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance wirk is carried oot.
     osm_read_only: The OpenStreetMap database is currently in read-anly mode while
       essential database maintenance wirk is carried oot.
     partners_partners: pairtners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance wirk is carried oot.
     osm_read_only: The OpenStreetMap database is currently in read-anly mode while
       essential database maintenance wirk is carried oot.

-    donate: Support OpenStreetMap bi %{link} tae the Hardware Upgrade Fund.

     help: Help
     about: Aboot
     copyright: Copyricht
     help: Help
     about: Aboot
     copyright: Copyricht

-    community: Commonty
-    community_blogs: Commonty Blogs
-    community_blogs_title: Blogs frae members o the OpenStreetMap commonty
-    make_a_donation:
-      title: Support OpenStreetMap wi a monetary donation
-      text: Make a Donation

     learn_more: Learn Mair
     more: Mair
   user_mailer:
     learn_more: Learn Mair
     more: Mair
   user_mailer: