Fixed bug in _blocks partial when used by the index view.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9105a2d425ac2bd03c521e05e6dc0cc5dd670d79..f8a424b45be57247c0872a26062dafeaeca03e6e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -456,7 +456,12 @@ en:
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
+    license:
+      alt: CC by-sa 2.0
+      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+    make_a_donation:
+      title: Support OpenStreetMap with a monetary donation
+      text: Make a Donation
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -581,7 +586,7 @@ en:
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      you_have_sent_messages: "You have {{count}} sent messages"
       to: "To"
       subject: "Subject"
       date: "Date"
@@ -922,6 +927,8 @@ en:
       my edits: my edits
       my traces: my traces
       my settings: my settings
+      blocks on me: blocks on me
+      blocks by me: blocks by me
       send message: send message
       diary: diary
       edits: edits
@@ -948,6 +955,8 @@ en:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:
+        administrator: "This user is an administrator"
+        moderator: "This user is a moderator"
         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"
@@ -1032,20 +1041,23 @@ en:
       sorry: "Sorry, the user block with ID {{id}} could not be found."
       back: "Back to index"
     new:
+      title: "Creating block on {{name}}"
+      heading: "Creating block on {{name}}"
       reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."
       tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
-      title: "Creating block on {{name}}"
       needs_view: "Does the user need to log in before this block will be cleared?"
+      back: "View all blocks"
     edit:
+      title: "Editing block on {{name}}"
+      heading: "Editing block on {{name}}"
       reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Update block"
-      show: "Show"
-      back: "Back"
-      title: "Editing block on {{name}}"
+      show: "View this block"
+      back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       not_a_moderator: "You need to be a moderator to perform that action."
@@ -1059,8 +1071,11 @@ en:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       success: "Block updated."
     index:
-      heading: "Listing User Blocks"
+      title: "User blocks"
+      heading: "List of user blocks"
+      empty: "No blocks have been made yet."
     revoke:
+      title: "Revoking block on {{block_on}}"
       heading: "Revoking block on {{block_on}} by {{block_by}}"
       time_future: "This block will end in {{time}}."
       past: "This block ended {{time}} ago and cannot be revoked now."
@@ -1086,11 +1101,16 @@ en:
       until_login: "Active until the user logs in."
       time_past: "Ended {{time}} ago."
     blocks_on:
-      heading: "List blocks on {{name}}"
+      title: "Blocks on {{name}}"
+      heading: "List of blocks on {{name}}"
+      empty: "{{name}} has not been blocked yet."
     blocks_by:
-      heading: "List blocks by {{name}}"
+      title: "Blocks by {{name}}"
+      heading: "List of blocks by {{name}}"
+      empty: "{{name}} has not made any blocks yet."
     show:
-      heading: "Block on {{block_on}} by {{block_by}}"
+      title: "{{block_on}} blocked by {{block_by}}"
+      heading: "{{block_on}} blocked by {{block_by}}"
       time_future: "Ends in {{time}}"
       time_past: "Ended {{time}} ago"
       status: "Status"
@@ -1099,7 +1119,18 @@ en:
       revoke: "Revoke!"
       confirm: "Are you sure?"
       reason: "Reason for block:"
-      back: "Back"
+      back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
-
+  javascripts:
+    map:
+      base:
+        mapnik: Mapnik
+        osmarender: Osmarender
+        cycle_map: Cycle Map
+        noname: NoName
+      overlays:
+        maplint: Maplint
+    site:
+      edit_zoom_alert: You must zoom in to edit the map
+      history_zoom_alert: You must zoom in to see the editing history