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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2347d4bc66c2cdfc1aca343218014fe66241679..dcb877f7b4a5803611eba9326fbd6c5ec77490ee 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -428,6 +428,15 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
+  old_nodes:
+    not_found:
+      sorry: "Sorry, node #%{id} version %{version} could not be found."
+  old_ways:
+    not_found:
+      sorry: "Sorry, way #%{id} version %{version} could not be found."
+  old_relations:
+    not_found:
+      sorry: "Sorry, relation #%{id} version %{version} could not be found."
   changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
@@ -1813,7 +1822,7 @@ en:
       heading: "Login"
       email or username: "Email Address or Username"
       password: "Password"
-      openid_html: "%{logo} OpenID:"
+      openid_html: "%{logo} OpenID"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"