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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 69b94bda80c1d3f442223e9fec6177ccc09839b8..560bc18c0888a21ca6bcd7808b5350ef7e5ebdbb 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -84,15 +84,9 @@ sco:
         pass_crypt: Passwird
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-brouser eeditor)
     id:
       name: iD
       description: iD (in-brouser eeditor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-brouser eeditor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
@@ -124,9 +118,10 @@ sco:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      hidden_commented_by: Hidden comment frae %{user} <abbr title='%{exact_time}'>%{when}
+      hidden_commented_by_html: Hidden comment frae %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      commented_by: Comment frae %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
@@ -199,19 +194,21 @@ sco:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      opened_by: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      opened_by_anonymous: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+      opened_by_html: Creatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      opened_by_anonymous_html: Creatit bi anonymous <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_html: Comment frae %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by_anonymous_html: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      commented_by: Comment frae %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      commented_by_anonymous: Comment frae anonymous <abbr title='%{exact_time}'>%{when}
+      closed_by_html: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      closed_by_anonymous_html: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      closed_by: Resolved bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous: Resolved bi anonymous <abbr title='%{exact_time}'>%{when}
+      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      reopened_by: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      reopened_by_anonymous: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
+      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
-      hidden_by: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
@@ -248,12 +245,7 @@ sco:
     new:
       title: New Diary Entry
     form:
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Leid:'
       location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
       use_map_link: uise map
     index:
       title: Uisers' diaries
@@ -774,11 +766,6 @@ sco:
         level8: Ceety Boondary
         level9: Veelage Boondary
         level10: Suburb Boondary
-    description:
-      title:
-        osm_nominatim: Location frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Location frae <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Ceeties
         towns: Touns
@@ -833,15 +820,10 @@ sco:
     learn_more: Learn Mair
     more: Mair
   user_mailer:
-    lost_password_plain:
+    lost_password:
       hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset
         on this email address's openstreetmap.org accoont.
       click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird.
-    lost_password_html:
-      greeting: Hi,
-      hopefully_you: Someane (possibly ye) has asked for the passwird tae be reset
-        on this email address's openstreetmap.org accoont.
-      click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird.
     note_comment_notification:
       anonymous: An anonymous uiser
       greeting: Hi,