couple of little fixes

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 0591f90798e6bfb30e8761fa73252cd99871bd28..9709ebca456f975d8d2758f8e9c2b0851463f616 100644 (file)
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -192,7 +192,7 @@ 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!
   prompt_track: Convert GPS track to ways
   prompt_unlock: Click to unlock
   prompt_welcome: Welcome to OpenStreetMap!

diff --git a/config/potlatch/relation_colours.txt b/config/potlatch/relation_colours.txt
index e845ddf6352b2c2caa2953371260412356eb05cb..16406e3c6d9383cbb3730e645c3604d8b5405d42 100644 (file)
--- a/config/potlatch/relation_colours.txt
+++ b/config/potlatch/relation_colours.txt
@@ -13,6 +13,7 @@ uk_ldp        0x228022        50      10
 nwn            0x228022        50      10
 rwn            0x228022        50      10
 lwn            0x228022        50      10
 nwn            0x228022        50      10
 rwn            0x228022        50      10
 lwn            0x228022        50      10

+administrative 0xAD61AA        30      10

 boundary       0xAD61AA        30      10
 restriction    0x000000        0       0
 enforcement    0x000000        0       0
 boundary       0xAD61AA        30      10
 restriction    0x000000        0       0
 enforcement    0x000000        0       0

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 221dbba7b04599121dcec7782047b986e8adf750..46a6f5203d92330d080b90ed12ca2e9815e1ad77 100644 (file)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ