Update Potlatch 2 to 2.5-57-gaa163622 build

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c53ae19c8e014530174b64266fa239a328f14f71..197c6308ccb3385c0250396a5ad791bd8c2cce00 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -242,14 +242,18 @@ en:
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
-    rss:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+  changeset_comments:
+    comment:
       comment: "New comment on changeset #%{changeset_id} by %{author}"
-      commented_at_html: "Updated %{when} ago"
       commented_at_by_html: "Updated %{when} ago by %{user}"
-      full: Full discussion
-  diary_entry:
+    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."
+  diary_entries:
     new:
       title: New Diary Entry
       publish_button: "Publish"
@@ -2563,6 +2567,7 @@ en:
       flash: "Redaction destroyed."
       error: "There was an error destroying this redaction."
   validations:
-    leading whitespace: "has leading whitespace"
-    trailing whitespace: "has trailing whitespace"
-    invalid chars: "must not contain an invalid char: %{invalid_chars}"
+    leading_whitespace: "has leading whitespace"
+    trailing_whitespace: "has trailing whitespace"
+    invalid_characters: "contains invalid characters"
+    url_characters: "contains special URL characters (%{characters})"