From: Tom Hughes <tom@compton.nu>
Date: Sat, 1 Oct 2011 09:59:16 +0000 (+0100)
Subject: Update Potlatch 2 to 2.3-11-gfd60020 build
X-Git-Tag: live~6207
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9743efc2c98f0b237b8c38d690a3b699be728681

Update Potlatch 2 to 2.3-11-gfd60020 build
---

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index ecb0a190f..da503b4c2 100644
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
index 1faee551c..0b8811ece 100644
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
index e66602a6d..381f09694 100644
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index cbfb3aec8..b3b95c692 100644
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index 654a7deeb..20b60ccde 100644
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index f095821ea..604bbb4dc 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -471,7 +471,7 @@
 
   <inputSet id="waterways">
     <inputSet ref="simpleName"/>
-    <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres"/>
+    <input type="freetext" presence="always" name="Width" category="Details" key="width" description="The width in metres"/>
     <inputSet ref="boatPermissions"/>
   </inputSet>
 <!-- Would be good to have a dedicated 'access' type of input -->
diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index 0f249f518..3dbd64a9d 100644
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -321,7 +321,7 @@
         <choice value="weather_shelter" text="Weather shelter"/>
         <choice value="wildlife_hide" text="Wildlife hide"/>
       </input>
-    <inputset ref="names"/>
+    <inputSet ref="names"/>
     <inputSet ref="common"/>
   </feature>
 
diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index 027f3b1f6..1aec8117e 100644
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -155,7 +155,6 @@
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help>
     <point/>
-    <area/>
     <tag k="amenity" v="car_wash"/>
     <inputSet ref="names"/>
     <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 95bf3cda3..7487067cf 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ