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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 57bb548cca49bb1bf694c9f5771195ab41f4ae1b..a12a62cfcc8a5eebdb1df8b2a6aaf8a3b7f9716e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -134,7 +134,6 @@ sco:
         way: Wey
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'
@@ -171,21 +170,14 @@ sco:
       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}
-      next: Next »
-      previous: « Previous
     changeset:
-      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}
@@ -219,9 +211,6 @@ sco:
       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
@@ -237,9 +226,8 @@ sco:
       new: New Diary Entry
       new_title: Compone a new entry in yer uiser diary
       no_entries: No diary entries
+    page:
       recent_entries: Recent diary entries
-      older_entries: Aulder Entries
-      newer_entries: Newer Entries
     edit:
       title: Eedit diary entry
       marker_text: Diary entry location
@@ -271,8 +259,6 @@ sco:
       confirm: Confirm
     location:
       location: 'Location:'
-      view: View
-      edit: Eedit
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
@@ -284,12 +270,10 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
   diary_comments:
-    index:
+    page:
       post: Post
       when: When
       comment: Comment
-      newer_comments: Newer Comments
-      older_comments: Aulder Comments
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -736,10 +720,6 @@ sco:
         level8: Ceety Boondary
         level9: Veelage Boondary
         level10: Suburb Boondary
-      types:
-        cities: Ceeties
-        towns: Touns
-        places: Places
     results:
       no_results: No results foond
       more_results: Mair results
@@ -754,33 +734,20 @@ sco:
     edit: Eedit
     history: History
     export: Export
-    data: Data
-    export_data: Export Data
     gps_traces: GPS Traces
-    gps_traces_tooltip: Manage GPS traces
     user_diaries: Uiser Diaries
-    user_diaries_tooltip: View uiser diaries
     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_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.
-    donate: Support OpenStreetMap bi %{link} tae the Hardware Upgrade Fund.
     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:
@@ -804,6 +771,14 @@ sco:
       title: Logoot
       heading: Logoot frae OpenStreetMap
       logout_button: Logoot
+  shared:
+    pagination:
+      diary_comments:
+        older: Aulder Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Aulder Entries
+        newer: Newer Entries
   site:
     copyright:
       title: Copyricht an License
@@ -917,12 +892,6 @@ sco:
       wikipedia:
         title: Login wi Wikipedia
         alt: Login wi a Wikipedia Accoont
-      wordpress:
-        title: Login wi Wordpress
-        alt: Login wi a Wordpress OpenID
-      aol:
-        title: Login wi AOL
-        alt: Login wi an AOL OpenID
   users:
     show:
       edits: Eedits
@@ -939,6 +908,8 @@ sco:
       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.)
+    notes_paging_nav:
+      showing_page: Page %{page}
   javascripts:
     directions:
       errors: