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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index f4133ff3eac7620bd0995bde193bf8ae130ea009..a12a62cfcc8a5eebdb1df8b2a6aaf8a3b7f9716e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -134,7 +134,6 @@ sco:
         way: Wey
         relation: Relation
     containing_relation:
         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.'
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'


@@ -176,12 +175,7 @@ sco:
       comment:
         commented_at_by_html: Updatit %{when} ago bi %{user}
   changesets:
       comment:
         commented_at_by_html: Updatit %{when} ago bi %{user}
   changesets:

-    changeset_paging_nav:
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

     changeset:
     changeset:

-      anonymous: Anonymous

       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
     index:
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
     index:


@@ -234,8 +228,6 @@ sco:
       no_entries: No diary entries
     page:
       recent_entries: Recent diary entries
       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
     edit:
       title: Eedit diary entry
       marker_text: Diary entry location


@@ -267,8 +259,6 @@ sco:
       confirm: Confirm
     location:
       location: 'Location:'
       confirm: Confirm
     location:
       location: 'Location:'

-      view: View
-      edit: Eedit

     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}


@@ -284,8 +274,6 @@ sco:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      newer_comments: Newer Comments
-      older_comments: Aulder Comments

   geocoder:
     search_osm_nominatim:
       prefix:
   geocoder:
     search_osm_nominatim:
       prefix:


@@ -732,10 +720,6 @@ sco:
         level8: Ceety Boondary
         level9: Veelage Boondary
         level10: Suburb Boondary
         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
     results:
       no_results: No results foond
       more_results: Mair results


@@ -750,29 +734,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
     edit_with: Eedit wi %{editor}
     user_diaries: 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_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

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


@@ -796,6 +771,14 @@ sco:
       title: Logoot
       heading: Logoot frae OpenStreetMap
       logout_button: Logoot
       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
   site:
     copyright:
       title: Copyricht an License


@@ -925,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.)
       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:
   javascripts:
     directions:
       errors: