Merge remote-tracking branch 'openstreetmap/pull/1120'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae8294e95ae3d4aacc41abc26bdb0cdff0436455..776fae2dae7861496f8b2dc671bc35d2d5e690ec 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1810,6 +1810,7 @@ en:
       title: "No such user"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
+      deleted: "deleted"
     view:
       my diary: My Diary
       new diary entry: new diary entry
@@ -1860,16 +1861,16 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
-      block_history: "blocks received"
-      moderator_history: "blocks given"
+      block_history: "Active Blocks"
+      moderator_history: "Blocks Given"
       comments: "Comments"
-      create_block: "block this user"
-      activate_user: "activate this user"
-      deactivate_user: "deactivate this user"
-      confirm_user: "confirm this user"
-      hide_user: "hide this user"
-      unhide_user: "unhide this user"
-      delete_user: "delete this user"
+      create_block: "Block this User"
+      activate_user: "Activate this User"
+      deactivate_user: "Deactivate this User"
+      confirm_user: "Confirm this User"
+      hide_user: "Hide this User"
+      unhide_user: "Unhide this User"
+      delete_user: "Delete this User"
       confirm: "Confirm"
       friends_changesets: "friends' changesets"
       friends_diaries: "friends' diary entries"
@@ -2171,6 +2172,8 @@ en:
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"
+    embed:
+      report_problem: "Report a problem"
     key:
       title: "Map Key"
       tooltip: "Map Key"