X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34d3b94a65d8f4717611e2f769a730afda209619..38b9f8f7927f09b32a94df87d1264f568f620480:/config/potlatch/locales/en.yml

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 05f483948..9da6d565e 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
@@ -137,6 +138,8 @@ en:
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
   option_layer_ooc_scotland: "UK historic: Scotland"
+  option_layer_os_streetview: "UK: OS StreetView"
+  option_layer_surrey_air_survey: "UK: Surrey Air Survey"
   option_layer_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!
@@ -191,13 +194,14 @@ en:
   prompt_microblog: Post to $1 ($2 left)
   prompt_revertversion: "Revert to an earlier saved version:"
   prompt_savechanges: Save changes
-  prompt_taggedpoints: Some of the points on this way are tagged. Really delete?
+  prompt_taggedpoints: Some of the points on this way are tagged or in relations. Really delete?
   prompt_track: Convert GPS track to ways
   prompt_unlock: Click to unlock
   prompt_welcome: Welcome to OpenStreetMap!
   retry: Retry
   revert: Revert
   save: Save
+  tags_findtag: Find tag
   tags_findatag: Find a tag
   tags_typesearchterm: "Type a word to look for:"
   tags_matching: Popular tags matching '$1'