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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97d5e6f003e5d18737ea5f92e07ef2ff6293af53..926189809802bbc74224c7a61de6a1df09946edf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -427,10 +427,6 @@ en:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:

-    changeset_paging_nav:
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"

     changeset:
       anonymous: "Anonymous"
       no_edits: "(no edits)"
     changeset:
       anonymous: "Anonymous"
       no_edits: "(no edits)"


@@ -2931,7 +2927,7 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-    blocks:
+    page:

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"


@@ -3017,6 +3013,10 @@ en:
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note

+    notes_paging_nav:
+      showing_page: "Page %{page}"
+      next: "Next"
+      previous: "Previous"

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share: