Merge branch 'master' into openID

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1e6e49dba019be3a778b814a62856808fa547852..b3c564af6be9db04380e7c646ee619a3c1480fda 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,9 @@
 en:
   html:
     dir: ltr
 en:
   html:
     dir: ltr

+  time:
+    formats:
+      friendly: "%e %B %Y at %H:%M"    

   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:


@@ -230,6 +233,9 @@ en:
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"

+      wiki_link:
+        key: "The wiki description page for the {{key}} tag"
+        tag: "The wiki description page for the {{key}}={{value}} tag"

     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"


@@ -324,7 +330,7 @@ en:
       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."
     diary_entry:
       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."
     diary_entry:

-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+      posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"

       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:


@@ -334,7 +340,7 @@ en:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:

-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+      comment_from: "Comment from {{link_user}} on {{comment_created_at}}"

       hide_link: Hide this comment
       confirm: Confirm
     location:
       hide_link: Hide this comment
       confirm: Confirm
     location:


@@ -938,7 +944,8 @@ en:
     friend_notification:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
     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"
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"


@@ -1035,9 +1042,13 @@ en:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_user:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_user:

-      title: "No such user or message"
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
+      title: "No such user"
+      heading: "No such user"
+      body: "Sorry there is no user with that name."
+    no_such_message:
+      title: "No such message"
+      heading: "No such message"
+      body: "Sorry there is no message with that id."

     outbox: 
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
     outbox: 
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"


@@ -1049,6 +1060,8 @@ en:
       date: "Date"
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"
       date: "Date"
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"

+    reply:
+      wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."

     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"
     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"


@@ -1061,6 +1074,7 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"

+      wrong_user: "You are logged in as `{{user}}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."

     sent_message_summary:
       delete_button: "Delete"
     mark:
     sent_message_summary:
       delete_button: "Delete"
     mark:


@@ -1183,7 +1197,7 @@ en:
       heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"
       heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"

-      uploaded_at: "Uploaded at:"
+      uploaded_at: "Uploaded:"

       points: "Points:"
       start_coord: "Start coordinate:"
       map: "map"
       points: "Points:"
       start_coord: "Start coordinate:"
       map: "map"


@@ -1224,7 +1238,7 @@ en:
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"

-      uploaded: "Uploaded at:"
+      uploaded: "Uploaded:"

       points: "Points:"
       start_coordinates: "Start coordinate:"
       map: "map"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       map: "map"


@@ -1351,10 +1365,20 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"

+      openid: "OpenID:"
+      openid description: "Use your OpenID to login"
+      alternatively: "Alternatively"
+      remember: "Remember me:"

       lost password link: "Lost your password?"
       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."
       lost password link: "Lost your password?"
       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."

+      openid missing provider: "Sorry, could not contact your OpenID provider"
+      openid invalid: "Sorry, your OpenID seems misformed"
+    logout:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"      

     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"


@@ -1385,6 +1409,8 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"

+      openID: "OpenID:"
+      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'

       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:


@@ -1438,16 +1464,20 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       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
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"
     account:
       title: "Edit account"
       my settings: My settings
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"

+      openid:
+        openid: "OpenID:"
+        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"

       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."


@@ -1465,6 +1495,7 @@ en:
       keep image: "Keep the current image"
       delete image: "Remove the current image"
       replace image: "Replace the current image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"
       replace image: "Replace the current image"

+      image size hint: "(square images at least 100x100 work best)"

       home location: "Home Location:"
       no home location: "You have not entered your home location."
       latitude: "Latitude:"
       home location: "Home Location:"
       no home location: "You have not entered your home location."
       latitude: "Latitude:"