Fix update-wiki-pages to resolve redirects correctly

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c305a381c57bea12fbb544fdf7604db28fe64499..fe5f58d512cd55d4c4996a68d7421c503c6cbedb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,7 +79,7 @@ en:
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"

-    with_name: "%{name} (%{id})"
+    with_name_html: "%{name} (%{id})"

   editor:
     default: "Default (currently %{name})"
     potlatch:
   editor:
     default: "Default (currently %{name})"
     potlatch:


@@ -181,9 +181,11 @@ en:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"

+      telephone_link: "Call %{phone_number}"

     note:
       title: "Note: %{id}"
       new_note: "New Note"
     note:
       title: "Note: %{id}"
       new_note: "New Note"

+      description: "Description"

       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"


@@ -2102,7 +2104,7 @@ en:
       map_data_zoom_in_tooltip: Zoom in to see map data
     notes:
       new:
       map_data_zoom_in_tooltip: Zoom in to see map data
     notes:
       new:

-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)"
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"

         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.