Localisation updates from http://translatewiki.net.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a48093cf8cb0d01ce9ac11c06bfc00e3e4a64592..7ecb5c2e97b23f554a940a7f03ba30d97bbc7c70 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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
@@ -1742,8 +1742,8 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
-      block_history: "view blocks received"
-      moderator_history: "view blocks given"
+      block_history: "blocks received"
+      moderator_history: "blocks given"
       comments: "comments"
       create_block: "block this user"
       activate_user: "activate this user"