Replace use of Layer.GML with Layer.Vector

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dce8e3eaddbacdac50e03fd29758421c560c168e..7bfda9593bf5d89f4e8af25ca0a47534511f72f5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -196,7 +196,8 @@ en:
       showing_page: "Showing page"
       of: "of"
     redacted:
-      message: "This #{type} version cannot be shown as it has been redacted. Please see %{redaction_link} for details."
+      redaction: "Redaction %{id}"
+      message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
       type:
         node: "node"
         way: "way"
@@ -399,7 +400,7 @@ en:
       post: Post
       when: When
       comment: Comment
-      ago: %{ago} ago
+      ago: "%{ago} ago"
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:
@@ -1111,8 +1112,9 @@ en:
           on Australian Bureau of Statistics data.</li>
           <li><strong>Austria</strong>: Contains data from
           <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>)
-          and <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg.</a></li>
+          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).</li>
           <li><strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
@@ -1120,7 +1122,7 @@ en:
           Statistics Canada).</li>
           <li><strong>France</strong>: Contains data sourced from
           Direction Générale des Impôts.</li>
-          <li><strong>Netherlands</strong>: Contains &copy; AND data, 2007 
+          <li><strong>Netherlands</strong>: Contains &copy; AND data, 2007
           (<a href="http://www.and.com">www.and.com</a>)</li>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
@@ -1420,7 +1422,7 @@ en:
       text: Text
       image: Image
       alt: Alt text
-      url: url
+      url: URL
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -1523,7 +1525,7 @@ en:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_moderator:
-      not_a_moderator: "You need to be a moderator to perform that action."      
+      not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
@@ -1555,6 +1557,8 @@ en:
       authorize_url: "Authorise URL:"
       support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."
       edit: "Edit Details"
+      delete: "Delete Client"
+      confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       allow_write_prefs: "modify their user preferences."
@@ -2016,11 +2020,11 @@ en:
       submit: "Create redaction"
       title: "Creating new redaction"
     show:
-      description: "Description"
+      description: "Description:"
       heading: "Showing redaction \"%{title}\""
       title: "Showing redaction"
       user: "Creator:"
-      edit: "Edit this redaction."
+      edit: "Edit this redaction"
       destroy: "Remove this redaction"
       confirm: "Are you sure?"
     create: