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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 069efb4a4f8cf3a5ee70e5db22110dcc62239f5e..c7325e64f117652d13e92d51a37c51aff4fb940d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1822,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"
@@ -3074,7 +3074,6 @@ en:
         transport_map: Transport Map
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarian
-        opnvkarte: ÖPNVKarte
       layers:
         header: Map Layers
         notes: Map Notes
@@ -3091,8 +3090,6 @@ en:
       osm_france: OpenStreetMap France
       thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
       andy_allan: Andy Allan
-      opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
-      memomaps: MeMoMaps
       tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
       tracestrack: Tracestrack
       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"