Merging 17846:17904 from trunk.

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

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 723266d8b22982a5c5be3aa4fd2c32d44de0fb0b..d35b1ff9792bcd607fa96ff5b7f97092906f66a0 100644 (file)
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -49,7 +49,7 @@ en:
   conflict_visitway: Click 'Ok' to show the way.
   conflict_waychanged: Since you started editing, someone else has changed way $1$2.
   createrelation: Create a new relation
-  custom: "Custom: "
+  custom: "Custom:"
   delete: Delete
   deleting: deleting
   drag_pois: Drag and drop points of interest
@@ -85,7 +85,8 @@ en:
   login_retry: Your site login was not recognised. Please try again.
   login_title: Couldn't log in
   login_uid: "Username:"
-  newchangeset: "\\nPlease try again: Potlatch will start a new changeset."
+  more: More
+  newchangeset: "\nPlease try again: Potlatch will start a new changeset."
   nobackground: No background
   norelations: No relations in current area
   offset_broadcanal: Broad canal towpath
@@ -107,7 +108,7 @@ en:
   point: Point
   prompt_addtorelation: Add $1 to a relation
   prompt_changesetcomment: "Enter a description of your changes:"
-  prompt_closechangeset',_root.changeset),completeClose,': Close changeset $1
+  prompt_closechangeset: Close changeset $1
   prompt_createparallel: Create parallel way
   prompt_editlive: Edit live
   prompt_editsave: Edit with save