Merge remote-tracking branch 'upstream/pull/4154'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8025b617f097a89bcefd0926173f25b6e4ec12eb..c05b92d44e23df1de3861f522f9c64a7b6e98ffd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -350,6 +350,7 @@ en:
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       nodes_count:
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       nodes_count:

+        one: "%{count} node"

         other: "%{count} nodes"
       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "%{count} nodes"
       also_part_of_html:
         one: "part of way %{related_ways}"


@@ -515,9 +516,9 @@ en:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:

-        zero: No comments

         one: "%{count} comment"
         other: "%{count} comments"
         one: "%{count} comment"
         other: "%{count} comments"

+      no_comments: No comments

       edit_link: Edit this entry
       hide_link: Hide this entry
       unhide_link: Unhide this entry
       edit_link: Edit this entry
       hide_link: Hide this entry
       unhide_link: Unhide this entry


@@ -1403,9 +1404,9 @@ en:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:

-        zero: No reports

         one: "%{count} report"
         other: "%{count} reports"
         one: "%{count} report"
         other: "%{count} reports"

+      no_reports: No reports

       report_created_at: "First reported at %{datetime}"
       last_resolved_at: "Last resolved at %{datetime}"
       last_updated_at: "Last updated at %{datetime} by %{displayname}"
       report_created_at: "First reported at %{datetime}"
       last_resolved_at: "Last resolved at %{datetime}"
       last_updated_at: "Last updated at %{datetime} by %{displayname}"


@@ -2433,7 +2434,6 @@ en:
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
     trace_paging_nav:
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
     trace_paging_nav:

-      showing_page: "Page %{page}"

       older: "Older Traces"
       newer: "Newer Traces"
     trace:
       older: "Older Traces"
       newer: "Newer Traces"
     trace: