Use hash-based flash objects to render complex flash messages

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4cfdf5754cc1f6496f6b618961e7eb27b110fba4..25464bdcfc4e767838f4304df129e35439d88f7a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -474,6 +474,7 @@ en:
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
       has_commented_on: "%{display_name} has commented on the following diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
       has_commented_on: "%{display_name} has commented on the following diary entries"

+      no_comments: "No diary comments"

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -486,6 +487,7 @@ en:
       success: "%{name} is now your friend!"
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
       success: "%{name} is now your friend!"
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."

+      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."

     remove_friend:
       heading: "Unfriend %{user}?"
       button: "Unfriend"
     remove_friend:
       heading: "Unfriend %{user}?"
       button: "Unfriend"


@@ -1664,9 +1666,6 @@ en:
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account

-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID

         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID


@@ -2219,8 +2218,10 @@ en:
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"

-      see_all_traces: "See all traces"
-      see_my_traces: "See my traces"
+      all_traces: "All Traces"
+      my_traces: "My Traces"
+      traces_from: "Public Traces from %{user}"
+      remove_tag_filter: "Remove Tag Filter"

     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -2609,8 +2610,9 @@ en:
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"

-      created: "Created"
-      status: "Status"
+      created: "Created:"
+      duration: "Duration:"
+      status: "Status:"

       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"
       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"


@@ -2638,6 +2640,7 @@ en:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"

+      no_notes: No notes

       id: "Id"
       creator: "Creator"
       description: "Description"
       id: "Id"
       creator: "Creator"
       description: "Description"