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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 46c8b8bcc1a354ae0dc434e2970f0fb6e7eb4343..4e3fa8fa7f2f411534f60e6c7bca59402d97571c 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -105,12 +105,6 @@ sco:
   browse:
     created: Creatit
     closed: Closed
-    created_html: Creatit <abbr title='%{title}'>%{time} ago</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time} ago</abbr>
-    created_by_html: Creatit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    deleted_by_html: Deletit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    edited_by_html: Eeditit <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time} ago</abbr> bi %{user}
     version: Version
     in_changeset: Chyngeset
     anonymous: anonymous
@@ -130,10 +124,6 @@ sco:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      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>
       changesetxml: Chyngeset XML
       osmchangexml: osmChange XML
       feed:
@@ -299,13 +289,6 @@ sco:
       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
-    search:
-      title:
-        latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>
-        osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -825,7 +808,7 @@ sco:
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
-        windowslive:
+        microsoft:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:
@@ -969,21 +952,6 @@ sco:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      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>
-      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>
-      reopened_by_html: Reactivatit bi %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by_anonymous_html: Reactivatit bi anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      hidden_by_html: Hidden bi %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
     new:
       title: New Note
       intro: Spotted ae mistake or sommit missin? Lat ither mappers ken sae that we