Merge oauth branch at r17138 to trunk.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97fe3ab011d1721b5a6128ef02148e83f6a4879e..16f66dbbc12945ce3caffc28e0a4997fcc8ba90c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,6 +87,9 @@ en:
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
+      feed:
+        title: "Changeset {{id}}"
+        title_comment: "Changeset {{id}} - {{comment}}"
     changeset_navigation:
       user:
         name_tooltip: "View edits by {{user}}"
@@ -317,6 +320,16 @@ en:
       edit_link: Edit this entry
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+    feed:
+      user:
+        title: "OpenStreetMap diary entries for {{user}}"
+        description: "Recent OpenStreetmap diary entries from {{user}}"
+      language:
+        title: "OpenStreetMap diary entries in {{language_name}}"
+        description: "Recent diary entries from users of OpenStreetMap in {{language_name}}"
+      all:
+        title: "OpenStreetMap diary entries"
+        description: "Recent diary entries from users of OpenStreetMap"
   export:
     start:
       area_to_export: "Area to Export"
@@ -507,7 +520,7 @@ en:
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
+      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
@@ -690,6 +703,11 @@ en:
           destination: "Destination access"
           construction: "Roads under construction"
   trace:
+    visibility:
+      private: "Private (only shared as anonymous, unordered points)"
+      public: "Public (shown in trace list and as anonymous, unordered points)"
+      trackable: "Trackable (only shared as anonymous, ordered points with timestamps)"
+      identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
     create:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
@@ -708,6 +726,9 @@ en:
       tags: "Tags:"
       tags_help: "comma delimited"
       save_button: "Save Changes"
+      visibility: "Visibility:"
+      visibility_help: "what does this mean?"
+      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"
@@ -717,9 +738,9 @@ en:
       description: "Description"
       tags: "Tags"
       tags_help: "comma delimited"
-      public: "Public?"
-      public_help: "what does this mean?"
-      public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+      visibility: "Visibility"
+      visibility_help: "what does this mean?"
+      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
@@ -745,10 +766,10 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
-      make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
       trace_not_found: "Trace not found!"
+      visibility: "Visibility:"
     trace_paging_nav:
       showing: "Showing page"
       of: "of"
@@ -831,6 +852,7 @@ en:
         allow_write_api:   "modify the map."
         allow_read_gpx:    "read their private GPS traces."
         allow_write_gpx:   "upload GPS traces."
+      not_found: "Sorry, that {{type}} could not be found."
   user:
     login:
       title: "Login"
@@ -847,12 +869,12 @@ en:
       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
-      new password button: "Send me a new password"
+      new password button: "Reset password"
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Couldn't find that email address, sorry."
     reset_password:
       title: "Reset password"
-      heading: "Reset Password"
+      heading: "Reset Password for {{user}}"
       password: "Password: "
       confirm password: "Confirm Password: "
       reset: "Reset Password"