X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e885c1249b07d1e17a82662f011b64ca91be3a8c..3445f447cd24dee77b341b8a97196024e3ee8ec0:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e89158f2f..d01482045 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -948,7 +948,7 @@ en:
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
-    inbox: "inbox (%{count})"
+    inbox_html: "inbox %{count}"
     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message
@@ -1003,7 +1003,7 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
+    sotm2012: 'Come to the 2012 OpenStreetMap Conference, The State of the Map, September 6-8th in Tokyo!'
     license:
       alt: CC BY-SA 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License