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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index d64b02458ff734e22b832455504bd6737663fa88..a12a62cfcc8a5eebdb1df8b2a6aaf8a3b7f9716e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -134,7 +134,6 @@ sco:
         way: Wey
         relation: Relation
     containing_relation:
         way: Wey
         relation: Relation
     containing_relation:

-      entry_html: Relation %{relation_name}

       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'


@@ -177,7 +176,6 @@ sco:
         commented_at_by_html: Updatit %{when} ago bi %{user}
   changesets:
     changeset:
         commented_at_by_html: Updatit %{when} ago bi %{user}
   changesets:
     changeset:

-      anonymous: Anonymous

       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
     index:
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
     index:


@@ -261,8 +259,6 @@ sco:
       confirm: Confirm
     location:
       location: 'Location:'
       confirm: Confirm
     location:
       location: 'Location:'

-      view: View
-      edit: Eedit

     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}