From 8434fb53b7901b7c47aa815492aca6fe313d2b93 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Sun, 7 Mar 2010 23:09:26 +0000 Subject: [PATCH 1/1] couple of little fixes --- config/potlatch/locales/en.yml | 2 +- config/potlatch/relation_colours.txt | 1 + public/potlatch/potlatch.swf | Bin 285934 -> 285987 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml index 0591f9079..9709ebca4 100644 --- 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_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! diff --git a/config/potlatch/relation_colours.txt b/config/potlatch/relation_colours.txt index e845ddf63..16406e3c6 100644 --- 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 +administrative 0xAD61AA 30 10 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 GIT binary patch delta 7785 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 E1NAt4dH?_b delta 7696 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 W(g#oNl