X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb832e050d0b7d36fcc542c7c775bc77b3290907..4a711f55f4e0b9a9ece6fee0d74c02ac98e38cf3:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7136b4c57..ebcc8a9a6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,6 +91,13 @@ en:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
     changeset_navigation:
+      paging:
+        user:
+          prev: "« {{id}}"
+          next: "{{id}} »"
+        all:
+          prev: "« {{id}}"
+          next: "{{id}} »"
       user:
         name_tooltip: "View edits by {{user}}"
         prev_tooltip: "Previous edit by {{user}}"
@@ -241,8 +248,9 @@ en:
       edit: "edit"
   changeset:
     changeset_paging_nav: 
-      showing_page: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next »"
+      previous: "« Previous"
     changeset:
       id: "#{{id}}"
       still_editing: "(still editing)"
@@ -320,8 +328,12 @@ en:
         one: 1 comment
         other: "{{count}} comments"
       edit_link: Edit this entry
+      hide_link: Hide this entry
+      confirm: Confirm
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+      hide_link: Hide this comment
+      confirm: Confirm
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
@@ -371,20 +383,20 @@ en:
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        osm_twain: 'Results from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'
+        osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
       prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
-    search_osm_twain:
+    search_osm_nominatim:
       prefix_highway: "{{type}} road"
       prefix_other: "{{type}}"
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        osm_twain: 'Location from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'
+        osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
@@ -470,15 +482,11 @@ en:
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
       subject: "[OpenStreetMap] {{user}} sent you a new message"
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
       footer1: "You can also read the message at {{readurl}}"
@@ -581,7 +589,7 @@ en:
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
-      limit_exceeded: "You have sent a lot of messages recently, please wait a while before trying to send any more."
+      limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_user:
       title: "No such user or message"
       heading: "No such user or message"