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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 2c38144e64d1d1e9ff794d811a4bc893d04c16cb..7c6b8bd50abfdd735bcf3891c677670f2132224e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -90,6 +90,9 @@ sco:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  accounts:
+    edit:
+      title: Eedit accoont
   browse:
     created: Creatit
     closed: Closed
@@ -303,7 +306,6 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
     comments:
-      has_commented_on: '%{display_name} haes commentit on the follaein diary entries'
       post: Post
       when: When
       comment: Comment
@@ -492,7 +494,6 @@ sco:
           commercial: Commercial Aurie
           conservation: Conservation
           construction: Construction
-          farm: Ferm
           farmland: Fermlaund
           farmyard: Fermyard
           forest: Forest
@@ -1067,8 +1068,6 @@ sco:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-    account:
-      title: Eedit accoont
   javascripts:
     notes:
       new: