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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 9b7a8553b698f1fbe5a3e876dea9af81d16f4749..ac1a0816872f6ed285b4b9d743cab89bc2803387 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -116,17 +116,14 @@ sco:
     location: 'Location:'
     node:
       title_html: 'Node: %{name}'
     location: 'Location:'
     node:
       title_html: 'Node: %{name}'

-      history_title_html: 'Node History: %{name}'

     way:
       title_html: 'Wey: %{name}'
     way:
       title_html: 'Wey: %{name}'

-      history_title_html: 'Wey Historie: %{name}'

       nodes: Nodes
       also_part_of_html:
         one: pairt o wey %{related_ways}
         other: pairt o weys %{related_ways}
     relation:
       title_html: 'Relation: %{name}'
       nodes: Nodes
       also_part_of_html:
         one: pairt o wey %{related_ways}
         other: pairt o weys %{related_ways}
     relation:
       title_html: 'Relation: %{name}'

-      history_title_html: 'Relation Historie: %{name}'

       members: Members
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'
       members: Members
     relation_member:
       entry_role_html: '%{type} %{name} as %{role}'


@@ -136,13 +133,6 @@ sco:
         relation: Relation
     containing_relation:
       entry_role_html: Relation %{relation_name} (as %{relation_role})
         relation: Relation
     containing_relation:
       entry_role_html: Relation %{relation_name} (as %{relation_role})

-    not_found:
-      sorry: 'Sorry, %{type} #%{id} couldnae be foond.'
-      type:
-        node: node
-        way: wey
-        relation: relation
-        changeset: chyngeset

     timeout:
       sorry: Sorry, the data for the %{type} wi the id %{id}, teuk too lang tae retrieve.
       type:
     timeout:
       sorry: Sorry, the data for the %{type} wi the id %{id}, teuk too lang tae retrieve.
       type:


@@ -171,6 +161,14 @@ sco:
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}

+  old_elements:
+    index:
+      node:
+        title_html: 'Node History: %{name}'
+      way:
+        title_html: 'Wey Historie: %{name}'
+      relation:
+        title_html: 'Relation Historie: %{name}'

   changeset_comments:
     feeds:
       comment:
   changeset_comments:
     feeds:
       comment: