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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index ac1a0816872f6ed285b4b9d743cab89bc2803387..061c90cadd52ba7a136f8901c2b0a7995a6904ef 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -102,7 +102,7 @@ sco:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
   accounts:
-    edit:
+    show:
       title: Edit accoont
   browse:
     version: Vairsion
@@ -180,7 +180,6 @@ sco:
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
-      title_friend: Chyngesets bi yer friends
       title_nearby: Chyngesets bi nearbi uisers
       empty: No chyngesets foond.
       empty_area: No chyngesets in this aurie.
@@ -218,7 +217,6 @@ sco:
       use_map_link: uise map
     index:
       title: Uisers' diaries
-      title_friends: Friends' diaries
       title_nearby: Nearbi Uisers' diaries
       user_title: '%{user}''s diary'
       in_language_title: Diary Entries in %{language}
@@ -268,11 +266,6 @@ sco:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
-  diary_comments:
-    page:
-      post: Post
-      when: When
-      comment: Comment
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -740,10 +733,6 @@ sco:
     intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
       tae uise unner an open license.
     partners_partners: pairtners
-    osm_offline: The OpenStreetMap database isnae online the noo, whiles we cairry
-      oot essential database maintenance wirk.
-    osm_read_only: The OpenStreetMap database is currently in read-ainly mode while
-      essential database maintenance wirk is carried oot.
     help: Help
     about: Aboot
     copyright: Copyricht
@@ -896,6 +885,13 @@ sco:
     show:
       edits: Edits
       created from: 'Made frae:'
+    changeset_comments:
+      page:
+        when: When
+        comment: Comment
+    diary_comments:
+      page:
+        post: Post
   notes:
     show:
       title: 'Note: %{id}'