Merged new translations from en.yml and translated them

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index af56740d7ed4cb4d7f60cf5d9bb32f081f582ddd..0ac74429dd978279ba6afea490e68b323d6c8f6c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -217,8 +217,11 @@ en:
       for_all_changes: "For changes by all users see {{recent_changes_link}}"
       recent_changes: "Recent Changes"
   diary_entry:
       for_all_changes: "For changes by all users see {{recent_changes_link}}"
       recent_changes: "Recent Changes"
   diary_entry:

+    new:
+      title: New Diary Entry

     list:
       title: "Users' diaries"
     list:
       title: "Users' diaries"

+      user_title: "{{user}}'s diary"

       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries


@@ -236,19 +239,23 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location

+    view:
+      title: "Users' diaries | {{user}}"

     no_such_entry:
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_entry:
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."

-    posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
-    comment_link: Comment on this entry
-    reply_link: Reply to this entry
-    comment_count:
-      one: 1 comment
-      other: "{{count}} comments"
-    edit_link: Edit this entry
-    comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+    diary_entry:
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      comment_link: Comment on this entry
+      reply_link: Reply to this entry
+      comment_count:
+        one: 1 comment
+        other: "{{count}} comments"
+      edit_link: Edit this entry
+    diary_comment:
+      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"

   export:
     start:
       area_to_export: "Area to Export"
   export:
     start:
       area_to_export: "Area to Export"


@@ -311,7 +318,7 @@ en:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:

-    diary:
+    diary_comment_notification:

       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"


@@ -422,6 +429,7 @@ en:
   trace:
     create:
       upload_trace: "Upload GPS Trace"
   trace:
     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."

     edit:
       filename: "Filename:"
       uploaded_at: "Uploaded at:"
     edit:
       filename: "Filename:"
       uploaded_at: "Uploaded at:"


@@ -464,6 +472,8 @@ en:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"

+      viewing_trace: "Viewing trace {{name}}"
+      trace_not_found: "Trace not found!"

     trace_paging_nav:
       showing: "Showing page"
       of: "of"
     trace_paging_nav:
       showing: "Showing page"
       of: "of"


@@ -479,6 +489,15 @@ en:
       by: "by"
       in: "in"
       map: "map"
       by: "by"
       in: "in"
       map: "map"

+    list:
+      public_traces: "Public GPS traces"
+      your_traces: "Your GPS traces"
+      public_traces_from: "Public GPS traces from {{user}}"
+      tagged_with: " tagged with {{tags}}"
+    delete:
+      scheduled_for_deletion: "Track scheduled for deletion"
+    make_public:
+      made_public: "Track made public"

   user:
     login:
       heading: "Login"
   user:
     login:
       heading: "Login"