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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 30721562a8098459436b18ab8cdb2b72de741fa3..6b37d67616379fda0b791e5f75cb472ad5966be5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -246,6 +246,18 @@ en:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note

+  feeds:
+    changeset_comments:
+      comment:
+        comment: "New comment on changeset #%{changeset_id} by %{author}"
+        commented_at_by_html: "Updated %{when} by %{user}"
+      comments:
+        comment: "New comment on changeset #%{changeset_id} by %{author}"
+      index:
+        title_all: OpenStreetMap changeset discussion
+        title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+      timeout:
+        sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

   account:
     deletions:
       show:
   account:
     deletions:
       show:


@@ -490,17 +502,6 @@ en:
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."

-  changeset_comments:
-    comment:
-      comment: "New comment on changeset #%{changeset_id} by %{author}"
-      commented_at_by_html: "Updated %{when} by %{user}"
-    comments:
-      comment: "New comment on changeset #%{changeset_id} by %{author}"
-    index:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
-    timeout:
-      sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

   dashboards:
     contact:
       km away: "%{count}km away"
   dashboards:
     contact:
       km away: "%{count}km away"


@@ -538,6 +539,7 @@ en:
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries

+    page:

       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries


@@ -604,6 +606,7 @@ en:
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"

+    page:

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


@@ -1467,11 +1470,17 @@ en:
       search_guidance: "Search Issues:"
       user_not_found: User does not exist
       issues_not_found: No such issues found
       search_guidance: "Search Issues:"
       user_not_found: User does not exist
       issues_not_found: No such issues found

+      link_to_reports: View Reports
+      states:
+        ignored: Ignored
+        open: Open
+        resolved: Resolved
+    page:
+      reported_user: Reported User

       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"

-      link_to_reports: View Reports

       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"


@@ -1480,6 +1489,8 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
         ignored: Ignored
         open: Open
         resolved: Resolved

+      older_issues: Older Issues
+      newer_issues: Newer Issues

     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:


@@ -2522,9 +2533,6 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"

-    trace_paging_nav:
-      older: "Older Traces"
-      newer: "Newer Traces"

     trace:
       pending: "PENDING"
       count_points:
     trace:
       pending: "PENDING"
       count_points:


@@ -2556,6 +2564,9 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"

+    page:
+      older: "Older Traces"
+      newer: "Newer Traces"

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


@@ -2875,16 +2886,17 @@ en:
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users

+      summary_html: "%{name} created from %{ip_address} on %{date}"
+      summary_no_ip_html: "%{name} created on %{date}"
+      empty: No matching users found
+    page:

       older: "Older Users"
       newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
       older: "Older Users"
       newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"

-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"

       confirm: Confirm Selected Users
       hide: Hide Selected Users
       confirm: Confirm Selected Users
       hide: Hide Selected Users

-      empty: No matching users found

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -2940,12 +2952,14 @@ en:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

+      revoke: "Revoke block"

     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."

+      only_creator_can_edit_without_revoking: "Only the moderator who created this block can edit it without revoking."

       only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
       inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."
       success: "Block updated."
       only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
       inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."
       success: "Block updated."


@@ -2953,14 +2967,6 @@ en:
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."

-    revoke:
-      title: "Revoking block on %{block_on}"
-      heading_html: "Revoking block on %{block_on} by %{block_by}"
-      time_future_html: "This block will end in %{time}."
-      past_html: "This block ended %{time} and cannot be revoked now."
-      confirm: "Are you sure you wish to revoke this block?"
-      revoke: "Revoke!"
-      flash: "This block has been revoked."

     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"
     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"


@@ -3008,7 +3014,6 @@ en:
       status: "Status:"
       show: "Show"
       edit: "Edit"
       status: "Status:"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"

       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"
       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"


@@ -3017,7 +3022,6 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"

     blocks:
       display_name: "Blocked User"
       creator_name: "Creator"
     blocks:
       display_name: "Blocked User"
       creator_name: "Creator"