X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d35062ba3013891e44265261eaa1111ab1ebc47..4aec8dc3a55654a847c91ef07c3c99428e3a6f11:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 633f54c12..979552819 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -252,6 +252,17 @@ en:
       download_xml: "Download XML"
       view_history: "view history"
       edit: "edit"
+    bug:
+      open_title: "Unresolved issue: {{bug_name}}"
+      closed_title: "Resolved issue: {{bug_name}}"
+      created_at: "Created at:"
+      edited_at: "Edited at:"
+      closed_at: "Closed at:"
+      opened_by: "Opened by:"
+      description: "Description:"
+      comment_by: "Comment by: "
+      comment: "Comment:"
+      date: "Date:"
   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page {{page}}"
@@ -941,7 +952,8 @@ en:
     friend_notification:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+      see_their_profile: "You can see their profile at {{userurl}}."
+      befriend_them: "You can also add them as a friend at {{befriendurl}}."
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"
@@ -1040,7 +1052,7 @@ en:
     no_such_user:
       title: "No such user"
       heading: "No such user"
-      body: "Sorry there is no user owith that name."
+      body: "Sorry there is no user with that name."
     no_such_message:
       title: "No such message"
       heading: "No such message"
@@ -1366,6 +1378,10 @@ en:
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, could not log in with those details."
+    logout:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"      
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
@@ -1449,10 +1465,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
-    map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-      friend: "Friend: [[friend_user]]"
+    popup:
+      your location: "Your location"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
     account:
       title: "Edit account"
       my settings: My settings
@@ -1619,6 +1635,19 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
+  bugs:
+    rss:
+      description: "A list of bugs, reported, commented on or closed in your area"
+      closed: "closed bug (near {{place}})"
+      new: "new bug (near {{place}})"
+      comment: "new comment (near {{place}})"
+    user:
+      title_user: "Bugs submitted or commented on by {{user}}"
+      heading_user: "{{user}}'s bugs"
+      description_user: "Bugs submitted or commented on by {{user}}"
+      id: "Id"
+      last_changed: "Last changed"
+
   javascripts:
     map:
       base: