Set max queuePos high to ensure a banner is shown

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 45824fa1b5cc546f0c03cf18c7fdef4365ba1c40..57ffe9facb26c774fabfb24be07123ed6e16a898 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -12,6 +12,7 @@
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
+# Author: Sampablokuper
 # Author: Shirayuki
 ---
 en-GB:
@@ -1101,9 +1102,10 @@ en-GB:
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
-      trademarks_1_html: OpenStreetMap and the magnifying glass logo are registered
-        trademarks of the OpenStreetMap Foundation. If you have questions about your
-        use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+      trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of the
+        Map are registered trademarks of the OpenStreetMap Foundation. If you have
+        questions about your use of the marks, please send your questions to the <a
+        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
         Working Group</a>.
   welcome_page:
     title: Welcome!
@@ -1839,8 +1841,8 @@ en-GB:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
         account for you automatically.
-      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a>
-        to arrange for an account to be created - we will try and deal with the request
+      contact_webmaster: Please contact the <a href="%{webmaster}">webmaster</a> to
+        arrange for an account to be created - we will try and deal with the request
         as quickly as possible.
       about:
         header: Free and editable
@@ -2041,8 +2043,7 @@ en-GB:
       success: We've sent a new confirmation note to %{email} and as soon as you confirm
         your account you'll be able to get mapping.<br /><br />If you use an antispam
         system which sends confirmation requests then please make sure you whitelist
-        webmaster@openstreetmap.org as we are unable to reply to any confirmation
-        requests.
+        %{sender} as we are unable to reply to any confirmation requests.
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
@@ -2303,7 +2304,6 @@ en-GB:
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map
-        mapquest: MapQuest Open
         hot: Humanitarian
       layers:
         header: Map Layers