Fix top level key in nb translation

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d7e3d44487861693e41013c5a95e37a71de4044..e9685ab49ea72b0a4d31e078826b8adfb0312b6d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -307,16 +307,19 @@ en:
       title_user: "Changesets by %{user}"
       title_bbox: "Changesets within %{bbox}"
       title_user_bbox: "Changesets by %{user} within %{bbox}"
+      title_friend: "Changesets by your friends"
 
       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"
+      heading_friend: "Changesets"
 
       description: "Recent changes"
       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
+      description_friend: "Changesets by your friends"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
@@ -1480,7 +1483,7 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
-      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."
+      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."
       edit: "Edit Details"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
@@ -1542,6 +1545,7 @@ en:
       webmaster: webmaster
       auth failure: "Sorry, could not log in with those details."
       notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
+      notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.<br /><br />Please log in, then take a few seconds to review and accept the new terms. Thank you!"
       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"
@@ -1654,6 +1658,10 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
+      ct status: "Contributor terms:"
+      ct undecided: Undecided
+      ct declined: Declined
+      ct accepted: Accepted %{ago} ago
       latest edit: "Latest edit %{ago}:"
       email address: "Email address:"
       created from: "Created from:"
@@ -1688,6 +1696,7 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
+      friends_changesets: "Browse all changesets by friends"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
@@ -1907,7 +1916,8 @@ en:
         mapnik: Mapnik
         osmarender: Osmarender
         cycle_map: Cycle Map
-        noname: NoName
+        transport_map: Transport Map
+        mapquest: MapQuest Open
       overlays:
         maplint: Maplint
     site: