Merge branch 'master' into copyright

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

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 0591f90798e6bfb30e8761fa73252cd99871bd28..5ef926f6a223788fb457662c781f8c1edca185f6 100644 (file)
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -138,6 +138,7 @@ en:
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
   option_layer_ooc_scotland: "UK historic: Scotland"
   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_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!
   option_layer_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!


@@ -192,13 +193,14 @@ en:
   prompt_microblog: Post to $1 ($2 left)
   prompt_revertversion: "Revert to an earlier saved version:"
   prompt_savechanges: Save changes
   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
   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'
   tags_findatag: Find a tag
   tags_typesearchterm: "Type a word to look for:"
   tags_matching: Popular tags matching '$1'