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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index aaa9555dbc809e92294c2ebf71d7fd712815ed18..434b88c13277985dec0cd24458ab40d1a16d8579 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -903,10 +903,7 @@ en-GB:
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     intro_2_create_account: Create a user account
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     intro_2_create_account: Create a user account

-    partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
-      %{partners}.

     partners_ucl: UCL
     partners_ucl: UCL

-    partners_ic: Imperial College London

     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database


@@ -1771,7 +1768,7 @@ en-GB:
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration

-  user:
+  users:

     login:
       title: Login
       heading: Login
     login:
       title: Login
       heading: Login