X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34d3b94a65d8f4717611e2f769a730afda209619..e464192462f225a456464d90aa51fa34b861d60f:/config/potlatch/locales/en.yml?ds=sidebyside

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 05f483948..0591f9079 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -31,6 +31,7 @@ en:
   advanced_tooltip: Advanced editing actions
   advanced_undelete: Undelete
   advice_bendy: Too bendy to straighten (SHIFT to force)
+  advice_conflict: Server conflict - you may need to try saving again
   advice_deletingpoi: Deleting POI (Z to undo)
   advice_deletingway: Deleting way (Z to undo)
   advice_microblogged: Updated your $1 status
@@ -59,7 +60,7 @@ en:
   drag_pois: Drag and drop points of interest
   editinglive: Editing live
   editingoffline: Editing offline
-  emailauthor: \n\nPlease e-mail richard\@systemeD.net with a bug report, saying what you were doing at the time.
+  emailauthor: \n\nPlease e-mail richard@systemeD.net with a bug report, saying what you were doing at the time.
   error_anonymous: You cannot contact an anonymous mapper.
   error_connectionfailed: Sorry - the connection to the OpenStreetMap server failed. Any recent changes have not been saved.\n\nWould you like to try again?
   error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4"
@@ -88,7 +89,7 @@ en:
   hint_saving: saving data
   hint_saving_loading: loading/saving data
   inspector: Inspector
-  inspector_duplicate: "Duplicate of "
+  inspector_duplicate: Duplicate of
   inspector_in_ways: In ways
   inspector_latlon: "Lat $1\nLon $2"
   inspector_locked: Locked